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

Fix _getSqlForTablesFull and getColumnsFull for Windows CI

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

76
libraries/classes/DatabaseInterface.php
View File

@ -491,33 +491,32 @@ class DatabaseInterface
*/ */
private function _getSqlForTablesFull($this_databases, string $sql_where_table): string private function _getSqlForTablesFull($this_databases, string $sql_where_table): string
{ {
return ' return 'SELECT *,'
SELECT *, . ' `TABLE_SCHEMA` AS `Db`,'
`TABLE_SCHEMA` AS `Db`, . ' `TABLE_NAME` AS `Name`,'
`TABLE_NAME` AS `Name`, . ' `TABLE_TYPE` AS `TABLE_TYPE`,'
`TABLE_TYPE` AS `TABLE_TYPE`, . ' `ENGINE` AS `Engine`,'
`ENGINE` AS `Engine`, . ' `ENGINE` AS `Type`,'
`ENGINE` AS `Type`, . ' `VERSION` AS `Version`,'
`VERSION` AS `Version`, . ' `ROW_FORMAT` AS `Row_format`,'
`ROW_FORMAT` AS `Row_format`, . ' `TABLE_ROWS` AS `Rows`,'
`TABLE_ROWS` AS `Rows`, . ' `AVG_ROW_LENGTH` AS `Avg_row_length`,'
`AVG_ROW_LENGTH` AS `Avg_row_length`, . ' `DATA_LENGTH` AS `Data_length`,'
`DATA_LENGTH` AS `Data_length`, . ' `MAX_DATA_LENGTH` AS `Max_data_length`,'
`MAX_DATA_LENGTH` AS `Max_data_length`, . ' `INDEX_LENGTH` AS `Index_length`,'
`INDEX_LENGTH` AS `Index_length`, . ' `DATA_FREE` AS `Data_free`,'
`DATA_FREE` AS `Data_free`, . ' `AUTO_INCREMENT` AS `Auto_increment`,'
`AUTO_INCREMENT` AS `Auto_increment`, . ' `CREATE_TIME` AS `Create_time`,'
`CREATE_TIME` AS `Create_time`, . ' `UPDATE_TIME` AS `Update_time`,'
`UPDATE_TIME` AS `Update_time`, . ' `CHECK_TIME` AS `Check_time`,'
`CHECK_TIME` AS `Check_time`, . ' `TABLE_COLLATION` AS `Collation`,'
`TABLE_COLLATION` AS `Collation`, . ' `CHECKSUM` AS `Checksum`,'
`CHECKSUM` AS `Checksum`, . ' `CREATE_OPTIONS` AS `Create_options`,'
`CREATE_OPTIONS` AS `Create_options`, . ' `TABLE_COMMENT` AS `Comment`'
`TABLE_COMMENT` AS `Comment` . ' FROM `information_schema`.`TABLES` t'
FROM `information_schema`.`TABLES` t . ' WHERE `TABLE_SCHEMA` ' . Util::getCollateForIS()
WHERE `TABLE_SCHEMA` ' . Util::getCollateForIS() . ' . ' IN (\'' . implode("', '", $this_databases) . '\')'
IN (\'' . implode("', '", $this_databases) . '\') . ' ' . $sql_where_table;
' . $sql_where_table;
} }
/** /**
@ -1168,18 +1167,17 @@ class DatabaseInterface
// for PMA bc: // for PMA bc:
// `[SCHEMA_FIELD_NAME]` AS `[SHOW_FULL_COLUMNS_FIELD_NAME]` // `[SCHEMA_FIELD_NAME]` AS `[SHOW_FULL_COLUMNS_FIELD_NAME]`
$sql = ' $sql = 'SELECT *,'
SELECT *, . ' `COLUMN_NAME` AS `Field`,'
`COLUMN_NAME` AS `Field`, . ' `COLUMN_TYPE` AS `Type`,'
`COLUMN_TYPE` AS `Type`, . ' `COLLATION_NAME` AS `Collation`,'
`COLLATION_NAME` AS `Collation`, . ' `IS_NULLABLE` AS `Null`,'
`IS_NULLABLE` AS `Null`, . ' `COLUMN_KEY` AS `Key`,'
`COLUMN_KEY` AS `Key`, . ' `COLUMN_DEFAULT` AS `Default`,'
`COLUMN_DEFAULT` AS `Default`, . ' `EXTRA` AS `Extra`,'
`EXTRA` AS `Extra`, . ' `PRIVILEGES` AS `Privileges`,'
`PRIVILEGES` AS `Privileges`, . ' `COLUMN_COMMENT` AS `Comment`'
`COLUMN_COMMENT` AS `Comment` . ' FROM `information_schema`.`COLUMNS`';
FROM `information_schema`.`COLUMNS`';
if (count($sql_wheres)) { if (count($sql_wheres)) {
$sql .= "\n" . ' WHERE ' . implode(' AND ', $sql_wheres); $sql .= "\n" . ' WHERE ' . implode(' AND ', $sql_wheres);