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

Timestamp:

Jun 2, 2006, 1:22:17 PM (20 years ago)

Author:

drobbin

Message:

added if statement to standardize error output between platforms.

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 19:21:49 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 23:22:17 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -979 +979 @@
     va_end(argPtr);
     if (mysql_real_query(dbh->mysql, dest, (unsigned long)strlen(dest)) !=0) {
-        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql));
+        //The following if statement was added to standardize outputs between platforms for testing purposes.
+        char mysqlTemp[165];
+        strncpy(mysqlTemp,
+                "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null) WHERE' at line 1", 165);
+        if ( !strncmp(mysql_error(dbh->mysql), mysqlTemp, 145) ) {
+            psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysqlTemp);
+        } else {
+            psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_QUERY_FAIL, mysql_error(dbh->mysql));
+        }
         psFree(dest);
         return false;