Changeset 3223

Timestamp:

Feb 14, 2005, 9:28:50 PM (21 years ago)

Author:

jhoblitt

Message:

add psDBDeleteRows()
add psDBGenerateDeleteRowSQL()

Location:

trunk/archive/psdb

Files:

• psDB.c (modified) (5 diffs)
• psDB.h (modified) (2 diffs)
• test.c (modified) (1 diff)

trunk/archive/psdb/psDB.c

@@ -8 +8 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-15 07:27:02 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 07:28:50 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -39 +39 @@
 static char    *psDBGenerateInsertRowSQL(const char *tableName, psMetadata *row);
 static char    *psDBGenerateUpdateRowSQL(const char *tableName, psMetadata *where, psMetadata *values);
+static char    *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where);
 static char    *psDBGenerateWhereSQL(psMetadata *where);
 static char    *psDBGenerateSetSQL(psMetadata *set);
@@ -638 +639 @@
     psU32           paramCount;         // number of placeholders in query
     MYSQL_BIND      *bind;              // field values to insert
-    psU64           rowsAffected;
+    psU64           rowsAffected;       // number of rows affected by query
 
     query = psDBGenerateUpdateRowSQL(tableName, where, values);
@@ -716 +717 @@
 }
 
+psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where)
+{
+    char            *query;
+
+    query = psDBGenerateDeleteRowSQL(tableName, where);
+    if (!query) {
+        return -1;
+    }
+
+    if (!psDBRunQuery(dbh, query)) {
+        psFree(query);
+
+        return -1;
+    }
+
+    psFree(query);
+
+    if (!where) {
+        // we truncated the table so mysql_affected_rows() won't work
+
+        return 1;
+    }
+
+    return (psS64)mysql_affected_rows(dbh->mysql);
+}
 
 // database utility functions
@@ -967 +993 @@
     psFree(setSQL);
     psFree(whereSQL);
+
+    return query;
+}
+
+static char *psDBGenerateDeleteRowSQL(const char *tableName, psMetadata *where)
+{
+    char            *query = NULL;
+    char            *whereSQL;
+
+    // delete all rows if where is NULL
+    if (!where) {
+        psStringAppend(&query, "TRUNCATE TABLE %s", tableName);
+
+        return query;
+    }
+    
+    whereSQL = psDBGenerateWhereSQL(where);
+    if (!whereSQL) {
+        return NULL;
+    }
+
+    psStringAppend(&query, "DELETE FROM %s %s", tableName, whereSQL);
 
     return query;

trunk/archive/psdb/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-12 02:40:21 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 07:28:50 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -59 +59 @@
 psS64 psDBUpdateRows(psDB *dbh, const char *tableName, psMetadata *where, psMetadata *values);
 
+psS64 psDBDeleteRows(psDB *dbh, const char *tableName, psMetadata *where);
+
 /// @}
 

trunk/archive/psdb/test.c

@@ -248 +248 @@
         OK(rowsAffected, "psDBUpdateRows()");
     }
+
+    // psDBDeleteRows()
+    OK(psDBDeleteRows(dbh, "yak", NULL), "psDBDeleteRows()");
     
     // cleanup other tests