beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Introduce apply_queries function

Browse source
This commit is contained in:
Jakub Vrana 2010-05-17 18:18:32 +02:00
parent c85ef695d0
commit f9bb1c5c64
6 changed files with 26 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
adminer/drivers/mssql.inc.php
View file

@ -435,12 +435,7 @@ WHERE OBJECT_NAME(indexes.object_id) = " . $connection2->quote($table)
}
function truncate_tables($tables) {
foreach ($tables as $table) {
if (!queries("TRUNCATE TABLE " . table($table))) {
return false;
}
}
return true;
return apply_queries("TRUNCATE TABLE", $tables);
}
function drop_views($views) {
@ -452,12 +447,7 @@ WHERE OBJECT_NAME(indexes.object_id) = " . $connection2->quote($table)
}
function move_tables($tables, $views, $target) {
foreach (array_merge($tables, $views) as $table) {
if (!queries("ALTER SCHEMA " . idf_escape($target) . " TRANSFER " . table($table))) {
return false;
}
}
return true;
return apply_queries("ALTER SCHEMA " . idf_escape($target) . " TRANSFER", array_merge($tables, $views));
}
function trigger($name) {

14
adminer/drivers/mysql.inc.php
View file

@ -526,12 +526,7 @@ if (!defined("DRIVER")) {
*/
function drop_databases($databases) {
set_session("databases", null);
foreach ($databases as $db) {
if (!queries("DROP DATABASE " . idf_escape($db))) {
return false;
}
}
return true;
return apply_queries("DROP DATABASE", $db, 'idf_escape');
}
/** Rename database from DB
@ -634,12 +629,7 @@ if (!defined("DRIVER")) {
* @return bool
*/
function truncate_tables($tables) {
foreach ($tables as $table) {
if (!queries("TRUNCATE TABLE " . table($table))) {
return false;
}
}
return true;
return apply_queries("TRUNCATE TABLE", $tables);
}
/** Drop views

21
adminer/drivers/oracle.inc.php
View file

@ -269,30 +269,15 @@ if (isset($_GET["oracle"])) {
}
function truncate_tables($tables) {
foreach ($tables as $table) {
if (!queries("TRUNCATE TABLE " . table($table))) {
return false;
}
}
return true;
return apply_queries("TRUNCATE TABLE", $tables);
}
function drop_views($views) {
foreach ($views as $table) {
if (!queries("DROP VIEW " . table($table))) {
return false;
}
}
return true;
return apply_queries("DROP VIEW", $views);
}
function drop_tables($tables) {
foreach ($tables as $table) {
if (!queries("DROP TABLE " . table($table))) {
return false;
}
}
return true;
return apply_queries("DROP TABLE", $tables);
}
function begin() {

7
adminer/drivers/pgsql.inc.php
View file

@ -318,12 +318,7 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . $connection->qu
function drop_databases($databases) {
global $connection;
$connection->close();
foreach ($databases as $db) {
if (!queries("DROP DATABASE " . idf_escape($db))) {
return false;
}
}
return true;
return apply_queries("DROP DATABASE", $databases, 'idf_escape');
}
function rename_database($name, $collation) {

21
adminer/drivers/sqlite.inc.php
View file

@ -430,30 +430,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
}
function truncate_tables($tables) {
foreach ($tables as $table) {
if (!queries("DELETE FROM " . table($table))) {
return false;
}
}
return true;
return apply_queries("DELETE FROM", $tables);
}
function drop_views($views) {
foreach ($views as $view) {
if (!queries("DROP VIEW " . table($view))) {
return false;
}
}
return true;
return apply_queries("DROP VIEW", $views);
}
function drop_tables($tables) {
foreach ($tables as $table) {
if (!queries("DROP TABLE " . table($table))) {
return false;
}
}
return true;
return apply_queries("DROP TABLE", $tables);
}
function move_tables($tables, $views, $target) {

15
adminer/include/functions.inc.php
View file

@ -361,6 +361,21 @@ function queries($query = null) {
return $connection->query($query);
}
/** Apply command to all array items
* @param string
* @param array
* @param callback
* @return bool
*/
function apply_queries($query, $tables, $escape = 'table') {
foreach ($tables as $table) {
if (!queries("$query " . $escape($table))) {
return false;
}
}
return true;
}
/** Redirect by remembered queries
* @param string
* @param string