Introduce apply_queries function

vrana · May 17, 2010 · f9bb1c5 · f9bb1c5
1 parent c85ef69
commit f9bb1c5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 66 deletions.
diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
@@ -435,12 +435,7 @@ function foreign_keys($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 @@ function drop_tables($tables) {
 	}
 
 	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) {

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
@@ -526,12 +526,7 @@ function create_database($db, $collation) {
 	*/
 	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 @@ function alter_indexes($table, $alter) {
 	* @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

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
@@ -269,30 +269,15 @@ function alter_table($table, $name, $fields, $foreign, $comment, $engine, $colla
 	}
 
 	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() {

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
@@ -318,12 +318,7 @@ function create_database($db, $collation) {
 	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) {

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
@@ -430,30 +430,15 @@ function alter_indexes($table, $alter) {
 	}
 
 	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) {

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
@@ -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