Changeset 4295

Timestamp:

Jun 16, 2005, 4:56:26 PM (21 years ago)

Author:

evanalst

Message:

Update test case for psDBSelectRows with null where argument.

Location:

trunk/psLib/test/dataIO

Files:

• tst_psDB.c (modified) (4 diffs)
• verified/tst_psDB.stderr (modified) (1 diff)

trunk/psLib/test/dataIO/tst_psDB.c

@@ -9 +9 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 02:16:53 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-17 02:56:26 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -849 +849 @@
     }
 
+    psDBDropTable(dbh,table);
     // Create database table for test
     if(!psDBCreateTable(dbh, table, md)) {
@@ -889 +890 @@
             psDBCleanup(dbh);
             return 1;
+        }
+
+        if(ary->n != 1) {
+            psError(PS_ERR_UNKNOWN,true,"Number of rows %d not as expected %d",
+                    ary->n, 1);
+            psDBDropTable(dbh,table);
+            psDBCleanup(dbh);
+            return 2;
         }
 
@@ -946 +955 @@
     }
 
+    // Select rows with no where specified
+    ary1 = psDBSelectRows(dbh, table, NULL, 0);
+    if(ary1 == NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return using NULL where");
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 6;
+    }
+    if(ary1->n != 3) {
+        psError(PS_ERR_UNKNOWN,true,"Rows return %d not as expected %d",
+                ary->n,3);
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 7;
+    }
+    psFree(ary1);
 
     psDBDropTable(dbh, table);
-
     psFree(md);
     psDBCleanup(dbh);

trunk/psLib/test/dataIO/verified/tst_psDB.stderr

@@ -155 +155 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|E|p_psDBRunQuery (FILE:LINENO)
+    Failed to execute SQL query.  Error: Unknown table 'table5'
+<DATE><TIME>|<HOST>|E|psDBDropTable (FILE:LINENO)
+    Failed to drop table.
 <DATE><TIME>|<HOST>|I|TPDBSelectRows
     Following should generate an error message for NULL database object