mirror of
https://github.com/vrana/adminer.git
synced 2025-08-15 11:04:02 +02:00
Editable index names
This commit is contained in:
@@ -436,16 +436,16 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
|
||||
$index = array();
|
||||
$drop = array();
|
||||
foreach ($alter as $val) {
|
||||
if ($val[2]) {
|
||||
if ($val[2] == "DROP") {
|
||||
if ($val[0] == "PRIMARY") { //! sometimes used also for UNIQUE
|
||||
$drop[] = $val[1];
|
||||
$drop[] = idf_escape($val[1]);
|
||||
} else {
|
||||
$index[] = "$val[1] ON " . table($table);
|
||||
$index[] = idf_escape($val[1]) . " ON " . table($table);
|
||||
}
|
||||
} elseif (!queries(($val[0] != "PRIMARY"
|
||||
? "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)
|
||||
? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
|
||||
: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
|
||||
) . " $val[1]")) {
|
||||
) . " $val[2]")) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -611,12 +611,15 @@ if (!defined("DRIVER")) {
|
||||
|
||||
/** Run commands to alter indexes
|
||||
* @param string escaped table name
|
||||
* @param array of array("index type", "(columns definition)") or array("index type", "escaped name", "DROP")
|
||||
* @param array of array("index type", "name", "(columns definition)") or array("index type", "name", "DROP")
|
||||
* @return bool
|
||||
*/
|
||||
function alter_indexes($table, $alter) {
|
||||
foreach ($alter as $key => $val) {
|
||||
$alter[$key] = ($val[2] ? "\nDROP INDEX " : "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "")) . $val[1];
|
||||
$alter[$key] = ($val[2] == "DROP"
|
||||
? "\nDROP INDEX " . idf_escape($val[1])
|
||||
: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . ($val[1] != "" ? idf_escape($val[1]) . " " : "") . $val[2]
|
||||
);
|
||||
}
|
||||
return queries("ALTER TABLE " . table($table) . implode(",", $alter));
|
||||
}
|
||||
|
@@ -383,10 +383,13 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.constraint_schema = current_sche
|
||||
$drop = array();
|
||||
foreach ($alter as $val) {
|
||||
if ($val[0] != "INDEX") {
|
||||
$create[] = ($val[2] ? "\nDROP CONSTRAINT " : "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "")) . $val[1];
|
||||
} elseif ($val[2]) {
|
||||
$drop[] = $val[1];
|
||||
} elseif (!queries("CREATE INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table) . " $val[1]")) {
|
||||
$create[] = ($val[2] == "DROP"
|
||||
? "\nDROP CONSTRAINT " . idf_escape($val[1])
|
||||
: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . $val[2]
|
||||
);
|
||||
} elseif ($val[2] == "DROP") {
|
||||
$drop[] = idf_escape($val[1]);
|
||||
} elseif (!queries("CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $val[2]")) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -422,7 +422,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
|
||||
|
||||
function alter_indexes($table, $alter) {
|
||||
foreach ($alter as $val) {
|
||||
if (!queries(($val[2] ? "DROP INDEX" : "CREATE" . ($val[0] != "INDEX" ? " UNIQUE" : "") . " INDEX " . idf_escape(uniqid($table . "_")) . " ON " . table($table)) . " $val[1]")) {
|
||||
if (!queries($val[2] == "DROP"
|
||||
? "DROP INDEX " . idf_escape($val[1])
|
||||
: "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $val[2]"
|
||||
)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user