activerecord-sqlserver-adapter 7.0.5.1 → 7.1.0.rc1

data/test/cases/column_test_sqlserver.rb

@@ -277,7 +277,7 @@ 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(1, 1, 1) : "0001-01-01"
+      _(col.default).must_equal            connection_tds_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)
@@ -357,7 +357,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     end
 
     it "datetime2" do
-      skip "datetime2 not supported in this protocol version" unless connection_dblib_73?
+      skip "datetime2 not supported in this protocol version" unless connection_tds_73
       col = column("datetime2_7")
       _(col.sql_type).must_equal           "datetime2(7)"
       _(col.type).must_equal               :datetime
@@ -422,7 +422,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     end
 
     it "datetimeoffset" do
-      skip "datetimeoffset not supported in this protocol version" unless connection_dblib_73?
+      skip "datetimeoffset not supported in this protocol version" unless connection_tds_73
       col = column("datetimeoffset_7")
       _(col.sql_type).must_equal           "datetimeoffset(7)"
       _(col.type).must_equal               :datetimeoffset
@@ -488,7 +488,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     end
 
     it "time(7)" do
-      skip "time() not supported in this protocol version" unless connection_dblib_73?
+      skip "time() not supported in this protocol version" unless connection_tds_73
       col = column("time_7")
       _(col.sql_type).must_equal           "time(7)"
       _(col.type).must_equal               :time
@@ -520,7 +520,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     end
 
     it "time(2)" do
-      skip "time() not supported in this protocol version" unless connection_dblib_73?
+      skip "time() not supported in this protocol version" unless connection_tds_73
       col = column("time_2")
       _(col.sql_type).must_equal           "time(2)"
       _(col.type).must_equal               :time
@@ -550,7 +550,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     end
 
     it "time using default precision" do
-      skip "time() not supported in this protocol version" unless connection_dblib_73?
+      skip "time() not supported in this protocol version" unless connection_tds_73
       col = column("time_default")
       _(col.sql_type).must_equal           "time(7)"
       _(col.type).must_equal               :time

data/test/cases/connection_test_sqlserver.rb

@@ -44,9 +44,9 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
       assert connection.spid.nil?
     end
 
-    it "reset the connection" do
+    it "reset raw connection on disconnect!" do
       connection.disconnect!
-      _(connection.raw_connection).must_be_nil
+      _(connection.instance_variable_get(:@raw_connection)).must_be_nil
     end
 
     it "be able to disconnect and reconnect at will" do
@@ -60,9 +60,6 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
   private
 
   def disconnect_raw_connection!
-    case connection_options[:mode]
-    when :dblib
-      connection.raw_connection.close rescue nil
-    end
+    connection.raw_connection.close rescue nil
   end
 end

data/test/cases/disconnected_test_sqlserver.rb

@@ -5,6 +5,7 @@ require "cases/helper_sqlserver"
 class TestDisconnectedAdapter < ActiveRecord::TestCase
   self.use_transactional_tests = false
 
+  undef_method :setup
   def setup
     @connection = ActiveRecord::Base.connection
   end
@@ -15,15 +16,13 @@ class TestDisconnectedAdapter < ActiveRecord::TestCase
     ActiveRecord::Base.establish_connection(db_config)
   end
 
-  test "can't execute procedures while disconnected" do
+  test "execute procedure after disconnect reconnects" do
     @connection.execute_procedure :sp_tables, "sst_datatypes"
     @connection.disconnect!
-    assert_raises(ActiveRecord::ConnectionNotEstablished, 'SQL Server client is not connected') do
-      @connection.execute_procedure :sp_tables, "sst_datatypes"
-    end
+    @connection.execute_procedure :sp_tables, "sst_datatypes"
   end
 
-  test "can't execute query while disconnected" do
+  test "execute query after disconnect reconnects" do
     sql = "SELECT count(*) from products WHERE id IN(@0, @1)"
     binds = [
       ActiveRecord::Relation::QueryAttribute.new("id", 2, ActiveRecord::Type::BigInteger.new),
@@ -32,8 +31,6 @@ class TestDisconnectedAdapter < ActiveRecord::TestCase
 
     @connection.exec_query sql, "TEST", binds
     @connection.disconnect!
-    assert_raises(ActiveRecord::ConnectionNotEstablished, 'SQL Server client is not connected') do
-      @connection.exec_query sql, "TEST", binds
-    end
+    @connection.exec_query sql, "TEST", binds
   end
 end

data/test/cases/execute_procedure_test_sqlserver.rb

@@ -43,7 +43,7 @@ class ExecuteProcedureTestSQLServer < ActiveRecord::TestCase
   end
 
   it 'test deprecation with transaction return when executing procedure' do
-    assert_deprecated do
+    assert_deprecated(ActiveRecord.deprecator) do
       ActiveRecord::Base.transaction do
         connection.execute_procedure("my_getutcdate")
         return

data/test/cases/rake_test_sqlserver.rb

@@ -177,7 +177,7 @@ class SQLServerRakeSchemaCacheDumpLoadTest < SQLServerRakeTest
     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)
+    _schema_cache = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(filedata) : YAML.load(filedata)
 
     col_id, col_name = connection.schema_cache.columns("users")
 

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -27,13 +27,13 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     # Date and Time
     assert_line :date,              type: "date",                                                       default: "01-01-0001"
     assert_line :datetime,          type: "datetime",                    precision: nil,                default: "01-01-1753 00:00:00.123"
