Changeset 17854 for trunk/ippTools/src/pxadmin.c

Timestamp:

May 29, 2008, 11:59:21 AM (18 years ago)

Author:

jhoblitt

Message:

use share/pxadmin_drop_tables.sql to drop tables instead of the ippdb functions

File:

• trunk/ippTools/src/pxadmin.c (modified) (4 diffs)

trunk/ippTools/src/pxadmin.c

@@ -23 +23 @@
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "pxtools.h"
 #include "pxadmin.h"
+
+bool deleteMode(pxConfig *config);
 
 int main(int argc, char **argv)
@@ -39 +42 @@
     switch (config->mode) {
         case PXADMIN_MODE_RECREATE:
-            if (!pxDeleteTables(config)) {
+            if (!deleteMode(config)) {
                 goto FAIL;
             }
@@ -49 +52 @@
             break;
         case PXADMIN_MODE_DELETE:
-            if (!pxDeleteTables(config)) {
+            if (!deleteMode(config)) {
                 goto FAIL;
             }
@@ -74 +77 @@
     exit(exit_status);
 }
+
+bool deleteMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psString query = pxDataGet("pxadmin_drop_tables.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    // BEGIN
+    if (!psDBTransaction(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    // loop over all statements in string
+    psList *statements = psStringSplit(query, ";", false);
+    psFree(query);
+
+    psString q = NULL;
+    psListIterator *iter = psListIteratorAlloc(statements, PS_LIST_HEAD, false);
+    while ((q = psListGetAndIncrement(iter))) {
+        if (!p_psDBRunQuery(config->dbh, q)) {
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(iter);
+            psFree(statements);
+            return false;
+        }
+    }
+    psFree(iter);
+    psFree(statements);
+
+    // COMMIT
+    if (!psDBCommit(config->dbh)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}