Fix database statements tests.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/schema_cache.rb

@@ -87,7 +87,7 @@ def view_information(table_name)
         private
 
         def table_name_key(table_name)
-          SQLServer::Utils.extract_identifiers(table_name).object
+          SQLServer::Utils.extract_identifiers(table_name).quoted
         end
 
         def prepare_views

test/cases/adapter_test_sqlserver.rb

@@ -18,6 +18,8 @@
 
 class AdapterTestSQLServer < ActiveRecord::TestCase
 
+  fixtures :tasks
+
   let(:connection) { ActiveRecord::Base.connection }
 
   let(:basic_insert_sql) { "INSERT INTO [funny_jokes] ([name]) VALUES('Knock knock')" }
@@ -253,77 +255,70 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
 
   end
 
-  describe 'For DatabaseStatements' do
-
-    describe "finding out what user_options are available" do
+  describe 'database statements' do
 
-      it "run the database consistency checker useroptions command" do
-        keys = [:textsize, :language, :isolation_level, :dateformat]
-        user_options = connection.user_options
-        keys.each do |key|
-          msg = "Expected key:#{key} in user_options:#{user_options.inspect}"
-          assert user_options.key?(key), msg
-        end
+    it "run the database consistency checker useroptions command" do
+      keys = [:textsize, :language, :isolation_level, :dateformat]
+      user_options = connection.user_options
+      keys.each do |key|
+        msg = "Expected key:#{key} in user_options:#{user_options.inspect}"
+        assert user_options.key?(key), msg
       end
+    end
 
-      it "return a underscored key hash with indifferent access of the results" do
-        user_options = connection.user_options
-        assert_equal 'read committed', user_options['isolation_level']
-        assert_equal 'read committed', user_options[:isolation_level]
-      end
+    it "return a underscored key hash with indifferent access of the results" do
+      user_options = connection.user_options
+      assert_equal 'read committed', user_options['isolation_level']
+      assert_equal 'read committed', user_options[:isolation_level]
+    end
+
+    describe '#run_with_isolation_level' do
 
-    end unless sqlserver_azure?
+      let(:task1) { tasks(:first_task) }
+      let(:task2) { tasks(:another_task) }
 
-    describe "altering isolation levels" do
+      before do
+        assert task1, 'Tasks :first_task should be in AR fixtures'
+        assert task2, 'Tasks :another_task should be in AR fixtures'
+        good_isolation_level = connection.user_options_isolation_level.blank? || connection.user_options_isolation_level =~ /read committed/i
+        assert good_isolation_level, "User isolation level is not at a happy starting place: #{connection.user_options_isolation_level.inspect}"
+      end
 
       it "barf if the requested isolation level is not valid" do
         assert_raise(ArgumentError) do
           connection.run_with_isolation_level 'INVALID ISOLATION LEVEL' do; end
         end
       end
 
-      describe "with a valid isolation level" do
-
-        before do
-          @t1 = tasks(:first_task)
-          @t2 = tasks(:another_task)
-          assert @t1, 'Tasks :first_task should be in AR fixtures'
-          assert @t2, 'Tasks :another_task should be in AR fixtures'
-          good_isolation_level = connection.user_options_isolation_level.blank? || connection.user_options_isolation_level =~ /read committed/i
-          assert good_isolation_level, "User isolation level is not at a happy starting place: #{connection.user_options_isolation_level.inspect}"
-        end
-
-        it 'allow #run_with_isolation_level to not take a block to set it' do
-          begin
-            connection.run_with_isolation_level 'READ UNCOMMITTED'
-            assert_match %r|read uncommitted|i, connection.user_options_isolation_level
-          ensure
-            connection.run_with_isolation_level 'READ COMMITTED'
-          end
+      it 'allow #run_with_isolation_level to not take a block to set it' do
+        begin
+          connection.run_with_isolation_level 'READ UNCOMMITTED'
+          assert_match %r|read uncommitted|i, connection.user_options_isolation_level
+        ensure
+          connection.run_with_isolation_level 'READ COMMITTED'
         end
+      end
 
-        it 'return block value using #run_with_isolation_level' do
-          assert_equal Task.all.sort, connection.run_with_isolation_level('READ UNCOMMITTED') { Task.all.sort }
-        end
+      it 'return block value using #run_with_isolation_level' do
+        assert_equal Task.all.sort, connection.run_with_isolation_level('READ UNCOMMITTED') { Task.all.sort }
+      end
 
-        it 'pass a read uncommitted isolation level test' do
-          assert_nil @t2.starting, 'Fixture should have this empty.'
-          begin
-            Task.transaction do
-              @t2.starting = Time.now
-              @t2.save
-              @dirty_t2 = connection.run_with_isolation_level('READ UNCOMMITTED') { Task.find(@t2.id) }
-              raise ActiveRecord::ActiveRecordError
-            end
-          rescue
-            'Do Nothing'
+      it 'pass a read uncommitted isolation level test' do
+        assert_nil task2.starting, 'Fixture should have this empty.'
+        begin
+          Task.transaction do
+            task2.starting = Time.now
+            task2.save
+            @dirty_t2 = connection.run_with_isolation_level('READ UNCOMMITTED') { Task.find(task2.id) }
+            raise ActiveRecord::ActiveRecordError
           end
-          assert @dirty_t2, 'Should have a Task record from within block above.'
-          assert @dirty_t2.starting, 'Should have a dirty date.'
-          assert_nil Task.find(@t2.id).starting, 'Should be nil again from botched transaction above.'
+        rescue
+          'Do Nothing'
         end
-
-      end unless sqlserver_azure?
+        assert @dirty_t2, 'Should have a Task record from within block above.'
+        assert @dirty_t2.starting, 'Should have a dirty date.'
+        assert_nil Task.find(task2.id).starting, 'Should be nil again from botched transaction above.'
+      end
 
     end
 

test/schema/sqlserver_specific_schema.rb

@@ -23,13 +23,7 @@
 
 
 
-  create_table :float_data, force: true do |t|
-    t.float   :temperature
-    t.float   :temperature_8, limit: 8
-    t.float   :temperature_24, limit: 24
-    t.float   :temperature_32, limit: 32
-    t.float   :temperature_53, limit: 53
-  end
+
 
   create_table :defaults, force: true do |t|
     t.column :positive_integer, :integer, default: 1