activerecord-sqlserver-adapter 6.1.0.0 → 7.0.0.0.rc1

data/test/cases/column_test_sqlserver.rb

@@ -277,8 +277,8 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "date"
       _(col.type).must_equal               :date
       _(col.null).must_equal               true
-      _(col.default).must_equal            connection_dblib_73? ? Date.civil(0001, 1, 1) : "0001-01-01"
-      _(obj.date).must_equal               Date.civil(0001, 1, 1)
+      _(col.default).must_equal            connection_dblib_73? ? Date.civil(1, 1, 1) : "0001-01-01"
+      _(obj.date).must_equal               Date.civil(1, 1, 1)
       _(col.default_function).must_be_nil
       type = connection.lookup_cast_type_from_column(col)
       _(type).must_be_instance_of Type::Date
@@ -287,20 +287,22 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.scale).must_be_nil
       # Can cast strings. SQL Server format.
       obj.date = "04-01-0001"
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
       obj.save!
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
       obj.reload
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
       # Can cast strings. ISO format.
       obj.date = "0001-04-01"
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
       obj.save!
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
       obj.reload
-      _(obj.date).must_equal Date.civil(0001, 4, 1)
+      _(obj.date).must_equal Date.civil(1, 4, 1)
+      # Can filter by date range
+      _(obj).must_equal obj.class.where(date: obj.date..Date::Infinity.new).first
       # Can keep and return assigned date.
-      assert_obj_set_and_save :date, Date.civil(1972, 04, 14)
+      assert_obj_set_and_save :date, Date.civil(1972, 4, 14)
       # Can accept and cast time objects.
       obj.date = Time.utc(2010, 4, 14, 12, 34, 56, 3000)
       _(obj.date).must_equal               Date.civil(2010, 4, 14)
@@ -313,7 +315,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "datetime"
       _(col.type).must_equal               :datetime
       _(col.null).must_equal               true
-      time = Time.utc 1753, 01, 01, 00, 00, 00, 123000
+      time = Time.utc 1753, 1, 1, 0, 0, 0, 123000
       _(col.default).must_equal            time, "Microseconds were <#{col.default.usec}> vs <123000>"
       _(obj.datetime).must_equal           time, "Microseconds were <#{obj.datetime.usec}> vs <123000>"
       _(col.default_function).must_be_nil
@@ -325,7 +327,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       obj.save!
       _(obj).must_equal obj.class.where(datetime: time).first
       # Can save to proper accuracy and return again.
-      time = Time.utc 2010, 04, 01, 12, 34, 56, 3000
+      time = Time.utc 2010, 4, 1, 12, 34, 56, 3000
       obj.datetime = time
       _(obj.datetime).must_equal time, "Microseconds were <#{obj.datetime.usec}> vs <3000>"
       obj.save!
@@ -333,9 +335,11 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       obj.reload
       _(obj.datetime).must_equal time, "Microseconds were <#{obj.datetime.usec}> vs <3000>"
       _(obj).must_equal obj.class.where(datetime: time).first
+      # Can filter by datetime range
+      _(obj).must_equal obj.class.where(datetime: time..DateTime::Infinity.new).first
       # Will cast to true DB value on attribute write, save and return again.
-      time = Time.utc 2010, 04, 01, 12, 34, 56, 234567
-      time2 = Time.utc 2010, 04, 01, 12, 34, 56, 233000
+      time = Time.utc 2010, 4, 1, 12, 34, 56, 234567
+      time2 = Time.utc 2010, 4, 1, 12, 34, 56, 233000
       obj.datetime = time
       _(obj.datetime).must_equal time2, "Microseconds were <#{obj.datetime.usec}> vs <233000>"
       obj.save!
@@ -423,8 +427,8 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "datetimeoffset(7)"
       _(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>"
+      _(col.default).must_equal            Time.new(1984, 1, 24, 4, 20, 0, -28800).change(nsec: 123456700), "Nanoseconds <#{col.default.nsec}> vs <123456700>"
+      _(obj.datetimeoffset_7).must_equal   Time.new(1984, 1, 24, 4, 20, 0, -28800).change(nsec: 123456700), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <999999900>"
       _(col.default_function).must_be_nil
       type = connection.lookup_cast_type_from_column(col)
       _(type).must_be_instance_of Type::DateTimeOffset
@@ -432,12 +436,12 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.precision).must_equal 7
       _(type.scale).must_be_nil
       # Can save 100 nanosecond precisoins and return again.
-      obj.datetimeoffset_7 = Time.new(2010, 04, 01, 12, 34, 56, +18000).change(nsec: 123456755)
-      _(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.datetimeoffset_7 = Time.new(2010, 4, 1, 12, 34, 56, +18000).change(nsec: 123456755)
+      _(obj.datetimeoffset_7).must_equal Time.new(2010, 4, 1, 12, 34, 56, +18000).change(nsec: 123456800), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <123456800>"
       obj.save!
-      _(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.datetimeoffset_7).must_equal Time.new(2010, 4, 1, 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>"
+      _(obj.datetimeoffset_7).must_equal Time.new(2010, 4, 1, 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
@@ -466,8 +470,8 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "smalldatetime"
       _(col.type).must_equal               :smalldatetime
       _(col.null).must_equal               true
-      _(col.default).must_equal            Time.utc(1901, 01, 01, 15, 45, 00, 000)
-      _(obj.smalldatetime).must_equal      Time.utc(1901, 01, 01, 15, 45, 00, 000)
+      _(col.default).must_equal            Time.utc(1901, 1, 1, 15, 45, 0, 0)
+      _(obj.smalldatetime).must_equal      Time.utc(1901, 1, 1, 15, 45, 0, 0)
       _(col.default_function).must_be_nil
       type = connection.lookup_cast_type_from_column(col)
       _(type).must_be_instance_of Type::SmallDateTime
@@ -475,12 +479,12 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.precision).must_be_nil
       _(type.scale).must_be_nil
       # Will remove fractional seconds and return again.
-      obj.smalldatetime = Time.utc(2078, 06, 05, 4, 20, 00, 3000)
-      _(obj.smalldatetime).must_equal Time.utc(2078, 06, 05, 4, 20, 00, 0), "Microseconds were <#{obj.smalldatetime.usec}> vs <0>"
+      obj.smalldatetime = Time.utc(2078, 6, 5, 4, 20, 0, 3000)
+      _(obj.smalldatetime).must_equal Time.utc(2078, 6, 5, 4, 20, 0, 0), "Microseconds were <#{obj.smalldatetime.usec}> vs <0>"
       obj.save!
-      _(obj.smalldatetime).must_equal Time.utc(2078, 06, 05, 4, 20, 00, 0), "Microseconds were <#{obj.reload.smalldatetime.usec}> vs <0>"
+      _(obj.smalldatetime).must_equal Time.utc(2078, 6, 5, 4, 20, 0, 0), "Microseconds were <#{obj.reload.smalldatetime.usec}> vs <0>"
       obj.reload
-      _(obj.smalldatetime).must_equal Time.utc(2078, 06, 05, 4, 20, 00, 0), "Microseconds were <#{obj.reload.smalldatetime.usec}> vs <0>"
+      _(obj.smalldatetime).must_equal Time.utc(2078, 6, 5, 4, 20, 0, 0), "Microseconds were <#{obj.reload.smalldatetime.usec}> vs <0>"
     end
 
     it "time(7)" do
@@ -489,7 +493,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "time(7)"
       _(col.type).must_equal               :time
       _(col.null).must_equal               true
-      _(col.default).must_equal            Time.utc(1900, 01, 01, 04, 20, 00, Rational(288321500, 1000)), "Nanoseconds were <#{col.default.nsec}> vs <288321500>"
+      _(col.default).must_equal            Time.utc(1900, 1, 1, 4, 20, 0, Rational(288321500, 1000)), "Nanoseconds were <#{col.default.nsec}> vs <288321500>"
       _(col.default_function).must_be_nil
       type = connection.lookup_cast_type_from_column(col)
       _(type).must_be_instance_of Type::Time
@@ -497,22 +501,22 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.precision).must_equal 7
       _(type.scale).must_be_nil
       # Time's #usec precision (low micro)
-      obj.time_7 = Time.utc(2000, 01, 01, 15, 45, 00, 300)
-      _(obj.time_7).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Microseconds were <#{obj.time_7.usec}> vs <0>"
-      _(obj.time_7).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Nanoseconds were <#{obj.time_7.nsec}> vs <300>"
+      obj.time_7 = Time.utc(2000, 1, 1, 15, 45, 0, 300)
+      _(obj.time_7).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Microseconds were <#{obj.time_7.usec}> vs <0>"
+      _(obj.time_7).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Nanoseconds were <#{obj.time_7.nsec}> vs <300>"
       obj.save!; obj.reload
-      _(obj.time_7).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Microseconds were <#{obj.time_7.usec}> vs <0>"
-      _(obj.time_7).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Nanoseconds were <#{obj.time_7.nsec}> vs <300>"
+      _(obj.time_7).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Microseconds were <#{obj.time_7.usec}> vs <0>"
+      _(obj.time_7).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Nanoseconds were <#{obj.time_7.nsec}> vs <300>"
       # Time's #usec precision (high micro)
-      obj.time_7 = Time.utc(2000, 01, 01, 15, 45, 00, 234567)
-      _(obj.time_7).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 234567), "Microseconds were <#{obj.time_7.usec}> vs <234567>"
+      obj.time_7 = Time.utc(2000, 1, 1, 15, 45, 0, 234567)
+      _(obj.time_7).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 234567), "Microseconds were <#{obj.time_7.usec}> vs <234567>"
       obj.save!; obj.reload
