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

bug #1568341, case sensitivity in db names

Browse Source
This commit is contained in:
Marc Delisle
2006-10-01 18:55:52 +00:00
parent b00f3d56cb
commit 530a41aed3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2006-10-01 Marc Delisle <lem9@users.sourceforge.net> 2006-10-01 Marc Delisle <lem9@users.sourceforge.net>
### 2.9.0.1 released from MAINT_2_9_0 ### 2.9.0.1 released from MAINT_2_9_0
* libraries/database_interface.lib.php: bug #1568341,
case sensitivity in database names
* tbl_relation.php: trap error 1452 when adding a foreign key * tbl_relation.php: trap error 1452 when adding a foreign key
and a constraint fails and a constraint fails
* libraries/export/sql.php: bug #1550690, wrong export of constraints, * libraries/export/sql.php: bug #1550690, wrong export of constraints,

6
libraries/database_interface.lib.php
View File

@@ -248,6 +248,10 @@ function PMA_DBI_get_tables_full($database, $table = false,
// for PMA bc: // for PMA bc:
// `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
//
// added BINARY in the WHERE clause to force a case sensitive
// comparison (if we are looking for the db Aa we don't want
// to find the db aa)
$sql = ' $sql = '
SELECT *, SELECT *,
`TABLE_SCHEMA` AS `Db`, `TABLE_SCHEMA` AS `Db`,
@@ -271,7 +275,7 @@ function PMA_DBI_get_tables_full($database, $table = false,
`CREATE_OPTIONS` AS `Create_options`, `CREATE_OPTIONS` AS `Create_options`,
`TABLE_COMMENT` AS `Comment` `TABLE_COMMENT` AS `Comment`
FROM `information_schema`.`TABLES` FROM `information_schema`.`TABLES`
WHERE `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\') WHERE BINARY `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\')
' . $sql_where_table; ' . $sql_where_table;
$tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'), $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'),
null, $link); null, $link);