Merge pull request #69 from kmtbase/bugfix/escape-db-name

escape database name to avoid syntax error
OXIDprojects · Jun 26, 2023 · df680bc · df680bc
2 parents 4a3349b + 8805a2d
commit df680bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Oxrun/Command/Database/DumpCommand.php b/src/Oxrun/Command/Database/DumpCommand.php
@@ -129,7 +129,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $dbName = Registry::getConfig()->getConfigParam('dbName');
 
         if($input->getOption('ignoreViews')) {
-            $viewsResultArray = \oxDb::getDb()->getAll("SHOW FULL TABLES IN {$dbName} WHERE TABLE_TYPE LIKE 'VIEW'");
+            $viewsResultArray = \oxDb::getDb()->getAll("SHOW FULL TABLES IN `{$dbName}` WHERE TABLE_TYPE LIKE 'VIEW'");
             if (is_array($viewsResultArray)) {
                 foreach ($viewsResultArray as $sqlRow) {
                     $ignoreTables[] = $sqlRow[0];
@@ -303,17 +303,17 @@ protected function filterValidTables($tables)
         }
 
         $whereIN = implode("', '", $whereIN);
-        $conditionsIN = "Tables_in_{$dbName} IN ('{$whereIN}')";
+        $conditionsIN = "`Tables_in_{$dbName}` IN ('{$whereIN}')";
 
         $conditionsLIKE = '';
         if (!empty($whereLIKE)) {
-            $template = " OR Tables_in_{$dbName} LIKE ('%s')";
+            $template = " OR `Tables_in_{$dbName}` LIKE ('%s')";
             foreach ($whereLIKE as $tablename) {
                 $conditionsLIKE .= sprintf($template, $tablename);
             }
         }
 
-        $sqlstament = "SHOW FULL TABLES IN {$dbName} WHERE $conditionsIN $conditionsLIKE";
+        $sqlstament = "SHOW FULL TABLES IN `{$dbName}` WHERE $conditionsIN $conditionsLIKE";
 
         $result = \oxDb::getDb()->getAll($sqlstament);
 

diff --git a/src/Oxrun/Command/Database/ListCommand.php b/src/Oxrun/Command/Database/ListCommand.php
@@ -99,17 +99,17 @@ protected function filterValidTables($tables)
         }
 
         $whereIN = implode("', '", $whereIN);
-        $conditionsIN = "Tables_in_{$dbName} IN ('{$whereIN}')";
+        $conditionsIN = "`Tables_in_{$dbName}` IN ('{$whereIN}')";
 
         $conditionsLIKE = '';
         if (!empty($whereLIKE)) {
-            $template = " OR Tables_in_{$dbName} LIKE ('%s')";
+            $template = " OR `Tables_in_{$dbName}` LIKE ('%s')";
             foreach ($whereLIKE as $tablename) {
                 $conditionsLIKE .= sprintf($template, $tablename);
             }
         }
 
-        $sqlstament = "SHOW FULL TABLES IN {$dbName} WHERE $conditionsIN $conditionsLIKE";
+        $sqlstament = "SHOW FULL TABLES IN `{$dbName}` WHERE $conditionsIN $conditionsLIKE";
 
         $existsTable = DatabaseProvider::getDb()->getAll($sqlstament);