From 6141b31224e9d925b118015f64960e0b97b9cceb Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Tue, 3 Sep 2024 15:26:43 +0100 Subject: [PATCH 1/2] Only query for view table name if table is a view --- .../connection_adapters/sqlserver/schema_statements.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb index a82a73df5..d0036fa61 100644 --- a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb @@ -513,7 +513,11 @@ def column_definitions(table_name) length: ci["length"] } - col[:table_name] = view_table_name(table_name) || table_name + col[:table_name] = if view_exists + view_table_name(table_name) + else + table_name + end col[:type] = column_type(ci: ci) col[:default_value], col[:default_function] = default_value_and_function(default: ci['default_value'], name: ci['name'], From edd0edbfb194c25da78d46f603f5d38f30a711c4 Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Tue, 3 Sep 2024 17:01:20 +0100 Subject: [PATCH 2/2] Update schema_statements.rb --- .../connection_adapters/sqlserver/schema_statements.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb index d0036fa61..75cd62df8 100644 --- a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb @@ -513,11 +513,7 @@ def column_definitions(table_name) length: ci["length"] } - col[:table_name] = if view_exists - view_table_name(table_name) - else - table_name - end + col[:table_name] = view_exists ? view_table_name(table_name) : table_name col[:type] = column_type(ci: ci) col[:default_value], col[:default_function] = default_value_and_function(default: ci['default_value'], name: ci['name'],