-      _(obj.time_7).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 234567), "Microseconds were <#{obj.time_7.usec}> vs <234567>"
+      _(obj.time_7).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 234567), "Microseconds were <#{obj.time_7.usec}> vs <234567>"
       # Time's #usec precision (high nano rounded)
-      obj.time_7 = Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321545, 1000))
-      _(obj.time_7).must_equal Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_7.nsec}> vs <288321500>"
+      obj.time_7 = Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321545, 1000))
+      _(obj.time_7).must_equal Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_7.nsec}> vs <288321500>"
       obj.save!; obj.reload
-      _(obj.time_7).must_equal Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_7.nsec}> vs <288321500>"
+      _(obj.time_7).must_equal Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_7.nsec}> vs <288321500>"
     end
 
     it "time(2)" do
@@ -529,20 +533,20 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.precision).must_equal 2
       _(type.scale).must_be_nil
       # Always uses TinyTDS/Windows 2000-01-01 convention too.
-      obj.time_2 = Time.utc(2015, 01, 10, 15, 45, 00, 0)
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 0)
+      obj.time_2 = Time.utc(2015, 1, 10, 15, 45, 0, 0)
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 0)
       obj.save!; obj.reload
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 0)
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 0)
       # Time's #usec precision (barely in 2 precision equal to 0.03 seconds)
-      obj.time_2 = Time.utc(2000, 01, 01, 15, 45, 00, 30000)
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 30000), "Microseconds were <#{obj.time_2.usec}> vs <30000>"
+      obj.time_2 = Time.utc(2000, 1, 1, 15, 45, 0, 30000)
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 30000), "Microseconds were <#{obj.time_2.usec}> vs <30000>"
       obj.save!; obj.reload
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 30000), "Microseconds were <#{obj.time_2.usec}> vs <30000>"
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 30000), "Microseconds were <#{obj.time_2.usec}> vs <30000>"
       # Time's #usec precision (below 2 precision)
-      obj.time_2 = Time.utc(2000, 01, 01, 15, 45, 00, 4000)
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 0), "Microseconds were <#{obj.time_2.usec}> vs <0>"
+      obj.time_2 = Time.utc(2000, 1, 1, 15, 45, 0, 4000)
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 0), "Microseconds were <#{obj.time_2.usec}> vs <0>"
       obj.save!; obj.reload
-      _(obj.time_2).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 0), "Microseconds were <#{obj.time_2.usec}> vs <0>"
+      _(obj.time_2).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 0), "Microseconds were <#{obj.time_2.usec}> vs <0>"
     end
 
     it "time using default precision" do
@@ -551,7 +555,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(col.sql_type).must_equal           "time(7)"
       _(col.type).must_equal               :time
       _(col.null).must_equal               true
-      _(col.default).must_equal            Time.utc(1900, 01, 01, 15, 03, 42, Rational(62197800, 1000)), "Nanoseconds were <#{col.default.nsec}> vs <62197800>"
+      _(col.default).must_equal            Time.utc(1900, 1, 1, 15, 3, 42, Rational(62197800, 1000)), "Nanoseconds were <#{col.default.nsec}> vs <62197800>"
       _(col.default_function).must_be_nil
       type = connection.lookup_cast_type_from_column(col)
       _(type).must_be_instance_of Type::Time
