Release 2.0.32

added compatibility handling for massmail Setup now drop all tables first
phpManufaktur · Nov 2, 2013 · 8bf8b00 · 8bf8b00
1 parent 9da373f
commit 8bf8b00
Show file tree

Hide file tree

Showing 13 changed files with 197 additions and 11 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.31
+2.0.32
diff --git a/info.php b/info.php
@@ -23,7 +23,7 @@
     $module_directory     = 'sync_data';
     $module_name          = 'SyncData';
     $module_function      = 'tool';
-    $module_version       = '2.0.31';
+    $module_version       = '2.0.32';
     $module_status        = 'Stable';
     $module_platform      = '2.8';
     $module_author        = 'Team phpManufaktur <[email protected]>';

diff --git a/vendor/phpManufaktur/SyncData/Data/BackupFiles.php b/vendor/phpManufaktur/SyncData/Data/BackupFiles.php
@@ -71,7 +71,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw new \Exception($e);
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/BackupMaster.php b/vendor/phpManufaktur/SyncData/Data/BackupMaster.php
@@ -70,7 +70,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a table to the backup master

diff --git a/vendor/phpManufaktur/SyncData/Data/BackupTables.php b/vendor/phpManufaktur/SyncData/Data/BackupTables.php
@@ -69,7 +69,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php b/vendor/phpManufaktur/SyncData/Data/Configuration/Configuration.php
@@ -209,6 +209,9 @@ protected function getConfigurationFromCMS()
                                 ),
                                 'pages' => array(
                                     'enabled' => false
+                                ),
+                                'mod_massmail' => array(
+                                    'enabled' => true
                                 )
                             )
                         ),

diff --git a/vendor/phpManufaktur/SyncData/Data/General.php b/vendor/phpManufaktur/SyncData/Data/General.php
@@ -351,7 +351,7 @@ public function insert($table, $data, $replace_cms_url=true)
             $table_name = substr($table, strlen(CMS_TABLE_PREFIX));
 
             if (isset($this->app['config']['restore']['tables']['utf-8']['compatibility']['table'][$table_name]) &&
-                ($this->app['config']['restore']['tables']['utf-8']['compatibility'][$table_name]['enabled'])) {
+                ($this->app['config']['restore']['tables']['utf-8']['compatibility']['table'][$table_name]['enabled'])) {
                 // force the compatibility mode for this table
                 return $this->compatibilityInsert($table, $data, $replace_cms_url);
             }

diff --git a/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php b/vendor/phpManufaktur/SyncData/Data/Setup/Setup.php
@@ -54,27 +54,42 @@ public function exec()
         try {
             // Backup Master table
             $BackupMaster = new BackupMaster($this->app);
+            $BackupMaster->dropTable();
             $BackupMaster->createTable();
+
             // Backup Tables
             $BackupTables = new BackupTables($this->app);
+            $BackupTables->dropTable();
             $BackupTables->createTable();
+
             // Synchronize Tables
             $SynchronizeTables = new SynchronizeTables($this->app);
+            $SynchronizeTables->dropTable();
             $SynchronizeTables->createTable();
+
             // Backup files
             $BackupFiles = new BackupFiles($this->app);
+            $BackupFiles->dropTable();
             $BackupFiles->createTable();
+
             // Synchronize Master
             $SynchronizeMaster = new SynchronizeMaster($this->app);
+            $SynchronizeMaster->dropTable();
             $SynchronizeMaster->createTable();
+
             // Synchronize Files
             $SynchronizeFiles = new SynchronizeFiles($this->app);
+            $SynchronizeFiles->dropTable();
             $SynchronizeFiles->createTable();
+
             // Synchronize Archives
             $SynchronizeArchives = new SynchronizeArchives($this->app);
+            $SynchronizeArchives->dropTable();
             $SynchronizeArchives->createTable();
+
             // Synchronize Client
             $SynchronizeClient = new SynchronizeClient($this->app);
+            $SynchronizeClient->dropTable();
             $SynchronizeClient->createTable();
 
             $this->app['monolog']->addInfo('Setup is complete',

diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeArchives.php
@@ -69,7 +69,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeClient.php
@@ -71,7 +71,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeFiles.php
@@ -72,7 +72,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeMaster.php
@@ -70,7 +70,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table

diff --git a/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php b/vendor/phpManufaktur/SyncData/Data/SynchronizeTables.php
@@ -72,7 +72,28 @@ public function createTable ()
         } catch (\Doctrine\DBAL\DBALException $e) {
             throw $e;
         }
-    } // createTable()
+    }
+
+    /**
+     * Delete table - switching check for foreign keys off before executing
+     *
+     * @throws \Exception
+     */
+    public function dropTable()
+    {
+        try {
+            $table = self::$table_name;
+            $SQL = <<<EOD
+    SET foreign_key_checks = 0;
+    DROP TABLE IF EXISTS `$table`;
+    SET foreign_key_checks = 1;
+EOD;
+            $this->app['db']->query($SQL);
+            $this->app['monolog']->addInfo("Drop table ".self::$table_name, array(__METHOD__, __LINE__));
+        } catch (\Doctrine\DBAL\DBALException $e) {
+            throw new \Exception($e);
+        }
+    }
 
     /**
      * Insert a new record into the table