Fix schema cache and lowercase schema setting.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/schema_cache.rb

@@ -7,59 +7,78 @@ class SchemaCache < ActiveRecord::ConnectionAdapters::SchemaCache
 
         def initialize(conn)
           super
-          @table_names = nil
-          @view_names = nil
+          @views = {}
           @view_information = {}
         end
 
         # Superclass Overrides
 
+        def primary_keys(table_name)
+          super(table_name_key(table_name))
+        end
+
         def table_exists?(table_name)
-          return false if table_name.blank?
-          key = table_name_key(table_name)
-          return @tables[key] if @tables.key? key
-          @tables[key] = connection.table_exists?(table_name)
+          name = table_name_key(table_name)
+          super(name) || view_exists?(name)
+        end
+
+        def add(table_name)
+          super(table_name_key(table_name))
+        end
+
+        def tables(name)
+          super(table_name_key(name))
+        end
+
+        def columns(table_name)
+          super(table_name_key(table_name))
+        end
+
+        def columns_hash(table_name)
+          super(table_name_key(table_name))
         end
 
         def clear!
           super
-          @table_names = nil
-          @view_names = nil
+          @views.clear
           @view_information.clear
         end
 
+        def size
+          super + [@views, @view_information].map{ |x| x.size }.inject(:+)
+        end
+
         def clear_table_cache!(table_name)
-          key = table_name_key(table_name)
-          super(key)
+          table_name = table_name_key(table_name)
           super(table_name)
-          # SQL Server Specific
-          if @table_names
-            @table_names.delete key
-            @table_names.delete table_name
-          end
-          if @view_names
-            @view_names.delete key
-            @view_names.delete table_name
-          end
-          @view_information.delete key
+          @views.delete table_name
+          @view_information.delete table_name
         end
 
-        # SQL Server Specific
+        def marshal_dump
+          super + [@views, @view_information]
+        end
 
-        def table_names
-          @table_names ||= connection.tables
+        def marshal_load(array)
+          @views, @view_information = array[-2..-1]
+          super(array[0..-3])
         end
 
+        # SQL Server Specific
+
         def view_names
-          @view_names ||= connection.views
+          @views.select{ |k,v| v }.keys
         end
 
         def view_exists?(table_name)
-          table_exists?(table_name)
+          name = table_name_key(table_name)
+          prepare_views if @views.empty?
+          return @views[name] if @views.key? name
+          @views[name] = connection.views.include?(name)
         end
 
         def view_information(table_name)
-          key = table_name_key(table_name)
+          name = table_name_key(table_name)
           return @view_information[key] if @view_information.key? key
           @view_information[key] = connection.send(:view_information, table_name)
         end
@@ -71,6 +90,10 @@ def table_name_key(table_name)
           SQLServer::Utils.extract_identifiers(table_name).object
         end
 
+        def prepare_views
+          connection.views.each { |view| @views[view] = true }
+        end
+
       end
     end
   end

test/cases/adapter_test_sqlserver.rb

@@ -118,29 +118,28 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   describe 'testing #lowercase_schema_reflection' do
 
     before do
-      UpperTestDefault.delete_all
-      UpperTestDefault.create COLUMN1: 'Got a minute?', COLUMN2: 419
-      UpperTestDefault.create COLUMN1: 'Favorite number?', COLUMN2: 69
+      SSTestUpper.delete_all
+      SSTestUpper.create COLUMN1: 'Got a minute?', COLUMN2: 419
+      SSTestUpper.create COLUMN1: 'Favorite number?', COLUMN2: 69
     end
 
     after do
       connection.lowercase_schema_reflection = false
     end
 
     it 'not lowercase schema reflection by default' do
-      assert UpperTestDefault.columns_hash['COLUMN1']
-      assert_equal 'Got a minute?', UpperTestDefault.first.COLUMN1
-      assert_equal 'Favorite number?', UpperTestDefault.last.COLUMN1
-      assert UpperTestDefault.columns_hash['COLUMN2']
+      assert SSTestUpper.columns_hash['COLUMN1']
+      assert_equal 'Got a minute?', SSTestUpper.first.COLUMN1
+      assert_equal 'Favorite number?', SSTestUpper.last.COLUMN1
+      assert SSTestUpper.columns_hash['COLUMN2']
     end
 
     it 'lowercase schema reflection when set' do
       connection.lowercase_schema_reflection = true
-      UpperTestLowered.reset_column_information
-      assert UpperTestLowered.columns_hash['column1']
-      assert_equal 'Got a minute?', UpperTestLowered.first.column1
-      assert_equal 'Favorite number?', UpperTestLowered.last.column1
-      assert UpperTestLowered.columns_hash['column2']
+      assert SSTestUppered.columns_hash['column1']
+      assert_equal 'Got a minute?', SSTestUppered.first.column1
+      assert_equal 'Favorite number?', SSTestUppered.last.column1
+      assert SSTestUppered.columns_hash['column2']
     end
 
   end

test/models/sqlserver/upper.rb

@@ -0,0 +1,3 @@
+class SSTestUpper < ActiveRecord::Base
+  self.table_name = 'sst_upper_tests'
+end

test/models/sqlserver/uppered.rb

@@ -0,0 +1,3 @@
+class SSTestUppered < ActiveRecord::Base
+  self.table_name = 'SST_UPPER_TESTS'
+end

test/models/upper_test_default.rb

@@ -2,18 +2,18 @@
 
   execute File.read(ARTest::SQLServer.schema_datatypes_2012_file)
 
-  create_table :datatypes_migration, force: true do |t|
+  create_table :sst_datatypes_migration, force: true do |t|
     t.column :real, :real
   end
 
-
-
-
-  create_table :UPPER_TESTS, force: true do |t|
+  create_table :SST_UPPER_TESTS, force: true do |t|
     t.column :COLUMN1, :string
     t.column :COLUMN2, :integer
   end
 
+
+
+
   create_table :float_data, force: true do |t|
     t.float   :temperature
     t.float   :temperature_8, limit: 8