-    if connection_dblib_73?
+    if connection_tds_73
       assert_line :datetime2_7,     type: "datetime",                    precision: 7,                  default: "12-31-9999 23:59:59.9999999"
       assert_line :datetime2_3,     type: "datetime",                    precision: 3
       assert_line :datetime2_1,     type: "datetime",                    precision: 1
     end
     assert_line :smalldatetime,     type: "smalldatetime",                                              default: "01-01-1901 15:45:00.0"
-    if connection_dblib_73?
+    if connection_tds_73
       assert_line :time_7,          type: "time",                        precision: 7,                  default: "04:20:00.2883215"
       assert_line :time_2,          type: "time",                        precision: 2
       assert_line :time_default,    type: "time",                        precision: 7,                  default: "15:03:42.0621978"

data/test/cases/transaction_test_sqlserver.rb

@@ -42,6 +42,9 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
     after_level = connection.user_options_isolation_level
     _(in_level).must_match %r{serializable}i
     _(after_level).must_match %r{read committed}i
+  ensure
+    # Reset all connections. Otherwise, the next test may fail with error 'DBPROCESS is dead or not enabled'. Not sure why.
+    ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
   end
 
   it "can use an isolation level and reverts back to starting isolation level under exceptions" do
@@ -50,20 +53,16 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
       Ship.transaction(isolation: :serializable) { Ship.create! }
     }).must_raise(ActiveRecord::RecordInvalid)
     _(connection.user_options_isolation_level).must_match %r{read committed}i
+  ensure
+    # Reset all connections. Otherwise, the next test may fail with error 'DBPROCESS is dead or not enabled'. Not sure why.
+    ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
   end
 
   describe "when READ_COMMITTED_SNAPSHOT is set" do
-    before do
+    it "should use READ COMMITTED as an isolation level" 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
@@ -74,6 +73,12 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
       # "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"
+    ensure
+      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"
+
+      # Reset all connections. Otherwise, the next test may fail with error 'DBPROCESS is dead or not enabled'. Not sure why.
+      ActiveRecord::Base.connection_handler.clear_all_connections!(:all)
     end
   end
 

data/test/config.yml

@@ -1,7 +1,6 @@
 
 default_connection_info: &default_connection_info
   adapter: sqlserver
-  mode: <%= ENV['ARCONN'] || 'dblib' %>
   host: <%= ENV['ACTIVERECORD_UNITTEST_HOST'] || 'localhost' %>
   port: <%= ENV['ACTIVERECORD_UNITTEST_PORT'] %>
   database: activerecord_unittest
@@ -12,7 +11,7 @@ default_connection_info: &default_connection_info
 
 connections:
 
-  dblib:
+  sqlserver:
     arunit:
       <<: *default_connection_info
       appname: SQLServerAdptrUnit

data/test/support/connection_reflection.rb

@@ -12,16 +12,10 @@ module ARTest
       end
 
       def connection_options
-        connection.instance_variable_get :@connection_options
+        connection.instance_variable_get :@connection_parameters
       end
 
-      def connection_dblib?
-        connection_options[:mode] == :dblib
-      end
-
-      def connection_dblib_73?
-        return false unless connection_dblib?
-
+      def connection_tds_73
         rc = connection.raw_connection
         rc.respond_to?(:tds_73?) && rc.tds_73?
       end

data/test/support/core_ext/query_cache.rb

@@ -22,7 +22,13 @@ module SqlIgnoredCache
   # compromising cache outside tests.
   def cache_sql(sql, name, binds)
     result = super
-    @query_cache.delete_if { |k, v| k =~ Regexp.union(IGNORED_SQL) }
+    
+    @query_cache.delete_if do |cache_key, _v|
+      # Query cache key generated by `sql` or `[sql, binds]`, so need to retrieve `sql` for both cases.
+      cache_key_sql = Array(cache_key).first
+      Regexp.union(IGNORED_SQL).match?(cache_key_sql)
+    end
+
     result
   end
 end

data/test/support/sql_counter_sqlserver.rb

@@ -10,20 +10,5 @@ module ARTest
         ActiveRecord::SQLCounter.log.dup
       end
     end
-
-    # TODO: Delete the code below after all Rails 6.1 tests passing.
-    #
-    # ignored_sql = [
-    #   /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
-    #   /sys.columns/i,
-    #   /SELECT @@version/,
-    #   /SELECT @@TRANCOUNT/,
-    #   /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
-    #   /SELECT CAST\(.* AS .*\) AS value/,
-    #   /SELECT DATABASEPROPERTYEX/im
-    # ]
-    #
-    # sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
-    # sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.5.1
+  version: 7.1.0.rc1
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -23,14 +23,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.1
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,7 @@ files:
 - appveyor.yml
 - docker-compose.ci.yml
 - guides/RELEASING.md
+- lib/active_record/connection_adapters/sqlserver/core_ext/abstract_adapter.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb
@@ -84,6 +85,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/database_tasks.rb
 - lib/active_record/connection_adapters/sqlserver/errors.rb
 - lib/active_record/connection_adapters/sqlserver/quoting.rb
+- lib/active_record/connection_adapters/sqlserver/savepoints.rb
 - lib/active_record/connection_adapters/sqlserver/schema_creation.rb
 - lib/active_record/connection_adapters/sqlserver/schema_dumper.rb
 - lib/active_record/connection_adapters/sqlserver/schema_statements.rb
@@ -221,6 +223,8 @@ files:
 - test/support/load_schema_sqlserver.rb
 - 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/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb
@@ -231,8 +235,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/v7.0.5.1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.5.1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.1.0.rc1/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -244,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.4.7
 signing_key:
@@ -336,6 +340,8 @@ test_files:
 - test/support/load_schema_sqlserver.rb
 - 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/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic.dump
+- test/support/marshal_compatibility_fixtures/SQLServer/rails_7_1_topic_associations.dump
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb