From: Jakub Vrana Date: Tue, 16 Feb 2021 07:21:26 +0000 (+0100) Subject: Oracle: Fix column name in index (thanks to Shirai Takashi) X-Git-Tag: v4.8.1~10 X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=f94f29124a732c61b68560d8d765937ca72f854c;p=adminer.git Oracle: Fix column name in index (thanks to Shirai Takashi) --- diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php index 97e7672b..1c5b1598 100644 --- a/adminer/drivers/oracle.inc.php +++ b/adminer/drivers/oracle.inc.php @@ -316,11 +316,7 @@ WHERE aic.table_name = " . q($table) . "$owner ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) { $index_name = $row["INDEX_NAME"]; $column_name = $row["DATA_DEFAULT"]; - if ($column_name) { - $column_name = idf_unescape($column_name); - } else { - $column_name = $row["COLUMN_NAME"]; - } + $column_name = ($column_name ? trim($column_name, '"') : $row["COLUMN_NAME"]); // trim - possibly wrapped in quotes but never contains quotes inside $return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX")); $return[$index_name]["columns"][] = $column_name; $return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);