From 7b987c835f6c2d3c4dc09f2f0c818700eb1cc2b6 Mon Sep 17 00:00:00 2001 From: Chris Altman Date: Thu, 21 Jun 2012 14:36:14 -0400 Subject: [PATCH] Fixed invalid sql statement due to using the wrong variable to build the sql statement. --- .../connection_adapters/sqlserver/schema_statements.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb index 87741789f..70a5dd5bc 100644 --- a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb +++ b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb @@ -185,15 +185,15 @@ def column_definitions(table_name) AND KCU.CONSTRAINT_NAME = TC.CONSTRAINT_NAME AND KCU.CONSTRAINT_CATALOG = TC.CONSTRAINT_CATALOG AND KCU.CONSTRAINT_SCHEMA = TC.CONSTRAINT_SCHEMA - INNER JOIN #{db_name_with_period}.sys.schemas AS s + INNER JOIN #{db_name}.sys.schemas AS s ON s.name = columns.TABLE_SCHEMA AND s.schema_id = s.schema_id - INNER JOIN #{db_name_with_period}.sys.objects AS o + INNER JOIN #{db_name}.sys.objects AS o ON s.schema_id = o.schema_id AND o.is_ms_shipped = 0 AND o.type IN ('U', 'V') AND o.name = columns.TABLE_NAME - INNER JOIN #{db_name_with_period}.sys.columns AS c + INNER JOIN #{db_name}.sys.columns AS c ON o.object_id = c.object_id AND c.name = columns.COLUMN_NAME WHERE columns.TABLE_NAME = @0