activerecord-sqlserver-adapter 6.1.2.1 → 7.2.4

data/test/support/query_assertions.rb

@@ -0,0 +1,49 @@
+module ARTest
+  module SQLServer
+    module QueryAssertions
+      def assert_queries_count(count = nil, include_schema: false, &block)
+        ActiveRecord::Base.lease_connection.materialize_transactions
+
+        counter = ActiveRecord::Assertions::QueryAssertions::SQLCounter.new
+        ActiveSupport::Notifications.subscribed(counter, "sql.active_record") do
+          result = _assert_nothing_raised_or_warn("assert_queries_count", &block)
+          queries = include_schema ? counter.log_all : counter.log
+
+          # Start of monkey-patch
+          queries = include_release_savepoint_placeholder_queries(queries)
+          # End of monkey-patch
+
+          if count
+            assert_equal count, queries.size, "#{queries.size} instead of #{count} queries were executed. Queries: #{queries.join("\n\n")}"
+          else
+            assert_operator queries.size, :>=, 1, "1 or more queries expected, but none were executed.#{queries.empty? ? '' : "\nQueries:\n#{queries.join("\n")}"}"
+          end
+          result
+        end
+      end
+
+      private
+
+      # Rails tests expect a save-point to be created and released. SQL Server does not release
+      # save-points and so the number of queries will be off. This monkey patch adds a placeholder queries
+      # to replace the missing save-point releases.
+      def include_release_savepoint_placeholder_queries(queries)
+        grouped_queries = [[]]
+
+        queries.each do |query|
+          if query =~ /SAVE TRANSACTION \S+/
+            grouped_queries << [query]
+          else
+            grouped_queries.last << query
+          end
+        end
+
+        grouped_queries.each do |group|
+          group.append "/* release savepoint placeholder for testing */" if group.first =~ /SAVE TRANSACTION \S+/
+        end
+
+        grouped_queries.flatten
+      end
+    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
 

data/test/support/table_definition_sqlserver.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      class TableDefinition < ::ActiveRecord::ConnectionAdapters::TableDefinition
+        # SQL Server supports precision of 38 for decimal columns. In Rails the test schema includes a column
+        # with a precision of 55. This is a problem for SQL Server 2008. This method will override the default
+        # decimal method to limit the precision to 38 for the :atoms_in_universe column.
+        # See https://github.com/rails/rails/pull/51826/files#diff-2a57b61bbf9ee2c23938fc571d403799f68b4b530d65e2cde219a429bbf10af5L876
+        def decimal(*names, **options)
+          throw "This 'decimal' method should only be used in a test environment." unless defined?(ActiveSupport::TestCase)
+
+          names.each do |name|
+            options_for_name = options.dup
+            options_for_name[:precision] = 38 if name == :atoms_in_universe && options_for_name[:precision].to_i == 55
+
+            column(name, :decimal, **options_for_name)
+          end
+        end
+      end
+    end
+  end
+end

data/test/support/test_in_memory_oltp.rb

@@ -8,10 +8,10 @@ if ENV["IN_MEMORY_OLTP"]
 
   ARTest.connect
 
-  if ActiveRecord::Base.connection.supports_in_memory_oltp?
+  if ActiveRecord::Base.lease_connection.supports_in_memory_oltp?
     puts "Configuring In-Memory OLTP..."
     inmem_file = ARTest::SQLServer.test_root_sqlserver, "schema", "enable-in-memory-oltp.sql"
     inmem_sql = File.read File.join(inmem_file)
-    ActiveRecord::Base.connection.execute(inmem_sql)
+    ActiveRecord::Base.lease_connection.execute(inmem_sql)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 6.1.2.1
+  version: 7.2.4
 platform: ruby
 authors:
 - Ken Collins
@@ -11,10 +11,11 @@ authors:
 - Shawn Balestracci
 - Joe Rafaniello
 - Tom Ward
+- Aidan Haran
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +23,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +53,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/boot.sh"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/docker-compose.yml"
 - ".editorconfig"
 - ".github/issue_template.md"
 - ".github/workflows/ci.yml"
