gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more broken queries on Windows CI

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-02-22 16:26:00 +01:00
parent 0c209702fa
commit 818b9f76bf
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libraries/classes/DatabaseInterface.php
View File

@ -916,34 +916,30 @@ class DatabaseInterface
$sql_where_schema = ''; $sql_where_schema = '';
} }
$sql = 'SELECT *, $sql = 'SELECT *, '
CAST(BIN_NAME AS CHAR CHARACTER SET utf8) AS SCHEMA_NAME . 'CAST(BIN_NAME AS CHAR CHARACTER SET utf8) AS SCHEMA_NAME'
FROM ('; . ' FROM (';
$sql .= 'SELECT $sql .= 'SELECT'
BINARY s.SCHEMA_NAME AS BIN_NAME, . ' BINARY s.SCHEMA_NAME AS BIN_NAME,'
s.DEFAULT_COLLATION_NAME'; . ' s.DEFAULT_COLLATION_NAME';
if ($force_stats) { if ($force_stats) {
$sql .= ', $sql .= ','
COUNT(t.TABLE_SCHEMA) AS SCHEMA_TABLES, . ' COUNT(t.TABLE_SCHEMA) AS SCHEMA_TABLES,'
SUM(t.TABLE_ROWS) AS SCHEMA_TABLE_ROWS, . ' SUM(t.TABLE_ROWS) AS SCHEMA_TABLE_ROWS,'
SUM(t.DATA_LENGTH) AS SCHEMA_DATA_LENGTH, . ' SUM(t.DATA_LENGTH) AS SCHEMA_DATA_LENGTH,'
SUM(t.MAX_DATA_LENGTH) AS SCHEMA_MAX_DATA_LENGTH, . ' SUM(t.MAX_DATA_LENGTH) AS SCHEMA_MAX_DATA_LENGTH,'
SUM(t.INDEX_LENGTH) AS SCHEMA_INDEX_LENGTH, . ' SUM(t.INDEX_LENGTH) AS SCHEMA_INDEX_LENGTH,'
SUM(t.DATA_LENGTH + t.INDEX_LENGTH) . ' SUM(t.DATA_LENGTH + t.INDEX_LENGTH) AS SCHEMA_LENGTH,'
AS SCHEMA_LENGTH, . ' SUM(IF(t.ENGINE <> \'InnoDB\', t.DATA_FREE, 0)) AS SCHEMA_DATA_FREE';
SUM(IF(t.ENGINE <> \'InnoDB\', t.DATA_FREE, 0))
AS SCHEMA_DATA_FREE';
} }
$sql .= ' $sql .= ' FROM `information_schema`.SCHEMATA s ';
FROM `information_schema`.SCHEMATA s ';
if ($force_stats) { if ($force_stats) {
$sql .= ' $sql .= ' LEFT JOIN `information_schema`.TABLES t'
LEFT JOIN `information_schema`.TABLES t . ' ON BINARY t.TABLE_SCHEMA = BINARY s.SCHEMA_NAME';
ON BINARY t.TABLE_SCHEMA = BINARY s.SCHEMA_NAME';
} }
$sql .= $sql_where_schema . ' $sql .= $sql_where_schema
GROUP BY BINARY s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME . ' GROUP BY BINARY s.SCHEMA_NAME, s.DEFAULT_COLLATION_NAME'
ORDER BY '; . ' ORDER BY ';
if ($sort_by == 'SCHEMA_NAME' if ($sort_by == 'SCHEMA_NAME'
|| $sort_by == 'DEFAULT_COLLATION_NAME' || $sort_by == 'DEFAULT_COLLATION_NAME'
) { ) {

18
libraries/classes/Table.php
View File

@ -245,10 +245,10 @@ class Table
// query information_schema // query information_schema
$result = $this->_dbi->fetchResult( $result = $this->_dbi->fetchResult(
"SELECT TABLE_NAME 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = '" . $this->_dbi->escapeString((string) $db) . "' . ' WHERE TABLE_SCHEMA = \'' . $this->_dbi->escapeString((string) $db) . '\''
AND TABLE_NAME = '" . $this->_dbi->escapeString((string) $table) . "'" . ' AND TABLE_NAME = \'' . $this->_dbi->escapeString((string) $table) . '\''
); );
return $result ? true : false; return $result ? true : false;
} }
@ -265,11 +265,11 @@ class Table
} }
$result = $this->_dbi->fetchResult( $result = $this->_dbi->fetchResult(
"SELECT TABLE_NAME 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = '" . $this->_dbi->escapeString($this->_db_name) . "' . ' WHERE TABLE_SCHEMA = \'' . $this->_dbi->escapeString($this->_db_name) . '\''
AND TABLE_NAME = '" . $this->_dbi->escapeString($this->_name) . "' . ' AND TABLE_NAME = \'' . $this->_dbi->escapeString($this->_name) . '\''
AND IS_UPDATABLE = 'YES'" . ' AND IS_UPDATABLE = \'YES\''
); );
return $result ? true : false; return $result ? true : false;
} }

52
test/classes/TableTest.php
View File

@ -60,37 +60,37 @@ class TableTest extends PmaTestCase
} }
}; };
$sql_isView_true = "SELECT TABLE_NAME $sql_isView_true = 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = 'PMA' . ' WHERE TABLE_SCHEMA = \'PMA\''
AND TABLE_NAME = 'PMA_BookMark'"; . ' AND TABLE_NAME = \'PMA_BookMark\'';
$sql_isView_false = "SELECT TABLE_NAME $sql_isView_false = 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = 'PMA' . ' WHERE TABLE_SCHEMA = \'PMA\''
AND TABLE_NAME = 'PMA_BookMark_2'"; . ' AND TABLE_NAME = \'PMA_BookMark_2\'';
$sql_isUpdatableView_true = "SELECT TABLE_NAME $sql_isUpdatableView_true = 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = 'PMA' . ' WHERE TABLE_SCHEMA = \'PMA\''
AND TABLE_NAME = 'PMA_BookMark' . ' AND TABLE_NAME = \'PMA_BookMark\''
AND IS_UPDATABLE = 'YES'"; . ' AND IS_UPDATABLE = \'YES\'';
$sql_isUpdatableView_false = "SELECT TABLE_NAME $sql_isUpdatableView_false = 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = 'PMA' . ' WHERE TABLE_SCHEMA = \'PMA\''
AND TABLE_NAME = 'PMA_BookMark_2' . ' AND TABLE_NAME = \'PMA_BookMark_2\''
AND IS_UPDATABLE = 'YES'"; . ' AND IS_UPDATABLE = \'YES\'';
$sql_analyzeStructure_true = "SELECT COLUMN_NAME, DATA_TYPE $sql_analyzeStructure_true = 'SELECT COLUMN_NAME, DATA_TYPE'
FROM information_schema.COLUMNS . ' FROM information_schema.COLUMNS'
WHERE TABLE_SCHEMA = 'PMA' . ' WHERE TABLE_SCHEMA = \'PMA\''
AND TABLE_NAME = 'PMA_BookMark'"; . ' AND TABLE_NAME = \'PMA_BookMark\'';
$sql_copy_data = "SELECT TABLE_NAME $sql_copy_data = 'SELECT TABLE_NAME'
FROM information_schema.VIEWS . ' FROM information_schema.VIEWS'
WHERE TABLE_SCHEMA = 'db_data' . ' WHERE TABLE_SCHEMA = \'db_data\''
AND TABLE_NAME = 'table_data'"; . ' AND TABLE_NAME = \'table_data\'';
$getUniqueColumns_sql = "select unique column"; $getUniqueColumns_sql = "select unique column";