Oracle: Fix column name in index (thanks to Shirai Takashi)
This commit is contained in:
parent
28996e2286
commit
f94f29124a
|
@ -316,11 +316,7 @@ WHERE aic.table_name = " . q($table) . "$owner
|
||||||
ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) {
|
ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) {
|
||||||
$index_name = $row["INDEX_NAME"];
|
$index_name = $row["INDEX_NAME"];
|
||||||
$column_name = $row["DATA_DEFAULT"];
|
$column_name = $row["DATA_DEFAULT"];
|
||||||
if ($column_name) {
|
$column_name = ($column_name ? trim($column_name, '"') : $row["COLUMN_NAME"]); // trim - possibly wrapped in quotes but never contains quotes inside
|
||||||
$column_name = idf_unescape($column_name);
|
|
||||||
} else {
|
|
||||||
$column_name = $row["COLUMN_NAME"];
|
|
||||||
}
|
|
||||||
$return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
|
$return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
|
||||||
$return[$index_name]["columns"][] = $column_name;
|
$return[$index_name]["columns"][] = $column_name;
|
||||||
$return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
|
$return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
|
||||||
|
|
Loading…
Reference in a new issue