Changeset 32337 for branches/eam_branches/ipp-20110710/ippToPsps/jython/mysql.py

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/ippToPsps/jython

Files:

• . (modified) (1 prop)
• mysql.py (modified) (3 diffs)

branches/eam_branches/ipp-20110710/ippToPsps/jython/mysql.py

@@ -36 +36 @@
         # set up JDBC connection
         self.url = "jdbc:mysql://"+self.dbHost+"/"+self.dbName+"?user="+self.dbUser+"&password="+self.dbPass
-        self.con = DriverManager.getConnection(self.url)
-        self.connectionID = self.getLastConnectionID()
-        self.logger.debug("MySQL connection to %s with ID %d" % (dbType, self.connectionID))
-
-        #self.stmt = self.con.createStatement()
+        try:
+            self.con = DriverManager.getConnection(self.url)
+            self.connectionID = self.getLastConnectionID()
+            self.logger.debug("MySQL connection to %s with ID %d" % (dbType, self.connectionID))
+        except:
+            self.logger.error("Unable to connect to " + self.url)
+            self.everythingOK = False
+            return
+
+        self.everythingOK = True
 
 
@@ -210 +215 @@
         nBad = rs.getInt(1)
 
-        sql="DELETE from " + tableName + " WHERE " + columnName + " = " + value
-        self.execute(sql)
-        self.logger.info("%s '%s' values in %s    %5d deleted" % (columnName, value, tableName, nBad))
+        sql="DELETE FROM " + tableName + " WHERE " + columnName + " = " + value
+        self.execute(sql)
+        self.logger.debugPair("%s rows with %s" % (columnName, value), "%d deleted" % nBad)
+
+        return nBad
 
     '''
@@ -224 +231 @@
         nBad = rs.getInt(1)
 
-        sql="DELETE from " + tableName + " WHERE " + columnName + " IS NULL"
-        self.execute(sql)
-        self.logger.infoPair("NULLs deleted from %s" % tableName, "%-5d %s" % (nBad, columnName))
+        sql="DELETE FROM " + tableName + " WHERE " + columnName + " IS NULL"
+        self.execute(sql)
+        self.logger.debugPair("NULL %s values" % columnName, "%d deleted" % nBad)
+
+        return nBad
 
     '''