activerecord-sqlserver-adapter 5.2.1 → 7.0.0.0

data/test/support/paths_sqlserver.rb

@@ -1,30 +1,31 @@
+# frozen_string_literal: true
+
 module ARTest
   module SQLServer
-
     extend self
 
     def root_sqlserver
-      File.expand_path File.join(File.dirname(__FILE__), '..', '..')
+      File.expand_path File.join(File.dirname(__FILE__), "..", "..")
     end
 
     def test_root_sqlserver
-      File.join root_sqlserver, 'test'
+      File.join root_sqlserver, "test"
     end
 
     def root_activerecord
-      File.join Gem.loaded_specs['rails'].full_gem_path, 'activerecord'
+      File.join Gem.loaded_specs["rails"].full_gem_path, "activerecord"
     end
 
     def root_activerecord_lib
-      File.join root_activerecord, 'lib'
+      File.join root_activerecord, "lib"
     end
 
     def root_activerecord_test
-      File.join root_activerecord, 'test'
+      File.join root_activerecord, "test"
     end
 
     def test_load_paths
-      ['lib', 'test', root_activerecord_lib, root_activerecord_test]
+      ["lib", "test", root_activerecord_lib, root_activerecord_test]
     end
 
     def add_to_load_paths!
@@ -32,17 +33,16 @@ module ARTest
     end
 
     def migrations_root
-      File.join test_root_sqlserver, 'migrations'
+      File.join test_root_sqlserver, "migrations"
     end
 
     def arconfig_file
-      File.join test_root_sqlserver, 'config.yml'
+      File.join test_root_sqlserver, "config.yml"
     end
 
     def arconfig_file_env!
-      ENV['ARCONFIG'] = arconfig_file
+      ENV["ARCONFIG"] = arconfig_file
     end
-
   end
 end
 

data/test/support/rake_helpers.rb

@@ -1,28 +1,33 @@
+# frozen_string_literal: true
 
-SQLSERVER_HELPER = 'test/cases/helper_sqlserver.rb'
-SQLSERVER_COERCED = 'test/cases/coerced_tests.rb'
+SQLSERVER_HELPER = "test/cases/helper_sqlserver.rb"
+SQLSERVER_COERCED = "test/cases/coerced_tests.rb"
 
 def env_ar_test_files
-  return unless ENV['TEST_FILES_AR'] && !ENV['TEST_FILES_AR'].empty?
+  return unless ENV["TEST_FILES_AR"] && !ENV["TEST_FILES_AR"].empty?
+
   @env_ar_test_files ||= begin
-    ENV['TEST_FILES_AR'].split(',').map { |file|
+    ENV["TEST_FILES_AR"].split(",").map { |file|
       File.join ARTest::SQLServer.root_activerecord, file.strip
     }.sort
   end
 end
 
 def env_test_files
-  return unless ENV['TEST_FILES'] && !ENV['TEST_FILES'].empty?
-  @env_test_files ||= ENV['TEST_FILES'].split(',').map(&:strip)
+  return unless ENV["TEST_FILES"] && !ENV["TEST_FILES"].empty?
+
+  @env_test_files ||= ENV["TEST_FILES"].split(",").map(&:strip)
 end
 
 def sqlserver_cases
-  @sqlserver_cases ||= Dir.glob('test/cases/*_test_sqlserver.rb')
+  @sqlserver_cases ||= Dir.glob("test/cases/*_test_sqlserver.rb")
 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
 
@@ -31,9 +36,9 @@ def test_files
     [SQLSERVER_HELPER] + env_ar_test_files
   elsif env_test_files
     env_test_files
-  elsif ENV['ONLY_SQLSERVER']
+  elsif ENV["ONLY_SQLSERVER"]
     sqlserver_cases
-  elsif ENV['ONLY_ACTIVERECORD']
+  elsif ENV["ONLY_ACTIVERECORD"]
     [SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED])
   else
     [SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED] + sqlserver_cases)

data/test/support/sql_counter_sqlserver.rb

@@ -1,28 +1,29 @@
+# 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
 
-    ignored_sql = [
-      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
-      /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))
-
+    # 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

data/test/support/test_in_memory_oltp.rb

@@ -1,14 +1,16 @@
-if ENV['IN_MEMORY_OLTP']
-  require 'config'
-  require 'active_record'
-  require 'support/config'
-  require 'support/connection'
+# frozen_string_literal: true
+
+if ENV["IN_MEMORY_OLTP"]
+  require "config"
+  require "active_record"
+  require "support/config"
+  require "support/connection"
 
   ARTest.connect
 
   if ActiveRecord::Base.connection.supports_in_memory_oltp?
