From ea1d773bdbdcabf5ca9b56097b9ef74363ea6b54 Mon Sep 17 00:00:00 2001 From: josephbridgwaterrowe Date: Tue, 20 Mar 2012 15:09:04 -0700 Subject: [PATCH 1/2] Set @config in SQLServerAdapter initialize. --- lib/active_record/connection_adapters/sqlserver_adapter.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb index 4db5d4325..223e3a7d2 100644 --- a/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -199,6 +199,7 @@ def initialize(connection, logger, pool, config) @schema_cache = Sqlserver::SchemaCache.new self @visitor = Arel::Visitors::SQLServer.new self # Our Responsibility + @config = @connection_options = config connect @database_version = select_value 'SELECT @@version', 'SCHEMA' From 5d60b1eb794189e53fa67488b0b844fddf4891c1 Mon Sep 17 00:00:00 2001 From: josephbridgwaterrowe Date: Tue, 20 Mar 2012 15:44:09 -0700 Subject: [PATCH 2/2] Require active_record/connection_adapters/abstract_adapter before active_record/base --- lib/active_record/connection_adapters/sqlserver_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb index 223e3a7d2..bffd9b2df 100644 --- a/lib/active_record/connection_adapters/sqlserver_adapter.rb +++ b/lib/active_record/connection_adapters/sqlserver_adapter.rb @@ -1,10 +1,10 @@ require 'base64' require 'arel/visitors/sqlserver' require 'active_record' +require 'active_record/connection_adapters/abstract_adapter' require 'active_record/base' require 'active_support/concern' require 'active_support/core_ext/string' -require 'active_record/connection_adapters/abstract_adapter' require 'active_record/connection_adapters/sqlserver/core_ext/active_record' require 'active_record/connection_adapters/sqlserver/core_ext/database_statements' require 'active_record/connection_adapters/sqlserver/core_ext/explain'