activerecord-sqlserver-adapter 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2b6f7f8589a69b587c63d0de5713b527e2389f
-  data.tar.gz: 738c33f3937b47b7e87b54bf6436fcc81d3dbd4f
+  metadata.gz: 9f171340d9c4e11e1baf5bfcdcc51c6de645f7c1
+  data.tar.gz: ef6051e74b57e8e5630993749d651a4be43c6f4e
 SHA512:
-  metadata.gz: 65a7995a536eb3eedf3a771aff7c0645538189f131add85db6c585e43c03547ed64158009e53183310f05c8c9a5c40e8158baa79758f6bfcb0e5d7b680c472c5
-  data.tar.gz: 69eae26ecb4a8ccb7cc61e8b689e579ecae2046692de4fefe9978f2e36c4e1731231aec33b580545a521245041f3af9b9f833ec2ee9160874acbe723e1421019
+  metadata.gz: 554f6f57cc679315c150b9fe1a624dfc7a58ccd0992c894bfbde6c8b6d487e1b6d0604d4d63048bd48994cfac62b07420a748fe8fdc9ca6b32e875895a58970a
+  data.tar.gz: d3e2d4fe42b20c3d6d6a25a39d6268d0c8f882669c88c3d8f1822d4a5c2ece0599a1d2806fdcdc48b5e79ed53b2d1556bb949c504377d8a3d35d253717e084b3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v5.0.4
+
+#### Fixed
+
+* Allow `datetimeoffset` to be used in migrations and represented in schema.
+* Using transactions and resetting isolation level correctly when `READ_COMMITTED_SNAPSHOT` is set to `ON` Fixes #520
+
+
 ## v5.0.3
 
 #### Changed

data/VERSION

@@ -1 +1 @@
-5.0.3
+5.0.4

data/lib/active_record/connection_adapters/sqlserver/transaction.rb

@@ -14,7 +14,14 @@ module ActiveRecord
       def current_isolation_level
         return unless sqlserver?
         level = connection.user_options_isolation_level
-        level.blank? ? 'READ COMMITTED' : level.upcase
+        # When READ_COMMITTED_SNAPSHOT is set to ON,
+        # user_options_isolation_level will be equal to 'read committed
+        # snapshot' which is not a valid isolation level
+        if level.blank? || level == 'read committed snapshot'
+          'READ COMMITTED'
+        else
+          level.upcase
+        end
       end
 
     end

data/lib/active_record/connection_adapters/sqlserver/type/datetimeoffset.rb

@@ -4,6 +4,10 @@ module ActiveRecord
       module Type
         class DateTimeOffset < DateTime2
 
+          def type
+            :datetimeoffset
+          end
+
           def sqlserver_type
             "datetimeoffset(#{precision.to_i})"
           end

data/test/cases/column_test_sqlserver.rb

@@ -417,7 +417,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       skip 'datetimeoffset not supported in this protocal version' unless connection_dblib_73?
       col = column('datetimeoffset_7')
       col.sql_type.must_equal           'datetimeoffset(7)'
-      col.type.must_equal               :datetime
+      col.type.must_equal               :datetimeoffset
       col.null.must_equal               true
       col.default.must_equal            Time.new(1984, 01, 24, 04, 20, 00, -28800).change(nsec: 123456700), "Nanoseconds <#{col.default.nsec}> vs <123456700>"
       obj.datetimeoffset_7.must_equal   Time.new(1984, 01, 24, 04, 20, 00, -28800).change(nsec: 123456700), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <999999900>"
@@ -434,20 +434,26 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       obj.datetimeoffset_7.must_equal   Time.new(2010, 04, 01, 12, 34, 56, +18000).change(nsec: 123456800), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <123456800>"
       obj.reload
       obj.datetimeoffset_7.must_equal   Time.new(2010, 04, 01, 12, 34, 56, +18000).change(nsec: 123456800), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <123456800>"
+      # Maintains the timezone
+      time = ActiveSupport::TimeZone['America/Los_Angeles'].local 2010, 12, 31, 23, 59, 59, Rational(123456800, 1000)
+      obj.datetimeoffset_7 = time
+      obj.datetimeoffset_7.must_equal time
+      obj.save!
+      obj.datetimeoffset_7.must_equal time
+      obj.reload.datetimeoffset_7.must_equal time
       # With other precisions.
       time = ActiveSupport::TimeZone['America/Los_Angeles'].local 2010, 12, 31, 23, 59, 59, Rational(123456755, 1000)
       col = column('datetimeoffset_3')
       connection.lookup_cast_type_from_column(col).precision.must_equal 3
       obj.datetimeoffset_3 = time
       obj.datetimeoffset_3.must_equal time.change(nsec: 123000000), "Nanoseconds were <#{obj.datetimeoffset_3.nsec}> vs <123000000>"
-      # TODO: FreeTDS date bug fixed: https://github.com/FreeTDS/freetds/issues/44
-      obj.save! ; obj.reload
+      obj.save!
       obj.datetimeoffset_3.must_equal time.change(nsec: 123000000), "Nanoseconds were <#{obj.datetimeoffset_3.nsec}> vs <123000000>"
       col = column('datetime2_1')
       connection.lookup_cast_type_from_column(col).precision.must_equal 1
       obj.datetime2_1 = time
       obj.datetime2_1.must_equal time.change(nsec: 100000000), "Nanoseconds were <#{obj.datetime2_1.nsec}> vs <100000000>"
