From 6ecef5eca6d92e27cb4ad3d8c261679a8cf39710 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 22 Feb 2025 10:11:03 +0100 Subject: [PATCH] MS SQL: Display default values (bug #732) --- adminer/drivers/mssql.inc.php | 4 ++-- changes.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index df2ef507..4195c163 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -389,7 +389,7 @@ WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') FROM sys.all_columns c JOIN sys.all_objects o ON c.object_id = o.object_id JOIN sys.types t ON c.user_type_id = t.user_type_id -LEFT JOIN sys.default_constraints d ON c.default_object_id = d.parent_column_id +LEFT JOIN sys.default_constraints d ON c.default_object_id = d.object_id WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table) ) as $row) { $type = $row["type"]; @@ -399,7 +399,7 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', "full_type" => $type . ($length ? "($length)" : ""), "type" => $type, "length" => $length, - "default" => $row["default"], + "default" => (preg_match("~^\('(.*)'\)$~", $row["default"], $match) ? str_replace("''", "'", $match[1]) : $row["default"]), "null" => $row["is_nullable"], "auto_increment" => $row["is_identity"], "collation" => $row["collation_name"], diff --git a/changes.txt b/changes.txt index 95eaa495..0f1be4a7 100644 --- a/changes.txt +++ b/changes.txt @@ -2,6 +2,7 @@ Adminer 4.16.1-dev: Hide index column options by default SQLite: Show all supported pragmas in Variables MS SQL: Allow altering table in non-default schema (bug #405) +MS SQL: Display default values (bug #732) Editor: PDO: Select value of foreign key in edit (bug #847) Adminer 4.16.0 (released 2025-02-20):