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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-31 17:21:34 +05:30
commit e13be0489f
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
4.3.5.0 (not yet released)
- bug Auto-configuration: tables were not created automatically
- bug #4677 Advanced feature checker does not check for favorite tables feature
- bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete
4.3.4.0 (2014-12-29)
- bug #4653 Always connection error was shown, on /setup at tab "configuration storage"

46
libraries/relation_cleanup.lib.php
View File

@ -106,6 +106,24 @@ function PMA_relationsCleanupTable($db, $table)
. ' AND foreign_table = \'' . PMA_Util::sqlAddSlashes($table) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['uiprefswork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['table_uiprefs'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['navwork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['navigationhiding'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND (table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''
. ' OR (item_name = \'' . PMA_Util::sqlAddSlashes($table) . '\''
. ' AND item_type = \'table\'))';
PMA_queryAsControlUser($remove_query);
}
}
/**
@ -163,6 +181,34 @@ function PMA_relationsCleanupDatabase($db)
. ' WHERE foreign_db = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['uiprefswork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['table_uiprefs'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['navwork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['navigationhiding'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['savedsearcheswork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['savedsearches'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
if ($cfgRelation['central_columnswork']) {
$remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db'])
. '.' . PMA_Util::backquote($cfgRelation['central_columns'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\'';
PMA_queryAsControlUser($remove_query);
}
}
?>