Changeset 10108 for trunk/psLib/src/db/psDB.c

Timestamp:

Nov 20, 2006, 10:57:51 AM (20 years ago)

Author:

Paul Price

Message:

Cause of problem in p0tool was found in psDB. psDBMySQLToPType was
looking for type "UNSIGNED BIGINT", while it's stored under "BIGINT
UNSIGNED" in the mysqlToSQLTable. Also note that since sqlType is a
value stored in a hash, it shouldn't be modified directly. Added a
fix to put "UNSIGNED" at the end of the string instead of the start,
and copy the string in the process.

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-17 22:06:57 $
+ *  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-20 20:57:51 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1784 +1784 @@
     char            *key;               // hash tmp value
     char            *value;             // hash tmp value
-    char            *sqlType;           // copy of lookup table result
+    psString        sqlType;            // copy of lookup table result
     psU32           pType;              // psElemType of a field
 
@@ -1791 +1791 @@
     // lookup MySQL column type
     key     = psDBIntToString((psU64)type);
-    sqlType = psHashLookup(mysqlToSQLTable, key);
+    sqlType = psMemIncrRefCounter(psHashLookup(mysqlToSQLTable, key));
     psFree(key);
 
@@ -1804 +1804 @@
     // mysql -> ascii -> ptype
     if (flags & UNSIGNED_FLAG) {
-        psStringPrepend(&sqlType, "UNSIGNED ");
-    }
-
-    //psLogMsg( __func__, PS_LOG_INFO, "sqlType=[%s]\n", sqlType );
+        psString new = NULL;
+        psStringAppend(&new, "%s UNSIGNED", sqlType);
+        psFree(sqlType);
+        sqlType = new;
+    }
+
+    //psTrace("psLib.db", 9, "sqlType=[%s]\n", sqlType );
 
     // convert MySQL type to PS type
@@ -1814 +1817 @@
 
     if (!value) {
-        psError(PS_ERR_UNEXPECTED_NULL, true, "type lookup failed.");
-
+        psError(PS_ERR_UNEXPECTED_NULL, true, "type lookup of %s failed.", sqlType);
+        psFree(sqlType);
         return 0;
     }
+    psFree(sqlType);
 
     pType = (psU32)atol(value);