Changeset 4389 for trunk/psLib/src/dataIO/psDB.c

Timestamp:

Jun 24, 2005, 3:16:50 PM (21 years ago)

Author:

evanalst

Message:

Update function psDBDeleteRows to handle invalid arguments.

File:

• trunk/psLib/src/dataIO/psDB.c (modified) (4 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-24 21:29:41 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 01:16:50 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -783 +783 @@
 {
     char            *query;
-
+    psS64           rows = 0;
+
+    // Verify database is not NULL
+    if(dbh == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return -1;
+    }
+
+    // Create SQL statement string
     query = psDBGenerateDeleteRowSQL(tableName, where);
     if (!query) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Query generation failed.");
-
         return -1;
     }
 
+    // Run SQL query
     if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Delete failed.");
-
         mysql_rollback(dbh->mysql);
-
         psFree(query);
-
         return -1;
     }
-
     psFree(query);
 
-    if (!where) {
-        // we truncated the table so mysql_affected_rows() won't work
-        return 1;
-    }
+    // Get the number of affected row for the delete command
+    rows = (psS64)mysql_affected_rows(dbh->mysql);
 
     // point of no return
     mysql_commit(dbh->mysql);
 
-    return (psS64)mysql_affected_rows(dbh->mysql);
+    return rows;
 }
 
@@ -1138 +1140 @@
     if (!where) {
         psStringAppend(&query, "TRUNCATE TABLE %s", tableName);
-
         return query;
     }
 
+    // Generate 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;
+    }
+
+    // Complete delete SQL command string
     psStringAppend(&query, "DELETE FROM %s %s", tableName, whereSQL);
     psFree(whereSQL);
@@ -1163 +1165 @@
     if (!where) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true, "where param may not be NULL.");
-
         return NULL;
     }