Index: /trunk/psLib/test/dataIO/tst_psDB.c
===================================================================
--- /trunk/psLib/test/dataIO/tst_psDB.c	(revision 4044)
+++ /trunk/psLib/test/dataIO/tst_psDB.c	(revision 4045)
@@ -9,6 +9,6 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-28 01:02:08 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-28 02:50:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -184,14 +184,35 @@
 }
 
-psMetadata *_get_rand_row( void )
+psMetadata *_get_const_row1( void )
 {
     char buf[32];
-    snprintf(buf, 32, "%d", rand());
+    snprintf(buf, 32, "%s","randrow1" );
     return _get_RowMetadata(
                "key_string", "comment-string", buf,
-               "key_s32",    "comment-s32",    rand(),
-               "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
-               "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
-               "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
+               //               "key_s32",    "comment-s32",    rand(),
+               "key_s32",    "comment-s32",    12345,
+               //               "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
+               "key_f32",    "comment-f32",    9876.5,
+               //               "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
+               "key_f64",    "comment-f64",    456.75,
+               //               "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
+               "key_bool",   "comment-bool",   true,
+               NULL,         NULL,             0.0);
+}
+
+psMetadata *_get_const_row2( void )
+{
+    char buf[32];
+    snprintf(buf, 32, "%s","randrow2");
+    return _get_RowMetadata(
+               "key_string", "comment-string", buf,
+               //               "key_s32",    "comment-s32",    rand(),
+               "key_s32",    "comment-s32",    2345,
+               //               "key_f32",    "comment-f32",    (double)rand()/RAND_MAX,
+               "key_f32",    "comment-f32",    876.5,
+               //               "key_f64",    "comment-f64",    (double)rand()/RAND_MAX,
+               "key_f64",    "comment-f64",    56.75,
+               //               "key_bool",   "comment-bool",   round((double)rand()/RAND_MAX),
+               "key_bool",   "comment-bool",   false,
                NULL,         NULL,             0.0);
 }
