Changeset 37246 for trunk/ippToPsps/jython/mysql.py

Timestamp:

Aug 12, 2014, 4:10:18 PM (12 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20140717

File:

• trunk/ippToPsps/jython/mysql.py (modified) (5 diffs)

trunk/ippToPsps/jython/mysql.py

@@ -83 +83 @@
     '''
     def lockTable(self, table):
+        # print "Locking table: " + table
         self.execute("LOCK TABLES " + table + " WRITE")
 
@@ -89 +90 @@
     '''
     def unlockTables(self):
+        # print "Unlocking tables"
         self.execute("UNLOCK TABLES")
 
@@ -109 +111 @@
             print "failed to kill connection: ", connectionID
 
+    def listTables(self):
+
+        sql = "show tables"
+        rs = self.executeQuery(sql)  
+        while (rs.next()):
+            tableName = rs.getString(1)
+            # print "table: " + tableName
+        rs.close()
+
     '''
     Checks whether this table exists
@@ -200 +211 @@
 
     '''
+    Add a column to the table
+    '''
+    def addColumn(self, table, column, type):
+
+        sql = "ALTER TABLE " + table + " ADD COLUMN " + column + " " + type
+        try: self.execute(sql)
+        except: return
+
+    '''
     Drops a list of tables
     '''
@@ -271 +291 @@
         except: pass
             #self.logger.warn("Index already in place on '" + column + "' for table '" + table + "'")
+
+    def addPrimaryKeyWithIgnore(self, table, column):
+        # note that in mysql versions later than 5.1, this fails
+        # unless the following is called first: 
+        # "set session old_alter_table=1"
+
+        # follow the command with 
+        # "set session old_alter_table=0"
+
+        # OF COURSE, this fails for mysql version <= 5.1...
+        if self.scratchDb.version > 5.1:
+            self.scratchDb.execute("set session old_alter_table=1")
+
+        # I should probably do this before the whole table is built, right?
+        sql = "ALTER IGNORE TABLE " + table + " ADD PRIMARY KEY (" + column + ")"
+        self.scratchDb.execute(sql)
+        
+        if self.scratchDb.version > 5.1:
+            self.scratchDb.execute("set session old_alter_table=0")
 
     '''