@@ -559,22 +563,22 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
       _(type.precision).must_equal 7
       _(type.scale).must_be_nil
       # Time's #usec precision (low micro)
-      obj.time_default = Time.utc(2000, 01, 01, 15, 45, 00, 300)
-      _(obj.time_default).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Microseconds were <#{obj.time_default.usec}> vs <0>"
-      _(obj.time_default).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Nanoseconds were <#{obj.time_default.nsec}> vs <300>"
+      obj.time_default = Time.utc(2000, 1, 1, 15, 45, 0, 300)
+      _(obj.time_default).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Microseconds were <#{obj.time_default.usec}> vs <0>"
+      _(obj.time_default).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Nanoseconds were <#{obj.time_default.nsec}> vs <300>"
       obj.save!; obj.reload
-      _(obj.time_default).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Microseconds were <#{obj.time_default.usec}> vs <0>"
-      _(obj.time_default).must_equal             Time.utc(2000, 01, 01, 15, 45, 00, 300), "Nanoseconds were <#{obj.time_default.nsec}> vs <300>"
+      _(obj.time_default).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Microseconds were <#{obj.time_default.usec}> vs <0>"
+      _(obj.time_default).must_equal             Time.utc(2000, 1, 1, 15, 45, 0, 300), "Nanoseconds were <#{obj.time_default.nsec}> vs <300>"
       # Time's #usec precision (high micro)
-      obj.time_default = Time.utc(2000, 01, 01, 15, 45, 00, 234567)
-      _(obj.time_default).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 234567), "Microseconds were <#{obj.time_default.usec}> vs <234567>"
+      obj.time_default = Time.utc(2000, 1, 1, 15, 45, 0, 234567)
+      _(obj.time_default).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 234567), "Microseconds were <#{obj.time_default.usec}> vs <234567>"
       obj.save!; obj.reload
-      _(obj.time_default).must_equal Time.utc(2000, 01, 01, 15, 45, 00, 234567), "Microseconds were <#{obj.time_default.usec}> vs <234567>"
+      _(obj.time_default).must_equal Time.utc(2000, 1, 1, 15, 45, 0, 234567), "Microseconds were <#{obj.time_default.usec}> vs <234567>"
       # Time's #usec precision (high nano rounded)
-      obj.time_default = Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321545, 1000))
-      _(obj.time_default).must_equal Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_default.nsec}> vs <288321500>"
+      obj.time_default = Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321545, 1000))
+      _(obj.time_default).must_equal Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_default.nsec}> vs <288321500>"
       obj.save!; obj.reload
-      _(obj.time_default).must_equal Time.utc(2000, 01, 01, 15, 45, 00, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_default.nsec}> vs <288321500>"
+      _(obj.time_default).must_equal Time.utc(2000, 1, 1, 15, 45, 0, Rational(288321500, 1000)), "Nanoseconds were <#{obj.time_default.nsec}> vs <288321500>"
     end
 
     # Character Strings

data/test/cases/eager_load_too_many_ids_test_sqlserver.rb

@@ -0,0 +1,18 @@
+require "cases/helper_sqlserver"
+require "models/citation"
+require "models/book"
+
+class EagerLoadingTooManyIdsTest < ActiveRecord::TestCase
+  fixtures :citations
+
+  def test_batch_preloading_too_many_ids
+    in_clause_length = 10_000
+
+    # We Monkey patch Preloader to work with batches of 10_000 records.
+    # Expect: N Books queries + Citation query
+    expected_query_count = (Citation.count / in_clause_length.to_f).ceil + 1
+    assert_queries(expected_query_count) do
+      Citation.preload(:reference_of).to_a.size
+    end
+  end
+end

data/test/cases/fetch_test_sqlserver.rb

@@ -49,3 +49,21 @@ class FetchTestSqlserver < ActiveRecord::TestCase
     @books = (1..10).map { |i| Book.create! name: "Name-#{i}" }
   end
 end
