Changeset 3957 for trunk/psLib/src/db

Timestamp:

May 17, 2005, 2:55:36 PM (21 years ago)

Author:

asc

Message:

Applied Josh's patch (bugzilla #413)

Location:

trunk/psLib/src/db

Files:

• psDB.c (modified) (10 diffs)
• psDB.h (modified) (2 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-06 18:15:25 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-18 00:55:36 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -43 +43 @@
 
 // database utility functions
-static bool     psDBRunQuery(psDB *dbh, const char *query);
 static inline bool psDBPackRow(MYSQL_BIND *bind, psMetadata *values, psU32 paramCount);
 
@@ -136 +135 @@
 
     // the MySQL C API notes that mysql_create_db() is deprecated
-    status = psDBRunQuery(dbh, query);
+    status = p_psDBRunQuery(dbh, query);
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "Failed to create new database.");
@@ -165 +164 @@
 
     // the MySQL C API notes that mysql_drop_db() is deprecated
-    status = psDBRunQuery(dbh, query);
+    status = p_psDBRunQuery(dbh, query);
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "Failed to drop database.");
@@ -187 +186 @@
     }
 
-    status = psDBRunQuery(dbh, query);
+    status = p_psDBRunQuery(dbh, query);
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "Failed to create table.");
@@ -204 +203 @@
     psStringAppend(&query, "DROP TABLE %s", tableName);
 
-    status = psDBRunQuery(dbh, query);
+    status = p_psDBRunQuery(dbh, query);
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "Failed to drop table.");
@@ -231 +230 @@
     }
 
-    if (!psDBRunQuery(dbh, query)) {
+    if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Query execution failed.");
         psFree(query);
@@ -388 +387 @@
     }
 
-    if (!psDBRunQuery(dbh, query)) {
+    if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Query execution failed.");
 
@@ -724 +723 @@
     }
 
-    if (!psDBRunQuery(dbh, query)) {
+    if (!p_psDBRunQuery(dbh, query)) {
         psError(PS_ERR_UNKNOWN, false, "Delete failed.");
 
@@ -750 +749 @@
 /*****************************************************************************/
 
-static bool psDBRunQuery(psDB *dbh, const char *query)
+bool p_psDBRunQuery(psDB *dbh, const char *query)
 {
     if (mysql_real_query(dbh->mysql, query, (unsigned long)strlen(query)) !=0) {

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 23:01:46 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-18 00:55:36 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -81 +81 @@
     psDB *dbh,                          ///< Database handle
     const char *dbname                  ///< Database namespace
+);
+
+/** Executes a SQL query
+ *
+ * This function will execute a string as a raw SQL query.  No additional
+ * processing of the string or abstraction of the underlying database's SQL
+ * dialect is provided.  Caveat emptor.
+ *
+ * @return true on success
+ */
+bool p_psDBRunQuery(
+    psDB *dbh,                          ///< Database handle
+    const char *query                   ///< SQL string to execute
 );