Changeset 4382 for trunk/psLib/src/db

Timestamp:

Jun 24, 2005, 11:29:41 AM (21 years ago)

Author:

evanalst

Message:

Update psDBUpdateRows for invalid arguments.

File:

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

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-24 02:09:23 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-24 21:29:41 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -708 +708 @@
     my_ulonglong    rowsAffected;       // number of rows affected by query
 
+    // Verify database object is not NULL
+    if(dbh == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return -1;
+    }
+
+    // Generate SQL query to update row
     query = psDBGenerateUpdateRowSQL(tableName, where, values);
     if (!query) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
-
+        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
         return -1;
     }
 
+    // Initialize SQL statement
     stmt = mysql_stmt_init(dbh->mysql);
     if (!stmt) {
@@ -720 +727 @@
     }
 
+    // Prepare SQL statement
     if (mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query))) {
-        psError(PS_ERR_UNKNOWN, true, "Failed to prepare query.  Error: %s", mysql_stmt_error(stmt));
-
+        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_SQL_PREPARE_FAIL, mysql_stmt_error(stmt));
         mysql_stmt_close(stmt);
         psFree(query);
-
         return -1;
     }
-
     psFree(query);
 
@@ -743 +748 @@
         psFree(bind);
         mysql_stmt_close(stmt);
-
         return -1;
     }
@@ -749 +753 @@
     if (mysql_stmt_bind_param(stmt, bind)) {
         psError(PS_ERR_UNKNOWN, true, "Failed to bind params.  Error: %s", mysql_stmt_error(stmt));
-
         mysql_rollback(dbh->mysql);
-
         psFree(bind);
         mysql_stmt_close(stmt);
-
         return -1;
     }
@@ -761 +762 @@
         psError(PS_ERR_UNKNOWN, true, "Failed to execute prepared statement.  Error: %s",
                 mysql_stmt_error(stmt));
-
         mysql_rollback(dbh->mysql);
-
         psFree(bind);
         mysql_stmt_close(stmt);
-
         return -1;
     }
@@ -845 +843 @@
     psU32           i;                  // field index
 
+    // Verify values or bind are not null
+    if((values == NULL) || (bind == NULL)) {
+        return false;
+    }
+
     // check size of values == paramCount ?
-
     cursor = psListIteratorAlloc(values->list, 0, false);
 
@@ -1100 +1102 @@
     char            *whereSQL;
 
+    // Verify where and values pointer are not NULL
     if ((!values) || (!where)) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true, "values and where params may not be NULL.");
-
-        return NULL;
-    }
-
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psDB_UPDATE_ROW_FAIL);
+        return NULL;
+    }
+
+    // Create set SQL substring
     setSQL = psDBGenerateSetSQL(values);
     if (!setSQL) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "SQL substring generation failed.");
-
-        return NULL;
-    }
-
+        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_SQL_SUBSTR_FAIL);
+        return NULL;
+    }
+
+    // Create where SQL substring
     whereSQL = psDBGenerateWhereSQL(where);
     if (!whereSQL) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "SQL substring generation failed.");
-
-        return NULL;
-    }
-
+        psError(PS_ERR_UNEXPECTED_NULL, false, PS_ERRORTEXT_psDB_SQL_SUBSTR_FAIL);
+        return NULL;
+    }
+
+    // Append substring to SQL update string
     psStringAppend(&query, "UPDATE %s %s %s", tableName, setSQL, whereSQL);
     psFree(setSQL);