+
+class DeterministicFetchWithCompositePkTestSQLServer < ActiveRecord::TestCase
+  it "orders by the identity column if table has one" do
+    SSCompositePkWithIdentity.delete_all
+    SSCompositePkWithIdentity.create(pk_col_two: 2)
+    SSCompositePkWithIdentity.create(pk_col_two: 1)
+
+    _(SSCompositePkWithIdentity.take(1).map(&:pk_col_two)).must_equal [2]
+  end
+
+  it "orders by the first column if table has no identity column" do
+    SSCompositePkWithoutIdentity.delete_all
+    SSCompositePkWithoutIdentity.create(pk_col_one: 2, pk_col_two: 2)
+    SSCompositePkWithoutIdentity.create(pk_col_one: 1, pk_col_two: 1)
+
+    _(SSCompositePkWithoutIdentity.take(1).map(&:pk_col_two)).must_equal [1]
+  end
+end

data/test/cases/rake_test_sqlserver.rb

@@ -156,3 +156,39 @@ class SQLServerRakeStructureDumpLoadTest < SQLServerRakeTest
     _(connection.tables).must_include "users"
   end
 end
+
+class SQLServerRakeSchemaCacheDumpLoadTest < SQLServerRakeTest
+  let(:filename) { File.join ARTest::SQLServer.test_root_sqlserver, "schema_cache.yml" }
+  let(:filedata) { File.read(filename) }
+
+  before do
+    quietly { db_tasks.create(configuration) }
+
+    connection.create_table :users, force: true do |t|
+      t.string :name, null: false
+    end
+  end
+
+  after do
+    FileUtils.rm_rf(filename)
+  end
+
+  it "dumps schema cache with SQL Server metadata" do
+    quietly { db_tasks.dump_schema_cache connection, filename }
+
+    filedata = File.read(filename)
+    schema_cache = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(filedata) : YAML.load(filedata)
+
+    col_id, col_name = connection.schema_cache.columns("users")
+
+    assert col_id.is_identity
+    assert col_id.is_primary
+    assert_equal col_id.ordinal_position, 1
+    assert_equal col_id.table_name, "users"
+
+    assert_not col_name.is_identity
+    assert_not col_name.is_primary
+    assert_equal col_name.ordinal_position, 2
+    assert_equal col_name.table_name, "users"
+  end
+end

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -67,7 +67,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     _(columns["float_col"].sql_type).must_equal        "float"
     _(columns["string_col"].sql_type).must_equal       "nvarchar(4000)"
     _(columns["text_col"].sql_type).must_equal         "nvarchar(max)"
-    _(columns["datetime_col"].sql_type).must_equal     "datetime"
+    _(columns["datetime_col"].sql_type).must_equal     "datetime2(6)"
     _(columns["timestamp_col"].sql_type).must_equal    "datetime"
     _(columns["time_col"].sql_type).must_equal         "time(7)"
     _(columns["date_col"].sql_type).must_equal         "date"
@@ -79,7 +79,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :float_col,       type: "float",        limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :string_col,      type: "string",       limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :text_col,        type: "text",         limit: nil,          precision: nil,  scale: nil, default: nil
-    assert_line :datetime_col,    type: "datetime",     limit: nil,          precision: nil,  scale: nil, default: nil
+    assert_line :datetime_col,    type: "datetime",     limit: nil,          precision: 6,    scale: nil, default: nil
     assert_line :timestamp_col,   type: "datetime",     limit: nil,          precision: nil,  scale: nil, default: nil
     assert_line :time_col,        type: "time",         limit: nil,          precision: 7,    scale: nil, default: nil
     assert_line :date_col,        type: "date",         limit: nil,          precision: nil,  scale: nil, default: nil

data/test/migrations/transaction_table/1_table_will_never_be_created.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class TableWillNeverBeCreated < ActiveRecord::Migration
+class TableWillNeverBeCreated < ActiveRecord::Migration[5.2]
   def self.up
     create_table(:sqlserver_trans_table1) {}
     create_table(:sqlserver_trans_table2) { raise("HELL") }

