Nemcio/adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-11-16 10:05:51 +01:00
Code Issues Packages Projects Releases Activity

Utilize single parameter implode

Browse Source
This commit is contained in:
Jakub Vrana
2010-05-07 18:10:35 +02:00
parent 5050de574f
commit 7f3ccd3b51
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/mysql.inc.php
View File

@@ -586,7 +586,7 @@ if (!defined("DRIVER")) {
$alter = array(); $alter = array();
foreach ($fields as $field) { foreach ($fields as $field) {
$alter[] = ($field[1] $alter[] = ($field[1]
? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode("", $field[1]) . ($table != "" ? " $field[2]" : "") ? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? " $field[2]" : "")
: "DROP " . idf_escape($field[0]) : "DROP " . idf_escape($field[0])
); );
} }

2
adminer/drivers/pgsql.inc.php
View File

@@ -348,7 +348,7 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . $connection->qu
$val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial"; $val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial";
} }
if ($field[0] == "") { if ($field[0] == "") {
$alter[] = ($table != "" ? "ADD " : " ") . implode("", $val); $alter[] = ($table != "" ? "ADD " : " ") . implode($val);
} else { } else {
if ($column != $val[0]) { if ($column != $val[0]) {
$queries[] = "ALTER TABLE " . idf_escape($table) . " RENAME $column TO $val[0]"; $queries[] = "ALTER TABLE " . idf_escape($table) . " RENAME $column TO $val[0]";

4
adminer/drivers/sqlite.inc.php
View File

@@ -394,7 +394,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
$alter = array(); $alter = array();
foreach ($fields as $field) { foreach ($fields as $field) {
if ($field[1]) { if ($field[1]) {
$alter[] = ($table != "" && $field[0] == "" ? "ADD " : " ") . implode("", $field[1]); $alter[] = ($table != "" && $field[0] == "" ? "ADD " : " ") . implode($field[1]);
} }
} }
$alter = array_merge($alter, $foreign); $alter = array_merge($alter, $foreign);
@@ -524,7 +524,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
function trigger_sql($table, $style) { function trigger_sql($table, $style) {
global $connection; global $connection;
return implode("", get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . $connection->quote($table))); return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . $connection->quote($table)));
} }
function show_variables() { function show_variables() {

2
compile.php
View File

@@ -106,7 +106,7 @@ function php_shrink($input) {
arsort($short_variables); arsort($short_variables);
foreach (array_keys($short_variables) as $number => $key) { foreach (array_keys($short_variables) as $number => $key) {
$short_variables[$key] = short_identifier($number, implode("", range('a', 'z')) . '_' . implode("", range('A', 'Z'))); // could use also numbers and \x7f-\xff $short_variables[$key] = short_identifier($number, implode(range('a', 'z')) . '_' . implode(range('A', 'Z'))); // could use also numbers and \x7f-\xff
} }
$set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}')); $set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}'));