src/hg/makeDb/metaTblUpdate/metaTblUpdate.c 1.5

Index: src/hg/makeDb/metaTblUpdate/metaTblUpdate.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/makeDb/metaTblUpdate/metaTblUpdate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/makeDb/metaTblUpdate/metaTblUpdate.c	19 Mar 2010 21:25:15 -0000	1.4
+++ src/hg/makeDb/metaTblUpdate/metaTblUpdate.c	25 Mar 2010 21:56:41 -0000	1.5
@@ -15,9 +15,8 @@
 #include "metaTbl.h"
 
 static char const rcsid[] = "$Id$";
 
-#define DB_DEFAULT      "hg19"
 #define OBJTYPE_DEFAULT "table"
 
 void usage()
 /* Explain usage and exit. */
@@ -37,12 +36,12 @@
   "  metadata var=val var2=\"val2 with spaces\" tableName=someTable fileName=someTable.narrowPeak.gz\n"
   "    if tableName and fileName and tableName=fileName.* then objName=someTable and objType=table.\n"
   "    else if tableName or fileName load as table or file\n\n"
   "usage:\n"
-  "   metaTblUpdate [-db=] [-table=] [-obj= [-type=] [-delete] [-var=] [-binary] [-val=]]\n"
+  "   metaTblUpdate -db= [-table=] [-obj= [-type=] [-delete] [-var=] [-binary] [-val=]]\n"
   "                       [-replace] [fileName]\n\n"
   "Options:\n"
-  "    -db      Database to load metadata to.  Default is '" DB_DEFAULT "'.\n"
+  "    -db      Database to load metadata to.  This argument is required.\n"
   "    -table   Table to load metadata to.  Default is '" METATBL_DEFAULT_NAME "'.\n"
   "  if file not provided, then -obj must be provided\n"
   "    -obj={objName}     Means Load from command line:\n"
   "       -type={objType} Used if adding new obj, otherwise ignored.  Default is '" OBJTYPE_DEFAULT "'.\n"
@@ -74,9 +73,12 @@
 {
 struct metaObj * metaObjs = NULL;
 
 optionInit(&argc, argv, optionSpecs);
-char *db    = optionVal("db",   DB_DEFAULT);
+if(!optionExists("db"))
+    usage();
+
+char *db    = optionVal("db",NULL);
 char *table = optionVal("table",METATBL_DEFAULT_NAME);
 boolean replace = FALSE;
 
 if(optionExists("obj"))
@@ -119,9 +121,11 @@
 
 if(metaObjs == NULL)
     usage();
 
-int count = metaObjsSetToDb(db,table,metaObjs,replace);
+struct sqlConnection *conn = sqlConnect(db);
+int count = metaObjsSetToDb(conn,table,metaObjs,replace);
+sqlDisconnect(&conn);
 
 verbose(1, "Affected %d row(s) in %s.%s\n", count,db,table);
 
 metaObjsFree(&metaObjs);