Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/mysql.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/mysql.py (modified) (6 diffs)

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

@@ -34 +34 @@
         self.dbPass = config.getDbPassword(dbType)
 
+        # a user friendly connection sring
+        connectionStr = self.dbName + "@" + self.dbHost
+
         # set up JDBC connection
         self.url = "jdbc:mysql://"+self.dbHost+"/"+self.dbName+"?autoReconnect=true&user="+self.dbUser+"&password="+self.dbPass
@@ -39 +42 @@
             self.con = DriverManager.getConnection(self.url)
             self.connectionID = self.getLastConnectionID()
-            self.logger.debug("MySQL connection to %s with ID %d" % (dbType, self.connectionID))
+            self.logger.infoPair("Connected to MySQL Db", connectionStr)
         except:
-            self.logger.error("Unable to connect to " + self.url)
-            self.everythingOK = False # TODO need this?
+            self.logger.errorPair("Unable to connect to", connectionStr)
             self.connected = False
-            return
-
-        self.everythingOK = True
+            raise
+
         self.connected = True
 
@@ -88 +89 @@
         sql = "KILL %d" % connectionID
         self.execute(sql)
+
+    '''
+    Checks whether this table exists
+    '''
+    def tableExists(self, tableName):
+
+        sql = "SELECT COUNT(*) \
+               FROM information_schema.tables \
+               WHERE table_schema = '" + self.dbName + "' \
+               AND table_name = '" + tableName + "'"
+
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            if rs.getInt(1) > 0: return True
+            else: return False
+        except:
+            self.logger.errorPair("Could not check if table exists", sql)
+            pass
+
+        return False
 
     '''
@@ -159 +181 @@
 
     '''
+    Drops a list of tables
+    '''
+    def dropTables(self, tables):
+        for table in tables: self.dropTable(table)
+
+    '''
     Drops a table
     '''
@@ -224 +252 @@
         except: pass
             #self.logger.warn("Index already in place on '" + column + "' for table '" + table + "'")
+
+    '''
+    Checks that we have a connection
+    '''
+    def isConnected(self):
+
+        try: 
+            self.con
+            self.connected = True
+        except:
+            self.logger.errorPair("Not connected to", self.url)
+            self.connected = False
+
+        return self.connected
+
     '''
     TODO
     '''
     def execute(self, sql):
+
+        if not self.isConnected(): raise
 
         stmt = self.con.createStatement()
@@ -238 +283 @@
     def executeQuery(self, sql):
 
+        if not self.isConnected(): raise
+  
         stmt = self.con.createStatement()
         rs = stmt.executeQuery(sql)