-      obj.save! ; obj.reload
+      obj.save!
       obj.datetime2_1.must_equal time.change(nsec: 100000000), "Nanoseconds were <#{obj.datetime2_1.nsec}> vs <100000000>"
     end
 

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -97,19 +97,20 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     columns['varbinary_col'].sql_type.must_equal    'varbinary(8000)'
     columns['uuid_col'].sql_type.must_equal         'uniqueidentifier'
     columns['sstimestamp_col'].sql_type.must_equal  'timestamp'
-    assert_line :real_col,          type: 'real',         limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :money_col,         type: 'money',        limit: nil,           precision: 19,    scale: 4,    default: nil
-    assert_line :datetime2_col,     type: 'datetime',     limit: nil,           precision: 7,     scale: nil,  default: nil
-    assert_line :smallmoney_col,    type: 'smallmoney',   limit: nil,           precision: 10,    scale: 4,    default: nil
-    assert_line :char_col,          type: 'char',         limit: 1,             precision: nil,   scale: nil,  default: nil
-    assert_line :varchar_col,       type: 'varchar',      limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :text_basic_col,    type: 'text_basic',   limit: 2147483647,    precision: nil,   scale: nil,  default: nil
-    assert_line :nchar_col,         type: 'nchar',        limit: 1,             precision: nil,   scale: nil,  default: nil
-    assert_line :ntext_col,         type: 'ntext',        limit: 2147483647,    precision: nil,   scale: nil,  default: nil
-    assert_line :binary_basic_col,  type: 'binary_basic', limit: 1,             precision: nil,   scale: nil,  default: nil
-    assert_line :varbinary_col,     type: 'varbinary',    limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :uuid_col,          type: 'uuid',         limit: nil,           precision: nil,   scale: nil,  default: nil
-    assert_line :sstimestamp_col,   type: 'ss_timestamp', limit: nil,           precision: nil,   scale: nil,  default: nil
+    assert_line :real_col,          type: 'real',           limit: nil,           precision: nil,   scale: nil,  default: nil
+    assert_line :money_col,         type: 'money',          limit: nil,           precision: 19,    scale: 4,    default: nil
+    assert_line :datetime2_col,     type: 'datetime',       limit: nil,           precision: 7,     scale: nil,  default: nil
+    assert_line :datetimeoffset,    type: 'datetimeoffset', limit: nil,           precision: 7,     scale: nil,  default: nil
+    assert_line :smallmoney_col,    type: 'smallmoney',     limit: nil,           precision: 10,    scale: 4,    default: nil
+    assert_line :char_col,          type: 'char',           limit: 1,             precision: nil,   scale: nil,  default: nil
+    assert_line :varchar_col,       type: 'varchar',        limit: nil,           precision: nil,   scale: nil,  default: nil
+    assert_line :text_basic_col,    type: 'text_basic',     limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :nchar_col,         type: 'nchar',          limit: 1,             precision: nil,   scale: nil,  default: nil
+    assert_line :ntext_col,         type: 'ntext',          limit: 2147483647,    precision: nil,   scale: nil,  default: nil
+    assert_line :binary_basic_col,  type: 'binary_basic',   limit: 1,             precision: nil,   scale: nil,  default: nil
+    assert_line :varbinary_col,     type: 'varbinary',      limit: nil,           precision: nil,   scale: nil,  default: nil
+    assert_line :uuid_col,          type: 'uuid',           limit: nil,           precision: nil,   scale: nil,  default: nil
+    assert_line :sstimestamp_col,   type: 'ss_timestamp',   limit: nil,           precision: nil,   scale: nil,  default: nil
   end
 
   # Special Cases

data/test/cases/transaction_test_sqlserver.rb

@@ -52,6 +52,31 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
     connection.user_options_isolation_level.must_match %r{read committed}i
   end
 
+  describe 'when READ_COMMITTED_SNAPSHOT is set' do
+    before do
+      connection.execute "ALTER DATABASE [#{connection.current_database}] SET ALLOW_SNAPSHOT_ISOLATION ON"
+      connection.execute "ALTER DATABASE [#{connection.current_database}] SET READ_COMMITTED_SNAPSHOT ON WITH ROLLBACK IMMEDIATE"
+    end
+
+    after do
+      connection.execute "ALTER DATABASE [#{connection.current_database}] SET ALLOW_SNAPSHOT_ISOLATION OFF"
+      connection.execute "ALTER DATABASE [#{connection.current_database}] SET READ_COMMITTED_SNAPSHOT OFF WITH ROLLBACK IMMEDIATE"
+    end
+
+    it 'should use READ COMMITTED as an isolation level' do
+      connection.user_options_isolation_level.must_match "read committed snapshot"
+
+      Ship.transaction(isolation: :serializable) do
+        Ship.create! name: 'Black Pearl'
+      end
+
+      # We're actually testing that the isolation level was correctly reset to
+      # "READ COMMITTED", and that no exception was raised (it's reported back
+      # by SQL Server as "read committed snapshot").
+      connection.user_options_isolation_level.must_match "read committed snapshot"
+    end
+  end
+
 
   protected
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord