activerecord-sqlserver-adapter 7.1.0.beta1 → 7.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009fdf722e06ca141f900257d1980016e76edc153d5af717d5f15ae6792ea4d4'
-  data.tar.gz: 292f605553c6bfbfc357efc6c9e26fca3be1414921d8a4b810ccd17ce46f4e88
+  metadata.gz: ddd1e2bb81c9a6675d4a8f561c585869b0fafb6ecfe3c513e7e69d8bc3646d9f
+  data.tar.gz: 0d669eaaa14be843acc19cc887c47a3f8eecfb3552e8477a062df688d9ef1172
 SHA512:
-  metadata.gz: a2c2363f6445554a6067f15ca1467130dfe4499513746e2a1d374c2e27635d68f0eb5c1682cc49621c101c31531723f66c5670e1d73d89b798cb6eda90d52f39
-  data.tar.gz: a788af6fbd28c02f0ab1e9d6283f4a11934f9bb702d93a7428d0d1e37aed4cb9e72f9fba4f4e21c18057b789204a9bfd0cc353b988f1751c8e65689ec8b4b686
+  metadata.gz: 879aeb90caaef5bb0218651407ec5a978d4a62d51682e92d55fbda2d3eed2fd37e8348e72aa8c4c92cab856c8eebc2fa4bf1c2166ad13d99c983f1310d3b66ab
+  data.tar.gz: 15030862f3ae2044dd780a62f4a8868dc383cd6e9775fcedff214b1429bdbf2881be503e670cf2cbcfcbe92c0583c2a89d53f30ddd988a5425649ff29ef2c971

data/CHANGELOG.md

@@ -1,9 +1,51 @@
-## v7.1.0.beta1
+## v7.1.0.rc2
 
-#### Changed
+#### Added
+
+- [#1136](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1136) Prevent marking broken connections as verified
+- [#1138](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1138) Cache quoted names
 
-#### Fixed
+## v7.1.0.rc1
 
 #### Added
 
+* Rails 7.1 Support
+
+  The adapter supports new Rails 7.1 features such as composite primary keys. See the
+  [Rails 7.1 release notes](https://guides.rubyonrails.org/7_1_release_notes.html) for more information.
+
+#### Changed
+
+* Configure Connection
+
+  If you require additional connection configuration you now need to call `super` within the `configure_connection`
+  method so that the default configuration is also applied.
+
+  v7.1.x adapter:
+  ```ruby
+  module ActiveRecord
+    module ConnectionAdapters
+      class SQLServerAdapter < AbstractAdapter
+        def configure_connection
+          super
+          raw_connection_do "SET TEXTSIZE #{64.megabytes}"
+        end
+      end
+    end
+  end
+  ```
+
+  v7.0.x adapter:
+  ```ruby
+  module ActiveRecord
+    module ConnectionAdapters
+      class SQLServerAdapter < AbstractAdapter
+        def configure_connection
+          raw_connection_do "SET TEXTSIZE #{64.megabytes}"
+        end
+      end
+    end
+  end
+  ```
+
 Please check [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/7-0-stable/CHANGELOG.md) for previous changes.

data/README.md

@@ -13,10 +13,10 @@ Interested in older versions? We follow a rational versioning policy that tracks
 
 | Adapter Version | Rails Version | Support        | Branch                                                                                          |
 |-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
-| `v7.1.0.beta1`  | `7.1.0`       | In development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)       |
-| `7.0.4.0`       | `7.0.x`       | Active         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
-| `6.1.2.1`       | `6.1.x`       | Active         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
-| `6.0.3`         | `6.0.x`       | Active         | [6-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
+| `7.1.0.rc2`    | `7.1.x`       | In development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)       |
+| `7.0.5.1`       | `7.0.x`       | Active         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
+| `6.1.3.0`       | `6.1.x`       | Active         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
+| `6.0.3`         | `6.0.x`       | Ended          | [6-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
 | `5.2.1`         | `5.2.x`       | Ended          | [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |
 | `5.1.6`         | `5.1.x`       | Ended          | [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable) |
 | `4.2.18`        | `4.2.x`       | Ended          | [4-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable) |

data/RUNNING_UNIT_TESTS.md

@@ -13,12 +13,12 @@ Default testing uses DBLIB with TinyTDS.
 
 * Setup two databases in SQL Server, [activerecord_unittest] and [activerecord_unittest2]
 * Create a [rails] user with an empty password and give it a [db_owner] role to both DBs. Some tests require a server role of [sysadmin] too. More details below with DDL SQL examples.
-* $ bundle install
-* $ bundle exec rake test ACTIVERECORD_UNITTEST_HOST='my.db.net'
+* `bundle install`
+* `bundle exec rake test ACTIVERECORD_UNITTEST_HOST='my.db.net'`
 
 Focusing tests. Use the `ONLY_` env vars to run either ours or the ActiveRecord cases. Use the `TEST_FILES` env variants to focus on specific test(s), use commas for multiple cases. Note, you have to use different env vars to focus only on ours or a core ActiveRecord case. There may be failures when focusing on an ActiveRecord case since our coereced test files is not loaded in this scenerio.
 
-```
+```console
 $ bundle exec rake test ONLY_SQLSERVER=1
 $ bundle exec rake test ONLY_ACTIVERECORD=1
 
@@ -49,13 +49,13 @@ GO
 
 The tests of this adapter depend on the existence of the Rails which are automatically cloned for you with bundler. However you can clone Rails from git://github.com/rails/rails.git and set the `RAILS_SOURCE` environment variable so bundler will use another local path instead.
 
-```
+```console
 $ git clone git://github.com/rails-sqlserver/activerecord-sqlserver-adapter.git
 ```
 
 Suggest just letting bundler do all the work and assuming there is a git tag for the Rails version, you can set `RAILS_VERSION` before bundling.
 
-```
+```console
 $ export RAILS_VERSION='4.2.0'
 $ bundle install
 ```
@@ -65,20 +65,20 @@ $ bundle install
 
 Please consult the `test/config.yml` file which is used to parse the configuration options for the DB connections when running tests. This file has overrides for any connection mode that you can set using simple environment variables. Assuming you are using FreeTDS 0.91 and above
 
-```
+```console
 $ export ACTIVERECORD_UNITTEST_HOST='my.db.net'   # Defaults to localhost
 $ export ACTIVERECORD_UNITTEST_PORT='1533'        # Defaults to 1433
 ```
 
 If you have FreeTDS installed and/or want to use a named dataserver in your freetds.conf file
 
-```
+```console
 $ export ACTIVERECORD_UNITTEST_DATASERVER='mydbname'
 ```
 
 These can be passed down to rake too.
 
-```
+```console
 $ bundle exec rake test ACTIVERECORD_UNITTEST_HOST='my.db.net'
 ```
 
@@ -87,16 +87,30 @@ $ bundle exec rake test ACTIVERECORD_UNITTEST_HOST='my.db.net'
 
 Now with that out of the way you can run "bundle install" to hook everything up. Our tests use bundler to setup the load paths correctly. The default mode is DBLIB using TinyTDS. It is important to use bundle exec so we can wire up the ActiveRecord test libs correctly.
 
-```
+```console
 $ bundle exec rake test
 ```
 
 
 ## Testing Options
 
-
 By default, Bundler will download the Rails git repo and use the git tag that matches the dependency version in our gemspec. If you want to test another version of Rails, you can either temporarily change the :tag for Rails in the Gemfile. Likewise, you can clone the Rails repo your self to another directory and use the `RAILS_SOURCE` environment variable.
 
+```console
+$ RAILS_SOURCE='/vagrant/rails' bundle exec rake test
+```
+
+If you want to use a specific seed for the tests use the `TESTOPTS` env variable like:
+
+```console
+$ bundle exec rake test TESTOPTS="--seed=45250"
+```
+
+And to make the tests fail-fast use:
+
+```console
+$ bundle exec rake test TESTOPTS="-f"
+```
 
 ## Troubleshooting
 

data/VERSION

@@ -1 +1 @@
-7.1.0.beta1
+7.1.0.rc2

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

@@ -23,6 +23,7 @@ module ActiveRecord
                        else
                          internal_raw_execute(sql, conn, perform_do: true)
                        end
+              verified!
             end
           end
 
@@ -43,28 +44,27 @@ module ActiveRecord
 
           log(sql, name, binds, async: async) do
             with_raw_connection do |conn|
-              begin
-                options = { ar_result: true }
-
-                # TODO: Look into refactoring this.
-                if id_insert_table_name = query_requires_identity_insert?(sql)
-                  with_identity_insert_enabled(id_insert_table_name, conn) do
-                    handle = internal_raw_execute(sql, conn)
-                    result = handle_to_names_and_values(handle, options)
-                  end
-                else
-                  handle = internal_raw_execute(sql, conn)
-                  result = handle_to_names_and_values(handle, options)
+              if id_insert_table_name = query_requires_identity_insert?(sql)
+                with_identity_insert_enabled(id_insert_table_name, conn) do
+                  result = internal_exec_sql_query(sql, conn)
                 end
-              ensure
-                finish_statement_handle(handle)
+              else
+                result = internal_exec_sql_query(sql, conn)
               end
+              verified!
             end
           end
 
           result
         end
 
+        def internal_exec_sql_query(sql, conn)
+          handle = internal_raw_execute(sql, conn)
+          handle_to_names_and_values(handle, ar_result: true)
+        ensure
+          finish_statement_handle(handle)
+        end
+
         def exec_delete(sql, name, binds)
           sql = sql.dup << "; SELECT @@ROWCOUNT AS AffectedRows"
           super(sql, name, binds).rows.first.first
@@ -177,6 +177,7 @@ module ActiveRecord
           log(sql, "Execute Procedure") do
             with_raw_connection do |conn|
               result = internal_raw_execute(sql, conn)
+              verified!
               options = { as: :hash, cache_rows: true, timezone: ActiveRecord.default_timezone || :utc }
 
               result.each(options) do |row|
@@ -400,10 +401,9 @@ module ActiveRecord
 
         # === SQLServer Specific (Selecting) ============================ #
 
-        def _raw_select(sql, conn, options = {})
+        def _raw_select(sql, conn)
           handle = internal_raw_execute(sql, conn)
-
-          handle_to_names_and_values(handle, options)
+          handle_to_names_and_values(handle, fetch: :rows)
         ensure
           finish_statement_handle(handle)
         end

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

@@ -4,18 +4,18 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Quoting
-        QUOTED_TRUE  = "1".freeze
-        QUOTED_FALSE = "0".freeze
-        QUOTED_STRING_PREFIX = "N".freeze
+        QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
+        QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
 
         def fetch_type_metadata(sql_type, sqlserver_options = {})
           cast_type = lookup_cast_type(sql_type)
+
           simple_type = SqlTypeMetadata.new(
-            sql_type: sql_type,
-            type: cast_type.type,
-            limit: cast_type.limit,
+            sql_type:  sql_type,
+            type:      cast_type.type,
+            limit:     cast_type.limit,
             precision: cast_type.precision,
-            scale: cast_type.scale
+            scale:     cast_type.scale
           )
 
           SQLServer::TypeMetadata.new(simple_type, **sqlserver_options)
@@ -34,7 +34,11 @@ module ActiveRecord
         end
 
         def quote_column_name(name)
-          SQLServer::Utils.extract_identifiers(name).quoted
+          QUOTED_COLUMN_NAMES[name] ||= SQLServer::Utils.extract_identifiers(name).quoted
+        end
+
+        def quote_table_name(name)
+          QUOTED_TABLE_NAMES[name] ||= SQLServer::Utils.extract_identifiers(name).quoted
         end
 
         def quote_default_expression(value, column)
@@ -47,7 +51,7 @@ module ActiveRecord
         end
 
         def quoted_true
-          QUOTED_TRUE
+          '1'
         end
 
         def unquoted_true
@@ -55,7 +59,7 @@ module ActiveRecord
         end
 
         def quoted_false
-          QUOTED_FALSE
+          '0'
         end
 
         def unquoted_false
@@ -117,7 +121,7 @@ module ActiveRecord
           when ActiveRecord::Type::SQLServer::Data
             value.quoted
           when String, ActiveSupport::Multibyte::Chars
-            "#{QUOTED_STRING_PREFIX}#{super}"
+            "N#{super}"
           else
             super
           end

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

@@ -640,17 +640,19 @@ module ActiveRecord
             identifier = SQLServer::Utils.extract_identifiers(table_name)
             information_query_table = identifier.database.present? ? "[#{identifier.database}].[INFORMATION_SCHEMA].[VIEWS]" :  "[INFORMATION_SCHEMA].[VIEWS]"
             view_info = select_one "SELECT * FROM #{information_query_table} WITH (NOLOCK) WHERE TABLE_NAME = #{quote(identifier.object)}", "SCHEMA"
+
             if view_info
               view_info = view_info.with_indifferent_access
               if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
                 view_info[:VIEW_DEFINITION] = begin
-                  select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
+                                                select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
                                               rescue
                                                 warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
                                                 nil
-                end
+                                              end
               end
             end
+
             view_info
           end
         end
@@ -659,7 +661,8 @@ module ActiveRecord
           view_definition = view_information(table_name)[:VIEW_DEFINITION]
           return column_name unless view_definition
 
-          match_data = view_definition.match(/CREATE\s+VIEW.*AS\s+SELECT.*\W([\w-]*)\s+AS\s+#{column_name}/im)
+          # Remove "CREATE VIEW ... AS SELECT ..." and then match the column name.
+          match_data = view_definition.sub(/CREATE\s+VIEW.*AS\s+SELECT\s/, '').match(/([\w-]*)\s+AS\s+#{column_name}\W/im)
           match_data ? match_data[1] : column_name
         end
 

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

@@ -6,13 +6,9 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Utils
-        QUOTED_STRING_PREFIX = "N"
-
         # Value object to return identifiers from SQL Server names http://bit.ly/1CZ3EiL
         # Inspired from Rails PostgreSQL::Name adapter object in their own Utils.
-        #
         class Name
-          SEPARATOR = "."
           UNQUOTED_SCANNER = /\]?\./
           QUOTED_SCANNER   = /\A\[.*?\]\./
           QUOTED_CHECKER   = /\A\[/
@@ -42,7 +38,7 @@ module ActiveRecord
           end
 
           def fully_qualified_database_quoted
-            [server_quoted, database_quoted].compact.join(SEPARATOR)
+            [server_quoted, database_quoted].compact.join('.')
           end
 
           def fully_qualified?
@@ -69,7 +65,7 @@ module ActiveRecord
           end
 
           def quoted
-            parts.map { |p| quote(p) if p }.join SEPARATOR
+            parts.map { |p| quote(p) if p }.join('.')
           end
 
           def quoted_raw
@@ -132,7 +128,7 @@ module ActiveRecord
         extend self
 
         def quote_string(s)
-          s.to_s.gsub /\'/, "''"
+          s.to_s.gsub(/\'/, "''")
         end
 
         def quote_string_single(s)
@@ -140,7 +136,7 @@ module ActiveRecord
         end
 
         def quote_string_single_national(s)
-          "#{QUOTED_STRING_PREFIX}'#{quote_string(s)}'"
+          "N'#{quote_string(s)}'"
         end
 
         def quoted_raw(name)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -501,7 +501,7 @@ module ActiveRecord
       end
 
       def sqlserver_version
-        @sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection, fetch: :rows).first.first.to_s
+        @sqlserver_version ||= _raw_select("SELECT @@version", @raw_connection).first.first.to_s
       end
 
       private
@@ -526,7 +526,7 @@ module ActiveRecord
         @raw_connection.execute("SET TEXTSIZE 2147483647").do
         @raw_connection.execute("SET CONCAT_NULL_YIELDS_NULL ON").do
 
-        @spid = _raw_select("SELECT @@SPID", @raw_connection, fetch: :rows).first.first
+        @spid = _raw_select("SELECT @@SPID", @raw_connection).first.first
 
         initialize_dateformatter
         use_database

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -53,7 +53,7 @@ module ActiveRecord
       end
 
       def clear_active_connections!
-        ActiveRecord::Base.connection_handler.clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
       end
 
       def structure_dump(filename, extra_flags)

data/lib/arel/visitors/sqlserver.rb

@@ -64,6 +64,38 @@ module Arel
         super
       end
 
+      def visit_Arel_Nodes_HomogeneousIn(o, collector)
+        collector.preparable = false
+
+        visit o.left, collector
+
+        if o.type == :in
+          collector << " IN ("
+        else
+          collector << " NOT IN ("
+        end
+
+        values = o.casted_values
+
+        # Monkey-patch start.
+        column_name = o.attribute.name
+        column_type = o.attribute.relation.type_for_attribute(column_name)
+        column_type = column_type.cast_type if column_type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType) # Use cast_type on encrypted attributes. Don't encrypt them again
+
+        if values.empty?
+          collector << @connection.quote(nil)
+        elsif @connection.prepared_statements && !column_type.serialized?
+          # Add query attribute bindings rather than just values.
+          attrs = values.map { |value| ActiveRecord::Relation::QueryAttribute.new(column_name, value, column_type) }
+          collector.add_binds(attrs, &bind_block)
+        else
+          collector.add_binds(values, o.proc_for_binds, &bind_block)
+        end
+        # Monkey-patch end.
+
+        collector << ")"
+      end
+
       def visit_Arel_Nodes_SelectStatement(o, collector)
         @select_statement = o
         distinct_One_As_One_Is_So_Not_Fetch o

data/test/cases/coerced_tests.rb

@@ -923,34 +923,6 @@ class DefaultScopingTest < ActiveRecord::TestCase
   coerce_tests! :test_order_in_default_scope_should_not_prevail
 end
 
-require "models/post"
-require "models/subscriber"
-class EachTest < ActiveRecord::TestCase
-  # Quoting in tests does not cope with bracket quoting.
-  # TODO: Remove coerced test when https://github.com/rails/rails/pull/49269 merged.
-  coerce_tests! :test_in_batches_no_subqueries_for_whole_tables_batching
-  def test_in_batches_no_subqueries_for_whole_tables_batching_coerced
-    c = Post.connection
-    quoted_posts_id = Regexp.escape(c.quote_table_name("posts.id"))
-    assert_sql(/DELETE FROM #{Regexp.escape(c.quote_table_name("posts"))} WHERE #{quoted_posts_id} > .+ AND #{quoted_posts_id} <=/i) do
-      Post.in_batches(of: 2).delete_all
-    end
-  end
-
-  # Quoting in tests does not cope with bracket quoting.
-  # TODO: Remove coerced test when https://github.com/rails/rails/pull/49269 merged.
-  coerce_tests! :test_in_batches_should_quote_batch_order
-  def test_in_batches_should_quote_batch_order_coerced
-    c = Post.connection
-    assert_sql(/ORDER BY #{Regexp.escape(c.quote_table_name('posts'))}\.#{Regexp.escape(c.quote_column_name('id'))}/) do
-      Post.in_batches(of: 1) do |relation|
-        assert_kind_of ActiveRecord::Relation, relation
-        assert_kind_of Post, relation.first
-      end
-    end
-  end
-end
-
 class EagerAssociationTest < ActiveRecord::TestCase
   # Use LEN() instead of LENGTH() function.
   coerce_tests! :test_count_with_include
@@ -2293,16 +2265,6 @@ class LogSubscriberTest < ActiveRecord::TestCase
   end
 end
 
-# TODO: Method `reset_column_information` does not exist. Comment out the test for the time being.
-# class ActiveRecordSchemaTest < ActiveRecord::TestCase
-#   # Workaround for randomly failing test.
-#   coerce_tests! :test_has_primary_key
-#   def test_has_primary_key_coerced
-#     @schema_migration.reset_column_information
-#     original_test_has_primary_key
-#   end
-# end
-
 class ReloadModelsTest < ActiveRecord::TestCase
   # Skip test on Windows. The number of arguments passed to `IO.popen` in
   # `activesupport/lib/active_support/testing/isolation.rb` exceeds what Windows can handle.
@@ -2533,37 +2495,6 @@ class InsertAllTest < ActiveRecord::TestCase
   end
 end
 
-class HasOneThroughDisableJoinsAssociationsTest < ActiveRecord::TestCase
-  # TODO: Remove coerce after Rails 7.1.0 (see https://github.com/rails/rails/pull/44051)
-  coerce_tests! :test_disable_joins_through_with_enum_type
-  def test_disable_joins_through_with_enum_type_coerced
-    joins = capture_sql { @member.club }
-    no_joins = capture_sql { @member.club_without_joins }
-
-    assert_equal 1, joins.size
-    assert_equal 2, no_joins.size
-
-    assert_match(/INNER JOIN/, joins.first)
-    no_joins.each do |nj|
-      assert_no_match(/INNER JOIN/, nj)
-    end
-
-    assert_match(/\[memberships\]\.\[type\]/, no_joins.first)
-  end
-end
-
-class ActiveRecord::Encryption::EncryptableRecordTest < ActiveRecord::EncryptionTestCase
-  # TODO: Remove coerce after Rails 7.1.0 (see https://github.com/rails/rails/pull/44052)
-  # Same as original but SQL Server string is varchar(4000), not varchar(255) as other adapters. Produce invalid strings with 4001 characters
-  coerce_tests! %r{validate column sizes}
-  test "validate column sizes coerced" do
-    assert EncryptedAuthor.new(name: "jorge").valid?
-    assert_not EncryptedAuthor.new(name: "a" * 4001).valid?
-    author = EncryptedAuthor.create(name: "a" * 4001)
-    assert_not author.valid?
-  end
-end
-
 module ActiveRecord
   class Migration
     class InvalidOptionsTest < ActiveRecord::TestCase
@@ -2654,8 +2585,3 @@ module ActiveRecord
     end
   end
 end
-
-# TODO: Need to uncoerce the 'SerializedAttributeTest' tests before releasing adapter for Rails 7.1
-class SerializedAttributeTest < ActiveRecord::TestCase
-  coerce_all_tests!
-end

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/cases/view_test_sqlserver.rb

@@ -9,18 +9,20 @@ class ViewTestSQLServer < ActiveRecord::TestCase
     before do
       connection.drop_table :view_casing_table rescue nil
       connection.create_table :view_casing_table, force: true do |t|
-        t.boolean :Default_Falsey, null: false, default: false
-        t.boolean :Default_Truthy, null: false, default: true
-        t.string  :default_string, null: false, default: "abc"
+        t.boolean :Default_Falsey,      null: false, default: false
+        t.boolean :Default_Truthy,      null: false, default: true
+        t.string  :default_string_null, null: true,  default: nil
+        t.string  :default_string,      null: false, default: "abc"
       end
 
       connection.execute("DROP VIEW IF EXISTS view_casing_table_view;")
       connection.execute <<-SQL
         CREATE VIEW view_casing_table_view AS
               SELECT id AS id,
-                     default_falsey AS falsey,
-                     default_truthy AS truthy,
-                     default_string AS s
+                     default_falsey      AS falsey,
+                     default_truthy      AS truthy,
+                     default_string_null AS s_null,
+                     default_string      AS s
               FROM view_casing_table
       SQL
     end
@@ -34,12 +36,14 @@ class ViewTestSQLServer < ActiveRecord::TestCase
       assert_equal false, obj.falsey
       assert_equal true, obj.truthy
       assert_equal "abc", obj.s
+      assert_nil   obj.s_null
       assert_equal 0, klass.count
 
       obj.save!
       assert_equal false, obj.falsey
       assert_equal true, obj.truthy
       assert_equal "abc", obj.s
+      assert_nil   obj.s_null
       assert_equal 1, klass.count
     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.1.0.beta1
+  version: 7.1.0.rc2
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -235,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.1.0.beta1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0.beta1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.1.0.rc2/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: