Index: /trunk/archive/psdb/test.c
===================================================================
--- /trunk/archive/psdb/test.c	(revision 3179)
+++ /trunk/archive/psdb/test.c	(revision 3180)
@@ -5,4 +5,8 @@
 #include "psDB.h"
 #include "psleak.h"
+
+#define OK(test, name) \
+    printf("%s... ", name); \
+    test ? printf("OK\n") : printf("FAILED\n");
 
 int main (int argv, char **argc)
@@ -14,40 +18,53 @@
 
     psDB            *dbh;
-    psMetadata      *md;
-    psMetadataItem  *item;
-    psListIterator  *cursor;
-    psArray         *column;
-    psArray         *resultSet;
-    psVector        *columnNum;
-    int             i;
 
     // open db
     dbh = psDBInit("localhost", "test", NULL, "test");
-
-//    psDBCreate(dbh, "foobar");
-//    psDBChange(dbh, "foobar");
-//    psDBDrop(dbh, "foobar");
+    OK(dbh, "psDBInit()");
+
+    OK(psDBCreate(dbh, "foobar"), "psDBCreate()");
+    OK(psDBChange(dbh, "foobar"), "psDBChange()");
+    OK(psDBDrop(dbh, "foobar"), "psDBDrop()");
 
     // psDBCreateTable() & psDBDropTable()
-    md = psMetadataAlloc();
-    item = psMetadataItemAlloc("foo", PS_TYPE_S32, PS_META_PRIMITIVE, "Primary Key"); 
-    psMetadataAddItem(md, item, 0);
-    psFree(item);
-    item = psMetadataItemAlloc("bar", PS_TYPE_BOOL,PS_META_PRIMITIVE, "Key"); 
-    psMetadataAddItem(md, item, 1);
-    psFree(item);
-    item = psMetadataItemAlloc("baz", PS_TYPE_F64, PS_META_PRIMITIVE, NULL);
-    psMetadataAddItem(md, item, 2);
-    psFree(item);
-    item = psMetadataItemAlloc("boing", PS_TYPE_PTR, PS_META_STR, NULL, "60");
-    psMetadataAddItem(md, item, 3);
-    psFree(item);
-
-    psDBCreateTable(dbh, "bar", md);
-    psDBDropTable(dbh, "bar");
-
-    psFree(md);
+    {
+        psMetadata      *md;
+        psMetadataItem  *item;
+
+        md = psMetadataAlloc();
+        item = psMetadataItemAlloc("foo", PS_TYPE_S32, PS_META_PRIMITIVE, "Primary Key"); 
+        psMetadataAddItem(md, item, 0);
+        psFree(item);
+        item = psMetadataItemAlloc("bar", PS_TYPE_BOOL,PS_META_PRIMITIVE, "Key"); 
+        psMetadataAddItem(md, item, 1);
+        psFree(item);
+        item = psMetadataItemAlloc("baz", PS_TYPE_F64, PS_META_PRIMITIVE, NULL);
+        psMetadataAddItem(md, item, 2);
+        psFree(item);
+        item = psMetadataItemAlloc("boing", PS_TYPE_PTR, PS_META_STR, NULL, "60");
+        psMetadataAddItem(md, item, 3);
+        psFree(item);
+
+        OK(psDBCreateTable(dbh, "bar", md), "psDBCreateTable()");
+
+        psFree(md);
+
+        OK(psDBDropTable(dbh, "bar"), "psDBDropTable()");
+    }
     
-    // setup horses table for later tests
+    // setup horse table for later tests
+    {
+        psMetadata      *md;
+        psMetadataItem  *item;
+
+        md = psMetadataAlloc();
+        item = psMetadataItemAlloc("hair", PS_TYPE_F32, PS_META_PRIMITIVE, NULL);
+        psMetadataAddItem(md, item, 0);
+        psFree(item);
+        psDBCreateTable(dbh, "yak", md);
+        psFree(md);
+    }
+
+    // setup yak table for later tests
     {
         psMetadata      *md;
@@ -58,64 +75,92 @@
         psMetadataAddItem(md, item, 3);
         psFree(item);
-        psDBCreateTable(dbh, "horses", md);
+        psDBCreateTable(dbh, "horse", md);
         psFree(md);
     }
 
     // psDBSelectColumn()
-    column = psDBSelectColumn(dbh, "horses", "color", 42);
-    for (i = 0; i < column->n; i++) {
-        printf("horse color is: %s\n", (char *)column->data[i]);
-        printf("length is: %d\n", (int)strlen(column->data[i]));
-    }
-    psFree(column);
+    {
+        psArray         *column;
+        int             i;
+
+        column = psDBSelectColumn(dbh, "horse", "color", 42);
+        OK(column, "psDBSelectColumn()");
+
+        for (i = 0; i < column->n; i++) {
+            printf("horse color is: %s\n", (char *)column->data[i]);
+            printf("length is: %d\n", (int)strlen(column->data[i]));
+        }
+
+        psFree(column);
+    }
 
     // psDBSelectColumnNum()
