Changeset 17841 for trunk/psLib

Timestamp:

May 28, 2008, 4:43:04 PM (18 years ago)

Author:

jhoblitt

Message:

check for uindex before index

File:

• trunk/psLib/src/db/psDB.c (modified) (9 diffs)

trunk/psLib/src/db/psDB.c

@@ -23 +23 @@
  * 4.1.2 or newer is required.
  *
- * $Id: psDB.c,v 1.154 2008-05-29 02:35:34 jhoblitt Exp $
+ * $Id: psDB.c,v 1.155 2008-05-29 02:43:04 jhoblitt Exp $
  */
 
@@ -1641 +1641 @@
     }
 
+
     // Reset iterator to head of list
     psListIteratorSet(cursor, 0);
-
-    // look for INDEX values
+    // look for UINDEXs before INDEXs
     while ((item = psListGetAndIncrement(cursor))) {
         // don't compile a regex unless we have too
-        if (psStrcasestr(item->comment, "INDEX") == NULL) {
+        if (psStrcasestr(item->comment, "UINDEX") == NULL) {
             continue;
         }
@@ -1655 +1655 @@
         int             errbuf_size = 1024;
         char            errbuf[errbuf_size];
-        char            *pattern = "INDEX[:space:]*[(]([^)]*)";
+        char            *pattern = "UINDEX[:space:]*[(]([^)]*)";
 
         int status = regcomp(&myregex, pattern, REG_EXTENDED|REG_ICASE);
@@ -1678 +1678 @@
         regfree(&myregex);
 
-        // sub string 1: index(.*)
+        // sub string 1: uindex(.*)
         size_t matchStart = (size_t)mymatch[1].rm_so;
         size_t matchEnd   = (size_t)mymatch[1].rm_eo;
@@ -1692 +1692 @@
         psString index = psStringNCopy(item->comment + matchStart, matchLength);
         psTrace("psLib.db", 10, "regex $1 matched: %s", index);
-        psStringAppend(&query, ", INDEX(%s)", index);
+        psStringAppend(&query, ", UNIQUE KEY(%s)", index);
         psFree(index);
     }
@@ -1698 +1698 @@
     // Reset iterator to head of list
     psListIteratorSet(cursor, 0);
-    // look for UNIQUE INDEXES
+    // look for INDEX values
     while ((item = psListGetAndIncrement(cursor))) {
         // don't compile a regex unless we have too
-        if (psStrcasestr(item->comment, "UINDEX") == NULL) {
+        if (psStrcasestr(item->comment, "INDEX") == NULL) {
             continue;
         }
@@ -1709 +1709 @@
         int             errbuf_size = 1024;
         char            errbuf[errbuf_size];
-        char            *pattern = "UINDEX[:space:]*[(]([^)]*)";
+        char            *pattern = "INDEX[:space:]*[(]([^)]*)";
 
         int status = regcomp(&myregex, pattern, REG_EXTENDED|REG_ICASE);
@@ -1732 +1732 @@
         regfree(&myregex);
 
-        // sub string 1: uindex(.*)
+        // sub string 1: index(.*)
         size_t matchStart = (size_t)mymatch[1].rm_so;
         size_t matchEnd   = (size_t)mymatch[1].rm_eo;
@@ -1746 +1746 @@
         psString index = psStringNCopy(item->comment + matchStart, matchLength);
         psTrace("psLib.db", 10, "regex $1 matched: %s", index);
-        psStringAppend(&query, ", UNIQUE KEY(%s)", index);
+        psStringAppend(&query, ", INDEX(%s)", index);
         psFree(index);
     }