Changeset 38837 for trunk/ippToPsps/jython/sqlUtility.py

Timestamp:

Oct 10, 2015, 12:40:44 PM (11 years ago)

Author:

eugene

Message:

make code less forgiving: sql execute aborts on failures; deal with various hidden problems: add IF EXISTS to drop table operations to avoid raising unneeded error, make sure tables exist before trying to add indexes, test for existence of the stack _xsrc, _xfit, etc tables (and skip if missing); fix sqlLine.group to cast inputs to string before performing string ops; getKeyFloat now returns a float value which is safe with sqlLine.group, but can be used in a math expression; use python math. operators as needed (sqrt, fabs); fulltest.sh runs for camera, stack, object stages; update dvoSkyTable to use REGION_ID instead of special word INDEX; add existsClient method (avoid using mysql failure as a test for table existence); no need to test for exceptions to sql.execute since we abort on failure; replace esoteric SQL with dropTable calls; trap errors in stilts.treads in setupScratchdb; drop StackObjecThin and StackDetOffMeta along with other stack scratch tables

File:

• trunk/ippToPsps/jython/sqlUtility.py (modified) (6 diffs)

trunk/ippToPsps/jython/sqlUtility.py

@@ -12 +12 @@
         self.fields = []
         self.values = []
-        self.startString = startString
+        self.startString = str(startString)
         return
     
     def group(self,field,value):
-        self.fields.append(field)
-        self.values.append(value)
+        self.fields.append(str(field))
+        self.values.append(str(value))
+        print "* " + str(field) + " = " + str(value)
         return
 
@@ -30 +31 @@
                 output += ", "
 
-        output += " " + middleString + "  "
+        output += " " + str(middleString) + "  "
 
         for i in range(len(self.values)):
@@ -37 +38 @@
                 output += ", "
         
-        output += " " + endString
+        output += " " + str(endString)
 
         return output
@@ -51 +52 @@
                 output += ", "
 
-        output += " " + middleString + " "
+        output += " " + str(middleString) + " "
 
         for i in range(len(self.values)):
@@ -58 +59 @@
                 output += ", "
         
-        output += " " + endString
+        output += " " + str(endString)
 
         return output
@@ -72 +73 @@
                 output += ", "
         
-        output += " " + endString
+        output += " " + str(endString)
 
         return output