-    columnNum = psDBSelectColumnNum(dbh, "baz", "yak", PS_TYPE_F32, 42);
-    for (i = 0; i < columnNum->n; i++) {
-        printf("yak count is: %f\n", columnNum->data.F32[i]);
-        if (isnan(columnNum->data.F32[i])){
-            printf("and it's a nan\n");
+    {
+        psVector        *column;
+        int             i;
+
+        column = psDBSelectColumnNum(dbh, "yak", "hair", PS_TYPE_F32, 42);
+        OK(column, "psDBSelectColumnNum()");
+
+        for (i = 0; i < column->n; i++) {
+            printf("yak count is: %f\n", column->data.F32[i]);
+            if (isnan(column->data.F32[i])){
+                printf("and it's a nan\n");
+            }
         }
-    }
-    psFree(columnNum);
+
+        psFree(column);
+    }
 
     // psDBSelectRows()
-    md = psMetadataAlloc();
-    item = psMetadataItemAlloc("color", PS_TYPE_PTR, PS_META_STR, NULL, "red"); 
-    psMetadataAddItem(md, item, 0);
-    psFree(item);
-
-    resultSet = psDBSelectRows(dbh, "horses", md);
-    psFree(md);
-    printf("row count is: %d\n", resultSet->n);
-    for (i = 0; i < resultSet->n; i++) {
-        md = (psMetadata *)resultSet->data[0];
-
-        cursor = psListIteratorAlloc(md->list, 0);
-
-        while ((item = psListGetNext(cursor))) {
-            printf("colum name is: %s\n", item->name);
-            printf("data is: %s\n", (char *)item->data.V);
+    {
+        psMetadata      *md;
+        psMetadataItem  *item;
+        psArray         *resultSet;
+        psListIterator  *cursor;
+        int             i;
+
+        md = psMetadataAlloc();
+        item = psMetadataItemAlloc("color", PS_TYPE_PTR, PS_META_STR, NULL, "red"); 
+        psMetadataAddItem(md, item, 0);
+        psFree(item);
+
+        resultSet = psDBSelectRows(dbh, "horse", md);
+        OK(resultSet, "psDBSelectRows()");
+
+        psFree(md);
+        printf("row count is: %d\n", resultSet->n);
+        for (i = 0; i < resultSet->n; i++) {
+            md = (psMetadata *)resultSet->data[0];
+
+            cursor = psListIteratorAlloc(md->list, 0);
+
+            while ((item = psListGetNext(cursor))) {
+                printf("colum name is: %s\n", item->name);
+                printf("data is: %s\n", (char *)item->data.V);
+            }
+
+            psFree(cursor);
         }
-
-        psFree(cursor);
-    }
-    psFree(resultSet);
+        psFree(resultSet);
+
+    }
 
     //psDBInsertOneRow();
-
-    md = psMetadataAlloc();
-    item = psMetadataItemAlloc("color", PS_TYPE_PTR, PS_META_STR, NULL, "brown"); 
-    psMetadataAddItem(md, item, 0);
-    psFree(item);
-
-    if (psDBInsertOneRow(dbh, "horses", md)) {
-            printf("psDBInsertOneRow succeeded\n");
-    }
-
-    psFree(md);
+    {
+        psMetadata      *md;
+        psMetadataItem  *item;
+
+        md = psMetadataAlloc();
+        item = psMetadataItemAlloc("color", PS_TYPE_PTR, PS_META_STR, NULL, "brown"); 
+        psMetadataAddItem(md, item, 0);
+        psFree(item);
+
+        OK(psDBInsertOneRow(dbh, "horse", md),"psDBInsertOneRow()");
+
+        psFree(md);
+    }
 
     //psDBInsertRows();
-
     {
         psArray         *rowSet;
@@ -131,5 +176,5 @@
         psFree(field);
         psArrayAdd(rowSet, 0, row);
-        psFree(row);
+//        psFree(row);
 
         row = psMetadataAlloc();
@@ -138,5 +183,5 @@
         psFree(field);
         psArrayAdd(rowSet, 0, row);
-        psFree(row);
+//        psFree(row);
 
         row = psMetadataAlloc();
@@ -145,9 +190,7 @@
         psFree(field);
         psArrayAdd(rowSet, 0, row);
-        psFree(row);
-
-        if (psDBInsertRows(dbh, "horses", rowSet)) {
-            printf("psDBInsertRows() succeeded\n");
-        }
+//        psFree(row);
+
+        OK(psDBInsertRows(dbh, "horse", rowSet), "psDBInsertRows()");
 
         psFree(rowSet);
@@ -155,9 +198,15 @@
 
     //psDBDumpRows();
-    resultSet = psDBDumpRows(dbh, "horses");
-    psFree(resultSet);
+    {
+        psArray         *resultSet;
+
+        resultSet = psDBDumpRows(dbh, "horse");
+        OK(resultSet, "psDBDumpRows()");
+        psFree(resultSet);
+    }
 
     // cleanup other tests
-    psDBDropTable(dbh, "horses");
+    psDBDropTable(dbh, "horse");
+    psDBDropTable(dbh, "yak");
 
     // close db