Extract SQL query from DatabaseInterface::getColumnsFull

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 31, 2020 · 36fa925 · 36fa925
1 parent 73fb678
commit 36fa925
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 41 deletions.
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -817,48 +817,13 @@ public function getColumnsFull(
         $link = self::CONNECT_USER
     ): array {
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $sql_wheres = [];
-            $array_keys = [];
-
-            // get columns information from information_schema
-            if ($database !== null) {
-                $sql_wheres[] = '`TABLE_SCHEMA` = \''
-                    . $this->escapeString($database, $link) . '\' ';
-            } else {
-                $array_keys[] = 'TABLE_SCHEMA';
-            }
-            if ($table !== null) {
-                $sql_wheres[] = '`TABLE_NAME` = \''
-                    . $this->escapeString($table, $link) . '\' ';
-            } else {
-                $array_keys[] = 'TABLE_NAME';
-            }
-            if ($column !== null) {
-                $sql_wheres[] = '`COLUMN_NAME` = \''
-                    . $this->escapeString($column, $link) . '\' ';
-            } else {
-                $array_keys[] = 'COLUMN_NAME';
-            }
-
-            // for PMA bc:
-            // `[SCHEMA_FIELD_NAME]` AS `[SHOW_FULL_COLUMNS_FIELD_NAME]`
-            $sql = 'SELECT *,'
-                        . ' `COLUMN_NAME`       AS `Field`,'
-                        . ' `COLUMN_TYPE`       AS `Type`,'
-                        . ' `COLLATION_NAME`    AS `Collation`,'
-                        . ' `IS_NULLABLE`       AS `Null`,'
-                        . ' `COLUMN_KEY`        AS `Key`,'
-                        . ' `COLUMN_DEFAULT`    AS `Default`,'
-                        . ' `EXTRA`             AS `Extra`,'
-                        . ' `PRIVILEGES`        AS `Privileges`,'
-                        . ' `COLUMN_COMMENT`    AS `Comment`'
-                   . ' FROM `information_schema`.`COLUMNS`';
-
-            if (count($sql_wheres)) {
-                $sql .= "\n" . ' WHERE ' . implode(' AND ', $sql_wheres);
-            }
+            [$sql, $arrayKeys] = QueryGenerator::getInformationSchemaColumnsFullRequest(
+                $database !== null ? $this->escapeString($database, $link) : null,
+                $table !== null ? $this->escapeString($table, $link) : null,
+                $column !== null ? $this->escapeString($column, $link) : null
+            );
 
-            return $this->fetchResult($sql, $array_keys, null, $link);
+            return $this->fetchResult($sql, $arrayKeys, null, $link);
         }
 
         $columns = [];

diff --git a/libraries/classes/Query/Generator.php b/libraries/classes/Query/Generator.php
@@ -5,6 +5,7 @@
 namespace PhpMyAdmin\Query;
 
 use PhpMyAdmin\Util;
+use function count;
 use function implode;
 use function is_array;
 
@@ -306,4 +307,53 @@ public static function getInformationSchemaDatabasesFullRequest(
 
         return $sql;
     }
+
+    public static function getInformationSchemaColumnsFullRequest(
+        ?string $escapedDatabase,
+        ?string $escapedTable,
+        ?string $escapedColumn
+    ): array {
+        $sqlWheres = [];
+        $arrayKeys = [];
+
+        // get columns information from information_schema
+        if ($escapedDatabase !== null) {
+            $sqlWheres[] = '`TABLE_SCHEMA` = \''
+                . $escapedDatabase . '\' ';
+        } else {
+            $arrayKeys[] = 'TABLE_SCHEMA';
+        }
+        if ($escapedTable !== null) {
+            $sqlWheres[] = '`TABLE_NAME` = \''
+                . $escapedTable . '\' ';
+        } else {
+            $arrayKeys[] = 'TABLE_NAME';
+        }
+        if ($escapedColumn !== null) {
+            $sqlWheres[] = '`COLUMN_NAME` = \''
+                . $escapedColumn . '\' ';
+        } else {
+            $arrayKeys[] = 'COLUMN_NAME';
+        }
+
+        // for PMA bc:
+        // `[SCHEMA_FIELD_NAME]` AS `[SHOW_FULL_COLUMNS_FIELD_NAME]`
+        $sql = 'SELECT *,'
+                    . ' `COLUMN_NAME`       AS `Field`,'
+                    . ' `COLUMN_TYPE`       AS `Type`,'
+                    . ' `COLLATION_NAME`    AS `Collation`,'
+                    . ' `IS_NULLABLE`       AS `Null`,'
+                    . ' `COLUMN_KEY`        AS `Key`,'
+                    . ' `COLUMN_DEFAULT`    AS `Default`,'
+                    . ' `EXTRA`             AS `Extra`,'
+                    . ' `PRIVILEGES`        AS `Privileges`,'
+                    . ' `COLUMN_COMMENT`    AS `Comment`'
+               . ' FROM `information_schema`.`COLUMNS`';
+
+        if (count($sqlWheres)) {
+            $sql .= "\n" . ' WHERE ' . implode(' AND ', $sqlWheres);
+        }
+
+        return [$sql, $arrayKeys];
+    }
 }