activerecord-jdbcsqlserver-adapter 50.0.0 → 52.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d264fa23b69908328c1e4f17fc5b69b2d2de67ed14394ef5127e9767379ccfe9
-  data.tar.gz: c9fa8ecde64528237123e97bf8ed99a26d03d9d83341e7510f3d67d8de4b2b63
+  metadata.gz: c764412410f757d3f4ee0312e3950ba5eb3cd1b3f7e21645e2d081ce4974f7b2
+  data.tar.gz: 463f9a3245a8d95ff78d76fd2284a8cacbc64b8510bfb95915d55c2e2b50021f
 SHA512:
-  metadata.gz: ce260ce665bbde6fabeacef58e7b7a4d417e1b453d46c440942c0dba50caf0acbe764932cfa23fc45cb468753e9cd681e88be58f30f1b8ff7e6830c5404eff6b
-  data.tar.gz: c17157b072dae81728644a308b89dc401e623d277db94be9f246f5a1b986e63becec559decb4af2a504de961213dc1c026d61a38cf0f908dc1157768523d01b5
+  metadata.gz: 703e10527b9d65e5e237dde6b5cdc381cb2f398f8fcd3cad780f64567694c193e9922ac58f5b4e591611157cb480ed405c75093d314e535c00210ad2ccbaeb99
+  data.tar.gz: f229972c054e17396b5aa1f6f554ae0a661a4e8d69ca9cb8e9ed52e4c7c3afef0f2d0eeb3e217f3e8b9c0323140329c16aa1e0986e2bc2b57da7817524a0232e

data/.gitignore