data/test/models/sqlserver/composite_pk.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class SSCompositePkWithoutIdentity < ActiveRecord::Base
+  self.table_name = :sst_composite_without_identity
+end
+
+class SSCompositePkWithIdentity < ActiveRecord::Base
+  self.table_name = :sst_composite_with_identity
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -294,4 +294,22 @@ ActiveRecord::Schema.define do
       CONSTRAINT PK_UNIQUE_KEY PRIMARY KEY (id)
     );
   SQLSERVERUNIQUEKEYS
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_composite_without_identity') DROP TABLE sst_composite_without_identity"
+  execute <<-COMPOSITE_WITHOUT_IDENTITY
+    CREATE TABLE sst_composite_without_identity (
+      pk_col_one int NOT NULL,
+      pk_col_two int NOT NULL,
+      CONSTRAINT PK_sst_composite_without_identity PRIMARY KEY (pk_col_one, pk_col_two)
+    );
+  COMPOSITE_WITHOUT_IDENTITY
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_composite_with_identity') DROP TABLE sst_composite_with_identity"
+  execute <<-COMPOSITE_WITH_IDENTITY
+    CREATE TABLE sst_composite_with_identity (
+      pk_col_one int IDENTITY NOT NULL,
+      pk_col_two int NOT NULL,
+      CONSTRAINT PK_sst_composite_with_identity PRIMARY KEY (pk_col_one, pk_col_two)
+    );
+  COMPOSITE_WITH_IDENTITY
 end

data/test/support/coerceable_test_sqlserver.rb

@@ -13,7 +13,7 @@ module ARTest
       module ClassMethods
         def coerce_tests!(*methods)
           methods.each do |method|
-            self.coerced_tests.push(method)
+            coerced_tests.push(method)
             coerced_test_warning(method)
           end
         end
@@ -24,7 +24,7 @@ module ARTest
 
             undef_method(method)
           end
-          STDOUT.puts "🙉 🙈 🙊  Undefined all tests: #{self.name}"
+          STDOUT.puts "🙉 🙈 🙊  Undefined all tests: #{name}"
         end
 
         private
@@ -43,9 +43,9 @@ module ARTest
                      end
 
             if result.blank?
-              STDOUT.puts "🐳  Unfound coerced test: #{self.name}##{m}"
+              STDOUT.puts "🐳  Unfound coerced test: #{name}##{m}"
             else
-              STDOUT.puts "🐵  Undefined coerced test: #{self.name}##{m}"
+              STDOUT.puts "🐵  Undefined coerced test: #{name}##{m}"
             end
           end
         end

data/test/support/rake_helpers.rb

@@ -25,7 +25,9 @@ end
 
 def ar_cases
   @ar_cases ||= begin
-    Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb").reject { |x| x =~ /\/adapters\// }.sort
+    Dir.glob("#{ARTest::SQLServer.root_activerecord}/test/cases/**/*_test.rb").reject {
+      |x| x.include?("/adapters/") || x.include?("/encryption/performance")
+    }.sort
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.0.0
+  version: 7.0.0.0.rc1
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,6 @@ files:
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/finder_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/preloader.rb
-- lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
 - lib/active_record/connection_adapters/sqlserver/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/database_tasks.rb
@@ -150,6 +149,7 @@ files:
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
 - test/cases/disconnected_test_sqlserver.rb
+- test/cases/eager_load_too_many_ids_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -180,6 +180,7 @@ files:
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
 - test/models/sqlserver/booking.rb
+- test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
@@ -212,8 +213,8 @@ files:
 - test/support/connection_reflection.rb
 - test/support/core_ext/query_cache.rb
 - test/support/load_schema_sqlserver.rb
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic.dump
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic_associations.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb
@@ -224,8 +225,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v6.1.0.0/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v6.1.0.0
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.0.0.0.rc1/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.0.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -234,14 +235,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
@@ -258,6 +259,7 @@ test_files:
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
 - test/cases/disconnected_test_sqlserver.rb
+- test/cases/eager_load_too_many_ids_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -288,6 +290,7 @@ test_files:
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
 - test/models/sqlserver/booking.rb
+- test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
@@ -320,8 +323,8 @@ test_files:
 - test/support/connection_reflection.rb
 - test/support/core_ext/query_cache.rb
 - test/support/load_schema_sqlserver.rb
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic.dump
-- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_0_topic_associations.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_6_1_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb

data/lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record/relation"
-require "active_record/version"
-
-module ActiveRecord
-  module ConnectionAdapters
-    module SQLServer
-      module CoreExt
-        module QueryMethods
-          private
-
-          # Copy of original from Rails master.
-          # This patch can be removed when adapter supports Rails version greater than 6.0.2.2
-          def table_name_matches?(from)
-            table_name = Regexp.escape(table.name)
-            quoted_table_name = Regexp.escape(connection.quote_table_name(table.name))
-            /(?:\A|(?<!FROM)\s)(?:\b#{table_name}\b|#{quoted_table_name})(?!\.)/i.match?(from.to_s)
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::QueryMethods)
-end