Revert #ad83df82 and again cache column information at the connection's instance. The previous commit was causing all sorts of view and schema reflection problems.

Author: metaskills

CHANGELOG

@@ -1,6 +1,12 @@
 
 MASTER
 
+2.3.3
+  
+* Revert #ad83df82 and again cache column information at the connection's instance. The 
+  previous commit was causing all sorts of view and schema reflection problems. [Ken Collins]
+
+
 2.3.2
 
 * Insert queries that include the word "insert" as a partial column name with the word 

activerecord-sqlserver-adapter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "activerecord-sqlserver-adapter"
-  s.version  = "2.3.2"
+  s.version  = "2.3.3"
   s.date     = "2010-02-15"
   s.summary  = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   s.email    = "ken@metaskills.net"

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -159,7 +159,7 @@ def simplified_datetime
     class SQLServerAdapter < AbstractAdapter
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.2'.freeze
+      VERSION                     = '2.3.3'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -565,13 +565,13 @@ def tables(name = nil)
       end
 
       def views(name = nil)
-        @@sqlserver_views_cache ||= 
+        @sqlserver_views_cache ||= 
           info_schema_query { select_values("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')") }
       end
 
       def view_information(table_name)
         table_name = unqualify_table_name(table_name)
-        @@sqlserver_view_information_cache[table_name] ||= begin
+        @sqlserver_view_information_cache[table_name] ||= begin
           view_info = info_schema_query { select_one("SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'") }
           if view_info
             if view_info['VIEW_DEFINITION'].blank? || view_info['VIEW_DEFINITION'].length == 4000
@@ -612,15 +612,15 @@ def indexes(table_name, name = nil)
       def columns(table_name, name = nil)
         return [] if table_name.blank?
         cache_key = unqualify_table_name(table_name)
-        @@sqlserver_columns_cache[cache_key] ||= column_definitions(table_name).collect do |ci|
+        @sqlserver_columns_cache[cache_key] ||= column_definitions(table_name).collect do |ci|
           sqlserver_options = ci.except(:name,:default_value,:type,:null)
           SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
         end
       end
 
       def create_table(table_name, options = {})
         super
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def rename_table(table_name, new_name)
@@ -629,12 +629,12 @@ def rename_table(table_name, new_name)
 
       def drop_table(table_name, options = {})
         super
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def add_column(table_name, column_name, type, options = {})
         super
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def remove_column(table_name, *column_names)
@@ -644,7 +644,7 @@ def remove_column(table_name, *column_names)
           remove_indexes(table_name, column_name)
           do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
         end
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def change_column(table_name, column_name, type, options = {})
@@ -654,22 +654,23 @@ def change_column(table_name, column_name, type, options = {})
         change_column_sql << " NOT NULL" if options[:null] == false
         sql_commands << change_column_sql
         if options_include_default?(options)
+          remove_sqlserver_columns_cache_for(table_name)
           sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_name(table_name,column_name)} DEFAULT #{quote(options[:default])} FOR #{quote_column_name(column_name)}"
         end
         sql_commands.each { |c| do_execute(c) }
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def change_column_default(table_name, column_name, default)
         remove_default_constraint(table_name, column_name)
         do_execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_name(table_name, column_name)} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def rename_column(table_name, column_name, new_column_name)
         column_for(table_name,column_name)
         do_execute "EXEC sp_rename '#{table_name}.#{column_name}', '#{new_column_name}', 'COLUMN'"
-        initialize_sqlserver_caches
+        remove_sqlserver_columns_cache_for(table_name)
       end
 
       def remove_index(table_name, options = {})
@@ -1016,10 +1017,16 @@ def sql_for_association_limiting?(sql)
         end
       end
 
-      def initialize_sqlserver_caches
-        @@sqlserver_columns_cache = {}
-        @@sqlserver_views_cache = nil
-        @@sqlserver_view_information_cache = {}
+      def remove_sqlserver_columns_cache_for(table_name)
+        cache_key = unqualify_table_name(table_name)
+        @sqlserver_columns_cache[cache_key] = nil
+        initialize_sqlserver_caches(false)
+      end
+      
+      def initialize_sqlserver_caches(reset_columns=true)
+        @sqlserver_columns_cache = {} if reset_columns
+        @sqlserver_views_cache = nil
+        @sqlserver_view_information_cache = {}
       end
 
       def column_definitions(table_name)