@@ -9,7 +9,9 @@ Gemfile.lock
 test/profile/output/*
 .rvmrc
 .rbenv-version
+.tool-versions
 .idea
 coverage/*
 .flooignore
-.floo
+.floo
+.byebug_history

data/.travis.yml

@@ -4,8 +4,8 @@ services:
   - docker
 env:
   global:
-    - COMPOSE_FILE=docker-compose.ci.yml
-    #- ARJDBC_BRANCH=mssql-support
+    - COMPOSE_FILE: docker-compose.ci.yml
+    - ARJDBC_BRANCH: 52-stable
   matrix:
     - TARGET_VERSION=9.1
     - TARGET_VERSION=9.2
@@ -17,11 +17,10 @@ before_install:
   - 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-jdk-alpine
-  #- docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION-jdk-alpine --build-arg TARGET_ARJDBC_BRANCH=$ARJDBC_BRANCH
+  #- docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION-jdk-alpine
+  - docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION-jdk-alpine --build-arg TARGET_ARJDBC_BRANCH=$ARJDBC_BRANCH
 script:
   - docker-compose run ci
 matrix:
   allow_failures:
     - env: TARGET_VERSION=9.1
-

data/CHANGELOG.md

@@ -1,124 +1,45 @@
-## v50.0.0
 
-* Forked original gem to provide JRuby support
+## v52.0.0
 
-## v5.0.8
+- Forked to support JRuby
 
-* Memorized SQL Server Version to prevent a flood of SELECT @@version queries. Fixes #632
-
-## v5.0.7
-
-* Add `WITH NO_INFOMSGS` to `user_options` method. Fixes #580
-
-
-## v5.0.6
+## v5.2.1
 
 #### Fixed
 
-* Performance w/inserts. Check binds & use schema cache for id inserts.
-  Fixes #572. Thanks @noelr.
-* Add smalldatetime type for migrations. Fixes #507
-
-#### Changed
-
-* Misc index enhancements or testing. Fixes #570
-  Enable `supports_index_sort_order?`, test `supports_partial_index?`, test how expression indexes work.
-
-#### Added
-
-* New `primary_key_nonclustered` type for easy In-Memory table creation.
-* Examples for an In-Memory table.
-
-```ruby
-create_table :in_memory_table, id: false,
-             options: 'WITH (MEMORY_OPTIMIZED = ON, DURABILITY = SCHEMA_AND_DATA)' do |t|
-  t.primary_key_nonclustered :id
-  t.string :name
-  t.timestamps
-end
-```
-
-* Enable supports_json? Fixes #577.
-
-```ruby
-create_table :users do |t|
-  t.string :name, :email
-  t.json :data # Creates a nvarchar(max) column.
- end
-
-class Users < ActiveRecord::Base
-  attribute :data, ActiveRecord::Type::SQLServer::Json.new
-end
-
-User.create! name: 'Ken Collins', data: { 'admin' => true, 'foo' => 'bar' }
-
-admin = User.where("JSON_VALUE(data, '$.admin') = CAST(1 AS BIT)").first
-admin.data['foo'] # => "bar"
-```
-
-
-## v5.0.5
-
-#### Changed
-
-* Add TinyTDS as a runtime dependency.
+- [#691](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/691) Fix constraints bug
+- [#700](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/700) SET SINGLE_USER before dropping the database
+- [#733](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/733) Calculate should not remove ordering for MSSQL
+- [#735](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/735) Order by selected items when using distinct exists
+- [#737](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/737) Use default precision for 'time' column type
+- [#744](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/744) Adapter does not use prepared statement cache
+- [#743](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/743) Set default time precision when registering time type
+- [#745](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/745) Quoted table names containing square brackets need to be regex escaped
 
-
-## v5.0.4
+## v5.2.0
 
 #### Fixed
 
-* Allow `datetimeoffset` to be used in migrations and represented in schema.
-* Using transactions and resetting isolation level correctly when `READ_COMMITTED_SNAPSHOT` is set to `ON` Fixes #520
-
-
-## v5.0.3
-
-#### Changed
-
-* Reduce view information reflection to per table vs. column. Fixes #552
-* The `user_options` parsing. Works for hash/array. Fixes #535
-* Pass the `:contained` option to TinyTDS. Fixes #527
-
+- [#686](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/686) sql_for_insert set table name in case when pk is not nil
 
-## v5.0.2
+## v5.2.0.rc2
 
 #### Fixed
 
-* Filter table constraints with matching table schema to column. Fixes #478
-
-
-## v5.0.1
-
-#### Changed
+- [#681](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/681) change_column_null should not clear other column attributes. Fixes #582.
+- [#684](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/684) Fix explain with array conditions. Fixes #673.
 
-* Set `tds_version` fallback to `7.3`.
+## v5.2.0.rc1
 
 #### Fixed
 
-* Support 2014, 2012 drop table statement.
-
-
-## v5.0.0
-
-#### Added
-
-* Support for `supports_datetime_with_precision`.
-* Support for `unprepared_statement` blocks on the connection.
+- [#638](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/638) Don't disable referential integrity for the same table twice.
+- [#646](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/646) Make String equality check work for Type::Data values. Fixes #645.
+- [#671](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/671) Fix tinyint columns schema migration. Fixes #670.
 
 #### Changed
 
-* Major refactoring of all type objects. Especially time types.
+- [#642](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/642) Added with (nolock) hint to information_schema.views.
 
-#### Deprecated
-
-* Support for a handful of standard Rails deprecations in 5-0-stable suite.
-
-#### Removed
-
-* ODBC connection mode. Not been maintained since Rails 4.0.
-* View table name detection in `with_identity_insert_enabled` method for fixtures. Perf hit.
-
-#### Fixed
 
-* Do not output column collation in schema when same as database.
+Please check [5-1-stable-jdbc](https://github.com/jruby/activerecord-jdbcsqlserver-adapter/blob/5-1-stable-jdbc/CHANGELOG.md) for previous changes.

data/Gemfile

@@ -2,9 +2,7 @@ require 'openssl'
 source 'https://rubygems.org'
 gemspec
 
-gem 'rb-readline', platform: :mri
-gem 'sqlite3', platform: :mri
-gem 'minitest', '< 5.3.4'
+gem 'sqlite3', '~> 1.3.6', platform: :mri
 gem 'bcrypt'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 

data/README.md

@@ -1,19 +1,16 @@
-# ActiveRecord SQL Server Adapter. For SQL Server 2012 And Higher.
+# ActiveRecord JDBC SQL Server Adapter. For SQL Server 2012 And Higher.
 
 [![Gem Version](http://img.shields.io/gem/v/activerecord-jdbcsqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-jdbcsqlserver-adapter) - Gem Version
 
+## About The Adapter
 
-The JDBC SQL Server adapter for ActiveRecord v5.0 using SQL Server 2012 or higher.
+The JDBC SQL Server adapter for ActiveRecord v5.2 using SQL Server 2012 or higher.
 
 We currently support JRuby 9.2+. Older versions may work but they are not tested and there is a known date issue with JRuby 9.1.
 
 For older versions see [activerecord-jdbcmssql-adapter](https://rubygems.org/gems/activerecord-jdbcmssql-adapter)
 
 
-#### Native Data Type Support
-
-The Rails v5 adapter supports ActiveRecord's `datetime_with_precision` setting. This means that passing `:precision` to a datetime column is supported. Using a pecision with the `:datetime` type will signal the adapter to use the `datetime2` type under the hood.
-
 #### Schemas & Users
 
 Depending on your user and schema setup, it may be needed to use a table name prefix of `dbo.`. So something like this in your initializer file for ActiveRecord or the adapter.
@@ -49,7 +46,7 @@ gem 'activerecord-jdbcsqlserver-adapter'
 
 ## Contributing
 
-If you would like to contribute a feature or bugfix, thanks! To make sure your fix/feature has a high chance of being added, please read the following guidelines. First, ask on the Gitter, or post a ticket on github issues. Second, make sure there are tests! We will not accept any patch that is not tested. Please read the `RUNNING_UNIT_TESTS` file for the details of how to run the unit tests.
+If you would like to contribute a feature or bugfix, thanks! To make sure your fix/feature has a high chance of being added, please read the following guidelines. First, ask on the Gitter, or post a ticket on github issues. Second, make sure there are tests! We will not accept any patch that is not tested. Please read the [`RUNNING_UNIT_TESTS`](RUNNING_UNIT_TESTS.md) file for the details of how to run the unit tests.
 
 This is a fork of the activerecord-sqlserver-adapter. If you find a bug in the base code, please submit patches to: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 
@@ -61,7 +58,7 @@ If the bug/feature is JRuby or specific to this gem, please submit patches to: h
 Many many people have contributed. If you do not see your name here and it should be let us know. Also, many thanks go out to those that have pledged financial contributions.
 
 
-## Contributers
+## Contributors
 
 Up-to-date list of contributors: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/contributors
 
@@ -90,4 +87,3 @@ JDBC version of the gem:
 ## License
 
 Copyright © 2008-2019. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
-

data/VERSION

@@ -1 +1 @@
-50.0.0
+52.0.0

data/activerecord-jdbcsqlserver-adapter.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   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.0.0', '>= 5.0.6'
-  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 50.5'
+  spec.add_dependency 'activerecord', '~> 5.2.0', '>= 5.2.3'
+  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 52.7'
   spec.add_dependency 'jdbc-mssql', '>= 0.6.0'
 end

data/appveyor.yml

@@ -2,7 +2,7 @@ init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TINYTDS_VERSION=1.3.0
+  - SET TINYTDS_VERSION=2.1.0
 clone_depth: 5
 skip_tags: true
 matrix:

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: test/bin/wait-for.sh database:1433 -- bundle exec rake test
+      - ACTIVERECORD_UNITTEST_HOST=sqlserver
+    build:
+      context: .
+      dockerfile: Dockerfile.ci
+    command: test/bin/wait-for.sh sqlserver:1433 -- bundle exec rake test
     depends_on:
-      - "database"
+      - "sqlserver"

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

@@ -24,4 +24,6 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
+ActiveSupport.on_load(:active_record) do
+  include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ActiveRecord
+end

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

@@ -22,4 +22,6 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
+ActiveSupport.on_load(:active_record) do
+  include ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::AttributeMethods
+end

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

@@ -0,0 +1,51 @@
+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)
+              relation = apply_join_dependency
+
+              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] ]
+                end
+              end
+
+              relation.calculate(operation, column_name)
+            else
+              perform_calculation(operation, column_name)
+            end
+          end
+
+          private
+
+          def build_count_subquery(relation, column_name, distinct)
+            super(relation.unscope(:order), column_name, distinct)
+          end
+
+          def type_cast_calculated_value(value, type, operation = nil)
+            case operation
+            when "count"   then value.to_i
+            when "sum"     then type.deserialize(value || 0)
+            when "average" then value&.respond_to?(:to_d) ? value.to_d : value
+            else type.deserialize(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Calculations
+  ActiveRecord::Relation.prepend(mod)
+end

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

@@ -5,12 +5,11 @@ module ActiveRecord
         module Explain
 
           SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '.freeze
-          SQLSERVER_PARAM_MATCHER = /@\d+ = (.*)/
-          SQLSERVER_NATIONAL_STRING_MATCHER = /N'(.*)'/m
+          SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries)
             unprepared_queries = queries.map do |(sql, binds)|
-              [unprepare_sqlserver_statement(sql), binds]
+              [unprepare_sqlserver_statement(sql, binds), binds]
             end
             super(unprepared_queries)
           end
@@ -19,22 +18,19 @@ module ActiveRecord
 
           # This is somewhat hacky, but it should reliably reformat our prepared sql statment
           # which uses sp_executesql to just the first argument, then unquote it. Likewise our
-          # `sp_executesql` method should substitude the @n args withe the quoted values.
-          def unprepare_sqlserver_statement(sql)
-            if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
-              executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
-              args = executesql.split(', ')
-              unprepared_sql = args.shift.strip.match(SQLSERVER_NATIONAL_STRING_MATCHER)[1]
-              unprepared_sql = Utils.unquote_string(unprepared_sql)
-              args = args.from(args.length / 2)
-              args.each_with_index do |arg, index|
-                value = arg.match(SQLSERVER_PARAM_MATCHER)[1]
-                unprepared_sql.sub! "@#{index}", value
-              end
-              unprepared_sql
-            else
-              sql
+          # `sp_executesql` method should substitude the @n args with the quoted values.
+          def unprepare_sqlserver_statement(sql, binds)
+            return sql unless sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
+
+            executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
+            executesql = executesql.match(SQLSERVER_STATEMENT_REGEXP).to_a[1]
+
+            binds.each_with_index do |bind, index|
+              value = connection.quote(bind)
+              executesql = executesql.sub("@#{index}", value)
             end
+
+            executesql
           end
 
         end
@@ -43,5 +39,7 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
-ActiveRecord::Relation.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
+ActiveSupport.on_load(:active_record) do
+  extend ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain
+  ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Explain)
+end

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

@@ -1,4 +1,6 @@
-silence_warnings do
-  # Already defined in Rails
-  ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
+ActiveSupport.on_load(:active_record) do
+  silence_warnings do
+    # Already defined in Rails
+    ActiveRecord::ExplainSubscriber::EXPLAINED_SQLS = /(select|update|delete|insert)\b/i
+  end
 end

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

@@ -0,0 +1,43 @@
+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)
+
+              if select_values.present?
+                relation = relation.order(*select_values)
+              else
+                relation = relation.except(:order)
+              end
+            else
+              relation = except(:select, :distinct, :order)._select!(::ActiveRecord::FinderMethods::ONE_AS_ONE).limit!(1)
+            end
+
+            case conditions
+            when Array, Hash
+              relation.where!(conditions) unless conditions.empty?
+            else
+              relation.where!(primary_key => conditions) unless conditions == :none
+            end
+
+            relation
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Relation.include(ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::FinderMethods)
+end