Changeset 38052 for branches/eam_branches/ipp-20150112/ippToPsps/jython/mysql.py

Timestamp:

Mar 28, 2015, 8:28:32 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150112/ippToPsps/jython/mysql.py (modified) (2 diffs)

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

@@ -258 +258 @@
             self.execute(sql)
         except: pass
-            #self.logger.warn("Index already in place on '" + column + "' for table '" + table + "'")
+            
+           # self.logger.warn("Index already in place on '" + column + "' for table '" + table + "'")
     '''
     Changes the database engine for this table to InnoDb
@@ -477 +478 @@
         self.execute("SET @i = 0")
         self.execute("UPDATE " + table + " SET " + colName + "=(@i:=@i+1)")
-        self.execute("ALTER TABLE " + table + " ADD PRIMARY KEY (" + colName + ")")
-
+        self.execute("ALTER IGNORE TABLE " + table + " ADD PRIMARY KEY (" + colName + ")")
+
+    '''                                                                                                                                             
+    Adds a column to this table which contains a row count                                                                                          
+    '''
+    def addRowCountColumnNoKey(self, table, colName):
+
+        self.execute("ALTER TABLE " + table + " ADD COLUMN " + colName + " INTEGER FIRST")
+        self.execute("SET @i = 0")
+        self.execute("UPDATE " + table + " SET " + colName + "=(@i:=@i+1)")
+