Lowercase table name of advanced layout settings

IlchCMS · Apr 15, 2020 · bfae434 · bfae434
1 parent 820e162
commit bfae434
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/application/modules/admin/config/config.php b/application/modules/admin/config/config.php
@@ -178,7 +178,7 @@ public function getInstallSql()
                 `info` VARCHAR(255) NOT NULL
             ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
             
-            CREATE TABLE IF NOT EXISTS `[prefix]_admin_layoutAdvSettings` (
+            CREATE TABLE IF NOT EXISTS `[prefix]_admin_layoutadvsettings` (
                 `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
                 `layoutKey` VARCHAR(255) NOT NULL,
                 `key` VARCHAR(255) NOT NULL,
@@ -660,7 +660,7 @@ public function getUpdate($installedVersion)
                 rename(ROOT_PATH.'/_vendor', ROOT_PATH.'/vendor');
                 break;
             case "2.1.31":
-                $this->db()->query('CREATE TABLE IF NOT EXISTS `[prefix]_admin_layoutAdvSettings` (
+                $this->db()->query('CREATE TABLE IF NOT EXISTS `[prefix]_admin_layoutadvsettings` (
                     `id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
                     `layoutKey` VARCHAR(255) NOT NULL,
                     `key` VARCHAR(255) NOT NULL,
@@ -672,6 +672,9 @@ public function getUpdate($installedVersion)
                 removeDir(ROOT_PATH.'/delete_vendor');
                 rename(ROOT_PATH.'/_vendor', ROOT_PATH.'/vendor');
                 break;
+            case "2.1.32":
+                // Lowercase table name as it caused problems on different os (case sensitive or insensitive)
+                $this->db()->query('ALTER TABLE `[prefix]_admin_layoutAdvSettings` RENAME TO `[prefix]_admin_layoutadvsettings`;');
         }
 
         return 'Update function executed.';

diff --git a/application/modules/admin/mappers/LayoutAdvSettings.php b/application/modules/admin/mappers/LayoutAdvSettings.php
@@ -25,7 +25,7 @@ class LayoutAdvSettings extends \Ilch\Mapper
     public function getSetting($layoutKey, $key)
     {
         $result = $this->db()->select('*')
-            ->from('admin_layoutAdvSettings')
+            ->from('admin_layoutadvsettings')
             ->where(['layoutKey' => $layoutKey, 'key' => $key])
             ->execute()
             ->fetchAssoc();
@@ -52,7 +52,7 @@ public function getSetting($layoutKey, $key)
     public function getSettings($layoutKey)
     {
         $array = $this->db()->select('*')
-            ->from('admin_layoutAdvSettings')
+            ->from('admin_layoutadvsettings')
             ->where(['layoutKey' => $layoutKey])
             ->execute()
             ->fetchRows();
@@ -82,7 +82,7 @@ public function getSettings($layoutKey)
     public function getListOfLayoutKeys()
     {
         $layoutKeys = $this->db()->select('DISTINCT layoutKey')
-            ->from('admin_layoutAdvSettings')
+            ->from('admin_layoutadvsettings')
             ->execute()
             ->fetchList();
 
@@ -129,7 +129,7 @@ public function save($models)
      */
     private function updateSetting($model)
     {
-        $affectedRows = $this->db()->update('admin_layoutAdvSettings')
+        $affectedRows = $this->db()->update('admin_layoutadvsettings')
             ->values([
                 'layoutKey' => $model->getLayoutKey(),
                 'key' => $model->getKey(),
@@ -142,7 +142,7 @@ private function updateSetting($model)
             // If the value was unchanged then affected rows will be 0, even though it was existing.
             // Therefore check if the specific setting exists in this case.
             return $this->db()->select('COUNT(*)')
-                ->from('admin_layoutAdvSettings')
+                ->from('admin_layoutadvsettings')
                 ->where(['layoutKey' => $model->getLayoutKey(), 'key' => $model->getKey()])
                 ->execute()
                 ->fetchCell();
@@ -162,7 +162,7 @@ private function insertSetting($model)
             return;
         }
 
-        $this->db()->insert('admin_layoutAdvSettings')
+        $this->db()->insert('admin_layoutadvsettings')
             ->values([
                 'layoutKey' => $model->getLayoutKey(),
                 'key' => $model->getKey(),
@@ -180,7 +180,7 @@ private function insertSetting($model)
     public function hasSettings($layoutKey)
     {
         return (bool)$this->db()->select('COUNT(*)')
-            ->from('admin_layoutAdvSettings')
+            ->from('admin_layoutadvsettings')
             ->where(['layoutKey' => $layoutKey])
             ->execute()
             ->fetchCell();
@@ -225,7 +225,7 @@ public function deleteSettings($layoutKey)
      */
     private function deleteBy($where)
     {
-        $this->db()->delete('admin_layoutAdvSettings')
+        $this->db()->delete('admin_layoutadvsettings')
             ->where($where)
             ->execute();
     }

diff --git a/index.php b/index.php
@@ -29,7 +29,7 @@
 $serverTimeZone = @date_default_timezone_get();
 date_default_timezone_set('UTC');
 
-define('VERSION', '2.1.32');
+define('VERSION', '2.1.33');
 define('ILCH_SERVER', 'http://www.ilch.de/ilch2');
 define('SERVER_TIMEZONE', $serverTimeZone);
 define('DEFAULT_MODULE', 'page');