@@ -71,6 +76,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
@@ -83,6 +89,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
@@ -132,7 +139,6 @@ files:
 - lib/active_record/connection_adapters/sqlserver/version.rb
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/active_record/connection_adapters/sqlserver_column.rb
-- lib/active_record/sqlserver_base.rb
 - lib/active_record/tasks/sqlserver_database_tasks.rb
 - lib/activerecord-sqlserver-adapter.rb
 - lib/arel/visitors/sqlserver.rb
@@ -142,13 +148,17 @@ files:
 - test/bin/install-freetds.sh
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
+- test/cases/active_schema_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/change_column_collation_test_sqlserver.rb
 - test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
+- test/cases/dbconsole.rb
 - test/cases/disconnected_test_sqlserver.rb
+- test/cases/eager_load_too_many_ids_test_sqlserver.rb
+- test/cases/enum_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -165,19 +175,20 @@ files:
 - test/cases/rake_test_sqlserver.rb
 - test/cases/schema_dumper_test_sqlserver.rb
 - test/cases/schema_test_sqlserver.rb
-- test/cases/scratchpad_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
+- test/cases/view_test_sqlserver.rb
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
+- test/models/sqlserver/alien.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb
@@ -199,6 +210,7 @@ files:
 - test/models/sqlserver/string_default.rb
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
+- test/models/sqlserver/table_with_spaces.rb
 - test/models/sqlserver/tinyint_pk.rb
 - test/models/sqlserver/trigger.rb
 - test/models/sqlserver/trigger_history.rb
@@ -212,20 +224,23 @@ 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/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/query_assertions.rb
 - test/support/rake_helpers.rb
-- test/support/sql_counter_sqlserver.rb
+- test/support/table_definition_sqlserver.rb
 - test/support/test_in_memory_oltp.rb
 homepage: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 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.2.1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v6.1.2.1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.2.4/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.2.4
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -234,14 +249,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
@@ -251,13 +266,17 @@ test_files:
 - test/bin/install-freetds.sh
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
+- test/cases/active_schema_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/change_column_collation_test_sqlserver.rb
 - test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
+- test/cases/dbconsole.rb
 - test/cases/disconnected_test_sqlserver.rb
+- test/cases/eager_load_too_many_ids_test_sqlserver.rb
+- test/cases/enum_test_sqlserver.rb
 - test/cases/execute_procedure_test_sqlserver.rb
 - test/cases/fetch_test_sqlserver.rb
 - test/cases/fully_qualified_identifier_test_sqlserver.rb
@@ -274,19 +293,20 @@ test_files:
 - test/cases/rake_test_sqlserver.rb
 - test/cases/schema_dumper_test_sqlserver.rb
 - test/cases/schema_test_sqlserver.rb
-- test/cases/scratchpad_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
+- test/cases/view_test_sqlserver.rb
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
+- test/models/sqlserver/alien.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb
@@ -308,6 +328,7 @@ test_files:
 - test/models/sqlserver/string_default.rb
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
+- test/models/sqlserver/table_with_spaces.rb
 - test/models/sqlserver/tinyint_pk.rb
 - test/models/sqlserver/trigger.rb
 - test/models/sqlserver/trigger_history.rb
@@ -321,10 +342,13 @@ 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/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/query_assertions.rb
 - test/support/rake_helpers.rb
-- test/support/sql_counter_sqlserver.rb
+- test/support/table_definition_sqlserver.rb
 - test/support/test_in_memory_oltp.rb

data/lib/active_record/sqlserver_base.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecord
-  module ConnectionHandling
-    def sqlserver_connection(config) #:nodoc:
-      config = config.symbolize_keys
-      config.reverse_merge!(mode: :dblib)
-      config[:mode] = config[:mode].to_s.downcase.underscore.to_sym
-
-      ConnectionAdapters::SQLServerAdapter.new(
-        ConnectionAdapters::SQLServerAdapter.new_client(config),
-        logger,
-        nil,
-        config
-        )
-    end
-  end
-end

data/test/cases/scratchpad_test_sqlserver.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "cases/helper_sqlserver"
-
-class ScratchpadTestSQLServer < ActiveRecord::TestCase
-  it "helps debug things" do
-  end
-end

data/test/support/sql_counter_sqlserver.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module ARTest
-  module SQLServer
-    module SqlCounterSqlserver
-      # Only return the log vs. log_all
-      def capture_sql_ss
-        ActiveRecord::SQLCounter.clear_log
-        yield
-        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