Changeset 11320

Timestamp:

Jan 26, 2007, 12:24:37 PM (19 years ago)

Author:

jhoblitt

Message:

remove ridiculous use of error handling from p_psDBRunQuery()
add mysqlTopsErr() function

Location:

trunk/psLib/src

Files:

• db/psDB.c (modified) (9 diffs)
• psErrorCodes_en.dat (modified) (1 diff)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.131 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 22:24:37 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -121 +121 @@
 static void     psDBAddToLookupTable(psHash *lookupTable, psU32 type, const char *string);
 static void     psDBAddVoidToLookupTable(psHash *lookupTable, psU32 type, psPtr value);
+static psErrorCode mysqlTopsErr(MYSQL *mysql);
 
 // pType utility functions
@@ -148 +149 @@
     // Connect to host and mySql server with specified database
     if (!mysql_real_connect(mysql, host, user, passwd, dbname, port, NULL, 0)) {
-        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+        psError(mysqlTopsErr(dbh->mysql), true,
                 _("Failed to connect to database.  Error: %s"),mysql_error(mysql));
 
@@ -162 +163 @@
     // explicit transactions default to false
     if (!psDBExplicitTrans(dbh, false)) {
-        psError(PS_ERR_UNKNOWN, true,
+        psError(mysqlTopsErr(dbh->mysql), true,
                 "failed to set transaction type. Error: %s", mysql_error(mysql));
 
@@ -263 +264 @@
     // Attempt to select new database
     if (mysql_select_db(dbh->mysql, dbname) != 0) {
-        psError(PS_ERR_UNKNOWN, true, _("Failed to change database.  Error: %s"),
+        psError(mysqlTopsErr(dbh->mysql), true, _("Failed to change database.  Error: %s"),
                 mysql_error(dbh->mysql));
 
@@ -389 +390 @@
         // then something bad has happened.
         if (fieldCount != 0) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, _("Query returned no data.  Error: %s"),
+            psError(mysqlTopsErr(dbh->mysql), true, _("Query returned no data.  Error: %s"),
                     mysql_error(dbh->mysql));
             return NULL;
@@ -823 +824 @@
 
     if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) {
-        //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, _("Failed to execute SQL query.  Error: %s"), mysqlTemp);
-        } else {
-            psError(PS_ERR_UNKNOWN, true, _("Failed to execute SQL query.  Error: %s"), mysql_error(dbh->mysql));
-        }
+        psError(mysqlTopsErr(dbh->mysql), true, _("Failed to execute SQL query.  Error: %s"), mysql_error(dbh->mysql));
         psFree(query);
         return false;
@@ -951 +944 @@
         // it's non-zero then something bad has happened.
         if (fieldCount != 0) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Query returned no data.  Error: %s", mysql_error(dbh->mysql));
+            psError(mysqlTopsErr(dbh->mysql), true, "Query returned no data.  Error: %s", mysql_error(dbh->mysql));
 
             return NULL;
@@ -2414 +2407 @@
 }
 
+static psErrorCode mysqlTopsErr(MYSQL *mysql)
+{
+    unsigned int myerrno = mysql_errno(mysql);
+    if ((myerrno >= 1000) && (myerrno < 2000)) {
+        return PS_ERR_DB_SERVER;
+    } else if ((myerrno >= 2000) && (myerrno < 3000)) {
+        return PS_ERR_DB_CLIENT;
+    }
+
+    return PS_ERR_UNKNOWN;
+}
+
 
 // pType utility functions

trunk/psLib/src/psErrorCodes_en.dat

@@ -20 +20 @@
 BAD_FITS                       file doesn't obey FITS standard
 IEEE                           a NaN or Inf was detected
+DB_CLIENT                       Database error originated in the client library
+DB_SERVER                       Database error generated by the server