Changeset 4271

Timestamp:

Jun 15, 2005, 9:52:21 AM (21 years ago)

Author:

evanalst

Message:

Update psDBDropTable to handle invalid parameters.

Location:

trunk/psLib/src

Files:

• dataIO/psDB.c (modified) (2 diffs)
• dataIO/psFileUtilsErrors.dat (modified) (1 diff)
• dataIO/psFileUtilsErrors.h (modified) (2 diffs)
• db/psDB.c (modified) (2 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 03:20:04 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 19:52:21 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -230 +230 @@
     bool            status;
 
+    // Create SQL command string to drop table
     psStringAppend(&query, "DROP TABLE %s", tableName);
 
+    // Execute query
     status = p_psDBRunQuery(dbh, query);
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "Failed to drop table.");
+        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_TABLE_DROP_FAIL);
     }
 

trunk/psLib/src/dataIO/psFileUtilsErrors.dat

@@ -64 +64 @@
 psDB_TABLE_CREATE_FAIL                 Failed to create table.
 psDB_SQL_QUERY_FAIL                    Failed to execute SQL query.  Error: %s
+psDB_TABLE_DROP_FAIL                   Failed to drop table.
 #
 

trunk/psLib/src/dataIO/psFileUtilsErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 03:20:04 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 19:52:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -83 +83 @@
 #define PS_ERRORTEXT_psDB_TABLE_CREATE_FAIL "Failed to create table."
 #define PS_ERRORTEXT_psDB_SQL_QUERY_FAIL "Failed to execute SQL query.  Error: %s"
+#define PS_ERRORTEXT_psDB_TABLE_DROP_FAIL "Failed to drop table."
 //~End
 

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 03:20:04 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 19:52:21 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -230 +230 @@
     bool            status;
 
+    // Create SQL command string to drop table
     psStringAppend(&query, "DROP TABLE %s", tableName);
 
+    // Execute query
     status = p_psDBRunQuery(dbh, query);
     if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "Failed to drop table.");
+        psError(PS_ERR_UNKNOWN, false, PS_ERRORTEXT_psDB_TABLE_DROP_FAIL);
     }