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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-02-13 10:44:16 +01:00
commit 08dacafce5
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/DatabaseInterface.class.php
View File

@ -91,8 +91,8 @@ class PMA_DatabaseInterface
* Caches table data so PMA_Table does not require to issue
* SHOW TABLE STATUS again
*
* @param array $tables information for tables of some databases
* @param string|bool $table table name or false
* @param array $tables information for tables of some databases
* @param string $table table name
*
* @return void
*/
@ -304,16 +304,16 @@ class PMA_DatabaseInterface
/**
* returns a segment of the SQL WHERE clause regarding table name and type
*
* @param string|bool $table table or false
* @param boolean $tbl_is_group $table is a table group
* @param string $table_type whether table or view
* @param string $table table
* @param boolean $tbl_is_group $table is a table group
* @param string $table_type whether table or view
*
* @return string a segment of the WHERE clause
*/
private function _getTableCondition($table, $tbl_is_group, $table_type)
{
// get table information from information_schema
if ($table && is_string($table)) {
if ($table) {
if (true === $tbl_is_group) {
$sql_where_table = 'AND t.`TABLE_NAME` LIKE \''
. PMA_Util::escapeMysqlWildcards(
@ -445,7 +445,7 @@ class PMA_DatabaseInterface
* </code>
*
* @param string $database database
* @param string|bool $table table name or false
* @param string $table table name
* @param boolean $tbl_is_group $table is a table group
* @param mixed $link mysql link
* @param integer $limit_offset zero-based offset for the count
@ -458,7 +458,7 @@ class PMA_DatabaseInterface
*
* @return array list of tables in given db(s)
*/
public function getTablesFull($database, $table = false,
public function getTablesFull($database, $table = '',
$tbl_is_group = false, $link = null, $limit_offset = 0,
$limit_count = false, $sort_by = 'Name', $sort_order = 'ASC',
$table_type = null

2
libraries/Util.class.php
View File

@ -757,7 +757,7 @@ class PMA_Util
if ($tables === null) {
$tables = $GLOBALS['dbi']->getTablesFull(
$db, false, false, null, $limit_offset, $limit_count
$db, '', false, null, $limit_offset, $limit_count
);
if ($GLOBALS['cfg']['NaturalOrder']) {
uksort($tables, 'strnatcasecmp');

30
libraries/tbl_relation.lib.php
View File

@ -1108,24 +1108,24 @@ function PMA_handleUpdateForForeignKey($multi_edit_columns_name, $master_field_m
$existrel_foreign[$master_field_md5]['on_update'])
? $existrel_foreign[$master_field_md5]['on_update']
: 'RESTRICT';
}
if (! isset($existrel_foreign[$master_field_md5])) {
if ($ref_db_name != $foreign_db
|| $existrel_foreign[$master_field_md5]['ref_table_name'] != $foreign_table
|| $existrel_foreign[$master_field_md5]['ref_index_list'] != $foreign_field
|| $existrel_foreign[$master_field_md5]['index_list'] != $master_field
|| $_REQUEST['constraint_name'][$master_field_md5] != $constraint_name
|| ($_REQUEST['on_delete'][$master_field_md5] != $on_delete)
|| ($_REQUEST['on_update'][$master_field_md5] != $on_update)
) {
// another foreign key is already defined for this field
// or an option has been changed for ON DELETE or ON UPDATE
$drop = true;
$create = true;
} // end if... else....
} else {
// no key defined for this field(s)
$create = true;
} elseif ($ref_db_name != $foreign_db
|| $existrel_foreign[$master_field_md5]['ref_table_name'] != $foreign_table
|| $existrel_foreign[$master_field_md5]['ref_index_list'] != $foreign_field
|| $existrel_foreign[$master_field_md5]['index_list'] != $master_field
|| $_REQUEST['constraint_name'][$master_field_md5] != $constraint_name
|| ($_REQUEST['on_delete'][$master_field_md5] != $on_delete)
|| ($_REQUEST['on_update'][$master_field_md5] != $on_update)
) {
// another foreign key is already defined for this field
// or an option has been changed for ON DELETE or ON UPDATE
$drop = true;
$create = true;
} // end if... else....
}
} elseif (isset($existrel_foreign[$master_field_md5])) {
$drop = true;
} // end if... else....