Merge pull request #65 from MarkusKepert/master

fix temp table creation issue and the root cause
newroco · Jun 15, 2021 · fbadc52 · fbadc52
2 parents ab45740 + cb44a50
commit fbadc52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/w2g2/lib/Migration/PostMigration.php b/w2g2/lib/Migration/PostMigration.php
@@ -170,7 +170,7 @@ protected function getLock($lock)
      */
     protected function dropTempTable()
     {
-        $dropStatement = "DROP TABLE " . $this->tempTableName;
+        $dropStatement = "DROP TABLE IF EXISTS " . $this->tempTableName;
 
         $this->db->executeQuery($dropStatement);
     }

diff --git a/w2g2/lib/Migration/PreMigration.php b/w2g2/lib/Migration/PreMigration.php
@@ -66,9 +66,19 @@ protected function isOldVersion()
      */
     protected function createTempTable()
     {
+        /**
+         * cleanup temp table (issue #68)
+         */
+        $cleanupStatement = "DROP TABLE IF EXISTS " . $this->tempTableName;
+        $this->db->executeQuery($cleanupStatement);
+
+        /**
+        * create temp table
+        */
+
         $createStatement = "CREATE TABLE " .
             $this->tempTableName .
-            " (name varchar(255) PRIMARY KEY, created TIMESTAMP DEFAULT null, locked_by varchar(255))";
+            " (name varchar(255) PRIMARY KEY, locked_by varchar(255), created TIMESTAMP null DEFAULT null)";
 
         $this->db->executeQuery($createStatement);
     }
@@ -79,8 +89,8 @@ protected function createTempTable()
      */
     protected function insertDataInTempTable()
     {
-        $insertStatement = "INSERT INTO " . $this->tempTableName .
-            " SELECT * FROM " . $this->tableName;
+        $insertStatement = "INSERT INTO " . $this->tempTableName . " (name, locked_by, created)" .
+            " SELECT file_id, locked_by, created FROM " . $this->tableName;
 
         $this->db->executeQuery($insertStatement);
     }