@@ -388,9 +409,9 @@
     if (!failed) {
 
-        row = _get_rand_row();
-        psDBInsertOneRow(dbh, table, row);
-        psFree(row);
-
-        row = _get_rand_row();
+        row = _get_const_row1();
+        psDBInsertOneRow(dbh, table, row);
+        psFree(row);
+
+        row = _get_const_row2();
         psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -474,9 +495,9 @@
     if (!failed) {
 
-        row = _get_rand_row();
-        psDBInsertOneRow(dbh, table, row);
-        psFree(row);
-
-        row = _get_rand_row();
+        row = _get_const_row1();
+        psDBInsertOneRow(dbh, table, row);
+        psFree(row);
+
+        row = _get_const_row2();
         psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -548,9 +569,9 @@
     if (!failed) {
 
-        row = _get_rand_row();
-        psDBInsertOneRow(dbh, table, row);
-        psFree(row);
-
-        row = _get_rand_row();
+        row = _get_const_row1();
+        psDBInsertOneRow(dbh, table, row);
+        psFree(row);
+
+        row = _get_const_row2();
         psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -627,5 +648,5 @@
     failed = ! psDBCreateTable(dbh, table, md);
     if (!failed) {
-        row = _get_rand_row();
+        row = _get_const_row1();
         failed = ! psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -661,9 +682,9 @@
         rowSet->n = 0;
 
-        row = _get_rand_row();
+        row = _get_const_row1();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
 
-        row = _get_rand_row();
+        row = _get_const_row2();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
@@ -734,9 +755,9 @@
     if (!failed) {
 
-        row = _get_rand_row();
-        psDBInsertOneRow(dbh, table, row);
-        psFree(row);
-
-        row = _get_rand_row();
+        row = _get_const_row1();
+        psDBInsertOneRow(dbh, table, row);
+        psFree(row);
+
+        row = _get_const_row2();
         psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -804,9 +825,9 @@
     if (!failed) {
 
-        row = _get_rand_row();
-        psDBInsertOneRow(dbh, table, row);
-        psFree(row);
-
-        row = _get_rand_row();
+        row = _get_const_row1();
+        psDBInsertOneRow(dbh, table, row);
+        psFree(row);
+
+        row = _get_const_row2();
         psDBInsertOneRow(dbh, table, row);
         psFree(row);
@@ -854,9 +875,9 @@
         rowSet->n = 0;
 
-        row = _get_rand_row();
+        row = _get_const_row1();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
 
-        row = _get_rand_row();
+        row = _get_const_row2();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
@@ -933,9 +954,9 @@
         rowSet->n = 0;
 
-        row = _get_rand_row();
+        row = _get_const_row1();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
 
-        row = _get_rand_row();
+        row = _get_const_row2();
         psArrayAdd(rowSet, 0, row);
         psFree(row);
Index: /trunk/psLib/test/dataIO/verified/tst_psDB.stderr
===================================================================
--- /trunk/psLib/test/dataIO/verified/tst_psDB.stderr	(revision 4044)
+++ /trunk/psLib/test/dataIO/verified/tst_psDB.stderr	(revision 4045)
@@ -68,11 +68,19 @@
     psDBSelectColumn shall select data from a test table.
 <DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    psDBSelectColumn: [randrow1]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    psDBSelectColumn: [randrow2]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     psDBSelectColumn: [hello world!]
 <DATE><TIME>|<HOST>|I|TPDBSelectColumn
-    psDBSelectColumn: [hello world!]
-<DATE><TIME>|<HOST>|I|TPDBSelectColumn
-    psDBSelectColumn: [hello world!]
-<DATE><TIME>|<HOST>|I|TPDBSelectColumn
     found expected string output.
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    psDBSelectColumn: [1]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    psDBSelectColumn: [0]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    psDBSelectColumn: [1]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumn
+    found expected string output.
 
 ---> TESTPOINT PASSED (psDB{dbSelectColumn} | tst_psDB.c)
@@ -89,11 +97,19 @@
     psDBSelectColumnNum shall select data from a test table.
 <DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    str=[12345]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    str=[2345]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     str=[1974]
 <DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
-    str=[1974]
-<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
-    str=[1974]
-<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
     found expected S32 output.
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    bool=[1]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    bool=[0]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    bool=[1]
+<DATE><TIME>|<HOST>|I|TPDBSelectColumnNum
+    found expected bool output.
 
 ---> TESTPOINT PASSED (psDB{dbSelectColumnNum} | tst_psDB.c)
@@ -118,4 +134,12 @@
     [key_f64]=[2.71828]
 <DATE><TIME>|<HOST>|I|_print_row
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[3]
+<DATE><TIME>|<HOST>|I|TPDBSelectRows
+    found expected output.
+<DATE><TIME>|<HOST>|I|TPDBSelectRows
+    found expected output.
+<DATE><TIME>|<HOST>|I|_print_row
     [key_string]=[hello world!]
 <DATE><TIME>|<HOST>|I|_print_row
@@ -126,11 +150,9 @@
     [key_f64]=[2.71828]
 <DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[3]
+<DATE><TIME>|<HOST>|I|TPDBSelectRows
+    found expected output.
 <DATE><TIME>|<HOST>|I|TPDBSelectRows
     found expected output.
@@ -162,4 +184,28 @@
     psDBInsertRows shall insert rows into a test table.
 <DATE><TIME>|<HOST>|I|_print_row
+    [key_string]=[randrow1]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32]=[12345]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f32]=[9876.5]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f64]=[456.75]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[1]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_string]=[randrow2]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32]=[2345]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f32]=[876.5]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f64]=[56.75]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_bool]=[Nay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[2]
+<DATE><TIME>|<HOST>|I|_print_row
     [key_string]=[hello world!]
 <DATE><TIME>|<HOST>|I|_print_row
@@ -170,19 +216,9 @@
     [key_f64]=[2.71828]
 <DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[3]
+<DATE><TIME>|<HOST>|I|TPDBInsertRows
+    found expected output.
 <DATE><TIME>|<HOST>|I|TPDBInsertRows
     found expected output.
@@ -201,4 +237,28 @@
     psDBDumpRows shall dump all rows from a test table.
 <DATE><TIME>|<HOST>|I|_print_row
+    [key_string]=[randrow1]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32]=[12345]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f32]=[9876.5]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f64]=[456.75]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[1]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_string]=[randrow2]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32]=[2345]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f32]=[876.5]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_f64]=[56.75]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_bool]=[Nay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[2]
+<DATE><TIME>|<HOST>|I|_print_row
     [key_string]=[hello world!]
 <DATE><TIME>|<HOST>|I|_print_row
@@ -209,19 +269,9 @@
     [key_f64]=[2.71828]
 <DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
+    [key_bool]=[Yay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[3]
+<DATE><TIME>|<HOST>|I|TPDBDumpRows
+    found expected output.
 <DATE><TIME>|<HOST>|I|TPDBDumpRows
     found expected output.
@@ -240,5 +290,5 @@
     psDBDumpCols shall dump all cols from a test table.
 <DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[]
+    [key_string]=[]
 
 ---> TESTPOINT PASSED (psDB{dbDumpCols} | tst_psDB.c)
@@ -263,19 +313,9 @@
     [key_f64]=[1.23457]
 <DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[foobar]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[-18]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.33]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[1.23457]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[foobar]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[-18]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.33]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[1.23457]
+    [key_bool]=[Nay]
+<DATE><TIME>|<HOST>|I|_print_row
+    [key_s32_0]=[3]
+<DATE><TIME>|<HOST>|I|TPDBUpdateRows
+    found expected output.
 <DATE><TIME>|<HOST>|I|TPDBUpdateRows
     found expected output.
@@ -294,5 +334,5 @@
     psDBDeleteRows shall delete rows from a test table.
 <DATE><TIME>|<HOST>|I|TPDBDeleteRows
-    found expected empty table.
+    found expected two-row table.
 
 ---> TESTPOINT PASSED (psDB{dbDeleteRows} | tst_psDB.c)