activerecord-sqlserver-adapter 5.2.1 → 6.0.2

data/RUNNING_UNIT_TESTS.md

@@ -3,6 +3,9 @@
 
 This process is much easier than it has been before!
 
+## MS SQL SERVER
+
+If you don't have easy access to MS SQL Server, you can set up a Vagrant/VirtualBox virtual machine with MS SQL Server. [Here's how](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter-dev-box).
 
 ## TL;DR
 

data/Rakefile

@@ -1,37 +1,35 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require_relative 'test/support/paths_sqlserver'
-require_relative 'test/support/rake_helpers'
+# frozen_string_literal: true
 
-task test: ['test:dblib']
+require "bundler/gem_tasks"
+require "rake/testtask"
+require_relative "test/support/paths_sqlserver"
+require_relative "test/support/rake_helpers"
+
+task test: ["test:dblib"]
 task default: [:test]
 
 namespace :test do
-
   %w(dblib).each do |mode|
-
     Rake::TestTask.new(mode) do |t|
       t.libs = ARTest::SQLServer.test_load_paths
       t.test_files = test_files
-      t.warning = !!ENV['WARNING']
+      t.warning = !!ENV["WARNING"]
       t.verbose = false
     end
-
   end
 
-  task 'dblib:env' do
-    ENV['ARCONN'] = 'dblib'
+  task "dblib:env" do
+    ENV["ARCONN"] = "dblib"
   end
-
 end
 
-task 'test:dblib' => 'test:dblib:env'
+task "test:dblib" => "test:dblib:env"
 
 namespace :profile do
-  ['dblib'].each do |mode|
+  ["dblib"].each do |mode|
     namespace mode.to_sym do
-      Dir.glob('test/profile/*_profile_case.rb').sort.each do |test_file|
-        profile_case = File.basename(test_file).sub('_profile_case.rb', '')
+      Dir.glob("test/profile/*_profile_case.rb").sort.each do |test_file|
+        profile_case = File.basename(test_file).sub("_profile_case.rb", "")
         Rake::TestTask.new(profile_case) do |t|
           t.libs = ARTest::SQLServer.test_load_paths
           t.test_files = [test_file]

data/VERSION

@@ -1 +1 @@
-5.2.1
+6.0.2

data/activerecord-sqlserver-adapter.gemspec

@@ -1,21 +1,32 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "active_record/connection_adapters/sqlserver/version"
+# frozen_string_literal: true
+
+version = File.read(File.expand_path("VERSION", __dir__)).strip
 
 Gem::Specification.new do |spec|
-  spec.name          = 'activerecord-sqlserver-adapter'
-  spec.version       = ActiveRecord::ConnectionAdapters::SQLServer::Version::VERSION
+  spec.name          = "activerecord-sqlserver-adapter"
   spec.platform      = Gem::Platform::RUBY
-  spec.license       = 'MIT'
-  spec.authors       = ['Ken Collins', 'Anna Carey', 'Will Bond', 'Murray Steele', 'Shawn Balestracci', 'Joe Rafaniello', 'Tom Ward']
-  spec.email         = ['ken@metaskills.net', 'will@wbond.net']
-  spec.homepage      = 'http://github.com/rails-sqlserver/activerecord-sqlserver-adapter'
-  spec.summary       = 'ActiveRecord SQL Server Adapter.'
-  spec.description   = 'ActiveRecord SQL Server Adapter. SQL Server 2012 and upward.'
+  spec.version       = version
+
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.license       = "MIT"
+  spec.authors       = ["Ken Collins", "Anna Carey", "Will Bond", "Murray Steele", "Shawn Balestracci", "Joe Rafaniello", "Tom Ward"]
+  spec.email         = ["ken@metaskills.net", "will@wbond.net"]
+  spec.homepage      = "http://github.com/rails-sqlserver/activerecord-sqlserver-adapter"
+  spec.summary       = "ActiveRecord SQL Server Adapter."
+  spec.description   = "ActiveRecord SQL Server Adapter. SQL Server 2012 and upward."
+
+  spec.metadata      = {
+    "bug_tracker_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues",
+    "changelog_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v#{version}/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v#{version}",
+  }
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.add_dependency 'activerecord', '~> 5.2.0'
-  spec.add_dependency 'tiny_tds'
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "activerecord", "~> 6.0.0"
+  spec.add_dependency "tiny_tds"
 end

data/appveyor.yml

@@ -1,12 +1,23 @@
+image: Visual Studio 2017
+skip_tags: true
+clone_depth: 5
+build: off
+matrix:
+  fast_finish: true
+  allow_failures:
+    - ruby_version: "25"
+    - ruby_version: "26"
+    - ruby_version: "27"
+    - ruby_version: "27-x64"
+services:
+  - mssql2014
+
 init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TINYTDS_VERSION=2.1.0
-clone_depth: 5
-skip_tags: true
-matrix:
-  fast_finish: true
+  - SET TINYTDS_VERSION=2.1.3.pre
+
 install:
   - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
   - ruby --version
@@ -14,26 +25,22 @@ install:
   - bundle install
   - gem uninstall bcrypt
   - gem install bcrypt --platform=ruby
-build: off
+
 test_script:
   - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
   - timeout /t 4 /nobreak > NUL
-  - ps: Start-Service 'MSSQL$SQL2014'
-  - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
-  - ps: Stop-Service 'MSSQL$SQL2014'
-  - ps: Start-Service 'MSSQL$SQL2012SP1'
-  - timeout /t 4 /nobreak > NUL
-  - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
-  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
+
 environment:
   CI_AZURE_HOST:
     secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=
   CI_AZURE_PASS:
     secure: cSQp8sk4urJYvq0utpsK+r7J+snJ2wpcdp8RdXJfB+w=
   matrix:
-    - ruby_version: "23-x64"
-    - ruby_version: "23"
-    - ruby_version: "22-x64"
-    - ruby_version: "22"
+    - ruby_version: "25-x64"
+    - ruby_version: "25"
+    - ruby_version: "26-x64"
+    - ruby_version: "26"
+    - ruby_version: "27-x64"
+    - ruby_version: "27"

data/docker-compose.ci.yml

@@ -1,11 +1,13 @@
 version: "2.2"
 services:
-  database:
+  sqlserver:
     image: metaskills/mssql-server-linux-rails
   ci:
     environment:
-      - ACTIVERECORD_UNITTEST_HOST=database
-    build: .
-    command: wait-for database:1433 -- bundle exec rake test
+      - ACTIVERECORD_UNITTEST_HOST=sqlserver
+    build:
+      context: .
+      dockerfile: Dockerfile.ci
+    command: wait-for sqlserver:1433 -- bundle exec rake test
     depends_on:
-      - "database"
+      - "sqlserver"

data/guides/RELEASING.md

@@ -0,0 +1,11 @@
+# Releasing
+
+## Building locally
+
+If you want to build the gem to test it locally run `bundle exec rake build`.
+
+This command will build the gem in `pkg/activerecord-sqlserver-adapter-A.B.C.gem`, where `A.B.C` is the version in `VERSION` file.
+
+## Releasing to RubyGems
+
+Run `bundle exec rake release` to build the gem locally and push the `gem` file to RubyGems.

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

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module ActiveRecord
-
           extend ActiveSupport::Concern
 
           module ClassMethods
-
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
                 connection.execute_procedure(proc_name, *variables)
@@ -15,9 +15,7 @@ module ActiveRecord
                 []
               end
             end
-
           end
-
         end
       end
     end

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

@@ -1,12 +1,12 @@
-require 'active_record/attribute_methods'
+# frozen_string_literal: true
+
+require "active_record/attribute_methods"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module AttributeMethods
-
-
           private
 
           def attributes_for_update(attribute_names)
@@ -15,7 +15,6 @@ module ActiveRecord
               column && column.respond_to?(:is_identity?) && column.is_identity?
             end
           end
-
         end
       end
     end

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

@@ -1,12 +1,13 @@
-require 'active_record/relation'
-require 'active_record/version'
+# frozen_string_literal: true
+
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module Calculations
-
           # Same as original except we don't perform PostgreSQL hack that removes ordering.
           def calculate(operation, column_name)
             if has_include?(column_name)
@@ -15,7 +16,7 @@ module ActiveRecord
               if operation.to_s.downcase == "count"
                 unless distinct_value || distinct_select?(column_name || select_for_count)
                   relation.distinct!
-                  relation.select_values = [ klass.primary_key || table[Arel.star] ]
+                  relation.select_values = [klass.primary_key || table[Arel.star]]
                 end
               end
 

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

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module Explain
-
-          SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '.freeze
+          SQLSERVER_STATEMENT_PREFIX = "EXEC sp_executesql "
           SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries)
@@ -32,7 +33,6 @@ module ActiveRecord
 
             executesql
           end
-
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport.on_load(:active_record) do
   silence_warnings do
     # Already defined in Rails

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

@@ -1,23 +1,24 @@
-require 'active_record/relation'
-require 'active_record/version'
+# frozen_string_literal: true
+
+require "active_record/relation"
+require "active_record/version"
 
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module CoreExt
         module FinderMethods
-
           private
 
           # Same as original except we order by values in distinct select if present.
           def construct_relation_for_exists(conditions)
-            if distinct_value && offset_value
-              relation = limit!(1)
+            conditions = sanitize_forbidden_attributes(conditions)
 
+            if distinct_value && offset_value
               if select_values.present?
-                relation = relation.order(*select_values)
+                relation = order(*select_values).limit!(1)
               else
-                relation = relation.except(:order)
+                relation = except(:order).limit!(1)
               end
             else
               relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "active_record/associations/preloader"
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module Preloader
+          private
+
+          def records_for(ids)
+            ids.each_slice(in_clause_length).flat_map do |slice|
+              scope.where(association_key_name => slice).load do |record|
+                # Processing only the first owner
+                # because the record is modified but not an owner
+                owner = owners_by_key[convert_key(record[association_key_name])].first
+                association = owner.association(reflection.name)
+                association.set_inverse_instance(record)
+              end.records
+            end
+          end
+
+          def in_clause_length
+            10_000
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Preloader
+  ActiveRecord::Associations::Preloader::Association.prepend(mod)
+end

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

@@ -1,15 +1,17 @@
-require 'active_record/relation'
-require 'active_record/version'
+# 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 6.
+          # 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))

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
@@ -9,10 +11,12 @@ module ActiveRecord
         def column_name_length
           128
         end
+        deprecate :column_name_length
 
         def table_name_length
           128
         end
+        deprecate :table_name_length
 
         def index_name_length
           128
@@ -21,14 +25,17 @@ module ActiveRecord
         def columns_per_table
           1024
         end
+        deprecate :columns_per_table
 
         def indexes_per_table
           999
         end
+        deprecate :indexes_per_table
 
         def columns_per_multicolumn_index
           16
         end
+        deprecate :columns_per_multicolumn_index
 
         def in_clause_length
           10_000
@@ -37,10 +44,12 @@ module ActiveRecord
         def sql_query_length
           65_536 * 4_096
         end
+        deprecate :sql_query_length
 
         def joins_per_query
           256
         end
+        deprecate :joins_per_query
 
         private