-    puts 'Configuring In-Memory OLTP...'
-    inmem_file = ARTest::SQLServer.test_root_sqlserver, 'schema', 'enable-in-memory-oltp.sql'
+    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)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 7.0.0.0
 platform: ruby
 authors:
 - Ken Collins
@@ -11,10 +11,10 @@ authors:
 - Shawn Balestracci
 - Joe Rafaniello
 - Tom Ward
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
@@ -52,11 +52,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".github/issue_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Dockerfile
+- Dockerfile.ci
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -67,13 +70,14 @@ files:
 - activerecord-sqlserver-adapter.gemspec
 - appveyor.yml
 - docker-compose.ci.yml
+- guides/RELEASING.md
 - 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
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
 - 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/query_methods.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/preloader.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
@@ -99,6 +103,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/type/datetime2.rb
 - lib/active_record/connection_adapters/sqlserver/type/datetimeoffset.rb
 - lib/active_record/connection_adapters/sqlserver/type/decimal.rb
+- lib/active_record/connection_adapters/sqlserver/type/decimal_without_scale.rb
 - lib/active_record/connection_adapters/sqlserver/type/float.rb
 - lib/active_record/connection_adapters/sqlserver/type/integer.rb
 - lib/active_record/connection_adapters/sqlserver/type/json.rb
@@ -137,20 +142,28 @@ 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/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
 - test/cases/helper_sqlserver.rb
+- test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_test_sqlserver.rb
 - test/cases/json_test_sqlserver.rb
+- test/cases/lateral_test_sqlserver.rb
 - test/cases/migration_test_sqlserver.rb
+- test/cases/optimizer_hints_test_sqlserver.rb
 - test/cases/order_test_sqlserver.rb
 - test/cases/pessimistic_locking_test_sqlserver.rb
+- test/cases/primary_keys_test_sqlserver.rb
 - test/cases/rake_test_sqlserver.rb
 - test/cases/schema_dumper_test_sqlserver.rb
 - test/cases/schema_test_sqlserver.rb
@@ -164,9 +177,11 @@ files:
 - 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/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
@@ -182,6 +197,7 @@ files:
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.rb
 - test/models/sqlserver/sst_memory.rb
+- test/models/sqlserver/sst_string_collation.rb
 - test/models/sqlserver/string_default.rb
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
@@ -198,6 +214,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_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
@@ -206,8 +224,11 @@ files:
 homepage: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.0.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,15 +236,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files:
@@ -232,20 +253,28 @@ 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/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
 - test/cases/helper_sqlserver.rb
+- test/cases/in_clause_test_sqlserver.rb
 - test/cases/index_test_sqlserver.rb
 - test/cases/json_test_sqlserver.rb
+- test/cases/lateral_test_sqlserver.rb
 - test/cases/migration_test_sqlserver.rb
+- test/cases/optimizer_hints_test_sqlserver.rb
 - test/cases/order_test_sqlserver.rb
 - test/cases/pessimistic_locking_test_sqlserver.rb
+- test/cases/primary_keys_test_sqlserver.rb
 - test/cases/rake_test_sqlserver.rb
 - test/cases/schema_dumper_test_sqlserver.rb
 - test/cases/schema_test_sqlserver.rb
@@ -259,9 +288,11 @@ test_files:
 - 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/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
@@ -277,6 +308,7 @@ test_files:
 - test/models/sqlserver/quoted_view_1.rb
 - test/models/sqlserver/quoted_view_2.rb
 - test/models/sqlserver/sst_memory.rb
+- test/models/sqlserver/sst_string_collation.rb
 - test/models/sqlserver/string_default.rb
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
@@ -293,6 +325,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_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/.travis.yml

@@ -1,25 +0,0 @@
-sudo: required
-cache: bundler
-services:
-  - docker
-env:
-  global:
-    - COMPOSE_FILE: docker-compose.ci.yml
-before_install:
-  - sudo rm /usr/local/bin/docker-compose
-  - sudo curl -L "https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-  - sudo chmod +x /usr/local/bin/docker-compose
-install:
-  - docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION
-script:
-  - docker-compose run ci
-matrix:
-  include:
-    - name: 2.3.8
-      env: TARGET_VERSION=2.3.8
-    - name: 2.4.6
-      env: TARGET_VERSION=2.4.6
-    - name: 2.5.5
-      env: TARGET_VERSION=2.5.5
-    - name: 2.6.3
-      env: TARGET_VERSION=2.6.3

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

@@ -1,26 +0,0 @@
-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 6.
-          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