activerecord-jdbcsqlserver-adapter 50.1.0 → 51.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5acd7cd424c10d62f5c2c1b71c8375fd736ed7ec7793c85a3fd6dc0f0f23f6
-  data.tar.gz: 597ccc6cfb6d8533555dda1eb7598132cd932f80c78f936b85b69daef9545271
+  metadata.gz: 0741df1e5631f4906252da7155f1132211b7013a5af28c67acaa5842904fb00f
+  data.tar.gz: 766c6e44c12e5a068fc86120af09ac60e1435c22fa6ad645bd66298711aca79d
 SHA512:
-  metadata.gz: c55e61e720f4de8c51cd94a34be67eb16b3d9d1c34888471e8eb14e3fc1f590eb404b90f7cc19a16534a135ab3665dc57ea1551e78c49777ff3d678816d888e9
-  data.tar.gz: a731bb86cac95cb46e1876b65ff7740f855c0759fd0751ee08fcb7f4f5497247ad8e6633671d7ab468289770bea319656a64ce8934f42b0b9b512bb8171fa91b
+  metadata.gz: 73fefebc26abc9047a08237f423619cc5b0b3b5e44151e684441e4533f3fcec6d29ed424be8355698d157fa64e8e9d81d547889a3fa1f07c13050c48e6545dfe
+  data.tar.gz: fb6d2c239737a9417a0969e5806c78e1e1d9b0d7ce4fe39bb1e81052e9425f2a9e7f9943d1ffa2021c2d8642d2fbe71440d3b56a1b0e141287b3012201ba14f3

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=51-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/BACKERS.md

@@ -0,0 +1,32 @@
+# Backers
+
+You can join in supporting TinyTDS and the Rails SQL Server Adapter development by [pledging on Patreon](https://www.patreon.com/metaskills)! Backers in the same pledge level appear in the order of pledge date.
+
+### $2000
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611218)
+
+
+### $500
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611209)
+
+
+### $250
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611199)
+
+
+### $100
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611196)
+
+
+### $50+
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611186)
+
+
+### $10+
+
+[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611149)

data/CHANGELOG.md

@@ -1,124 +1,58 @@
-## v50.0.0
+## v51.0.0
 
 * Forked original gem to provide JRuby support
 
-## v5.0.8
-
-* 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
-
-#### 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.
+## v5.1.6
 
 #### 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' }
+* Use lock hint when joining table in query.
 
-admin = User.where("JSON_VALUE(data, '$.admin') = CAST(1 AS BIT)").first
-admin.data['foo'] # => "bar"
-```
 
+## v5.1.5
 
-## v5.0.5
-
-#### Changed
+#### Fixed
 
-* Add TinyTDS as a runtime dependency.
+* Memoize `@@version` queries. Fixes #632
 
 
-## v5.0.4
+## v5.1.4
 
 #### 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
+* Add case insensitive comparison for better performance with CI collations. Fixes #624
 
 
-## v5.0.3
+## v5.1.3
 
-#### Changed
+#### Fixed
 
-* 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
+* Use bigint type in sqlserver_type when needed. Fixes #616
 
 
-## v5.0.2
+## v5.1.2
 
 #### Fixed
 
-* Filter table constraints with matching table schema to column. Fixes #478
-
+* The `fast_string_to_time` method when zone local. Fixes #609 #614 #620
+* Patched `Relation#build_count_subquery`. Fixes #613.
+* Inserts to tables with triggers using default `OUTPUT INSERTED` style. Fixes #595.
 
-## v5.0.1
-
-#### Changed
 
-* Set `tds_version` fallback to `7.3`.
+## v5.1.1
 
 #### Fixed
 
-* Support 2014, 2012 drop table statement.
+* Use `ActiveSupport.on_load` to hook into ActiveRecord Fixes #588 #598
 
 
-## v5.0.0
-
-#### Added
-
-* Support for `supports_datetime_with_precision`.
-* Support for `unprepared_statement` blocks on the connection.
+## v5.1.0
 
 #### Changed
 
-* Major refactoring of all type objects. Especially time types.
-
-#### Deprecated
+* The `drop_table` with force cascade option now mimics in via pure SQL for us.
 
-* 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.
+#### Added
 
-#### Fixed
+* Support MismatchedForeignKey exception.
 
-* Do not output column collation in schema when same as database.

data/README.md

@@ -2,8 +2,7 @@
 
 [![Gem Version](http://img.shields.io/gem/v/activerecord-jdbcsqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-jdbcsqlserver-adapter) - Gem Version
 
-
-The JDBC SQL Server adapter for ActiveRecord v5.0 using SQL Server 2012 or higher.
+The JDBC SQL Server adapter for ActiveRecord v5.1 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.
 
@@ -61,7 +60,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
 

data/VERSION

@@ -1 +1 @@
-50.1.0
+51.0.0

data/activerecord-jdbcsqlserver-adapter.gemspec

@@ -15,7 +15,8 @@ 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.8'
+
+  spec.add_dependency 'activerecord', '~> 5.1.0', '>= 5.1.7'
+  spec.add_dependency 'activerecord-jdbc-adapter' , '~> 51.5'
   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/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,55 @@
+require 'active_record/relation'
+require 'active_record/version'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module CoreExt
+        module Calculations
+
+          # @Override
+          # If we are ordering a subquery for a count, we have to artificially add the offset bind parameter
+          def bound_attributes
+            attrs = super
+            if @_setting_offset_for_count
+              @_setting_offset_for_count = false
+              attrs << Attribute.with_cast_value('OFFSET'.freeze, 0, ::ActiveRecord::Type.default_value)
+            end
+            attrs
+          end
+
+          private
+
+          # @Override
+          def build_count_subquery(relation, column_name, distinct)
+
+            # For whatever reason, mssql requires an offset if an ORDER BY is included in a subquery
+            if distinct && !has_limit_or_offset? && !relation.orders.empty?
+              relation = relation.offset(0)
+
+              # This is purely to appease activerecord/test/cases/calculations_test.rb @ line 258 CalculationsTest#test_distinct_count_all_with_custom_select_and_order
+              # hopefully nobody tries to do anything too crazy in a literal...
+              if relation.projections.length == 1 && relation.projections.first.is_a?(::Arel::Nodes::SqlLiteral)
+                relation.projections[0] = ::Arel::Nodes::SqlLiteral.new(relation.projections.first + ' as some_name_that_hopefully_never_exists123')
+              end
+
+              @_setting_offset_for_count = true
+            end
+
+            super
+
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  if ActiveRecord::VERSION::MAJOR == 5 &&
+     ActiveRecord::VERSION::MINOR == 1 &&
+     ActiveRecord::VERSION::TINY >= 4
+    mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Calculations
+    ActiveRecord::Relation.prepend(mod)
+  end
+end

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

@@ -43,5 +43,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/database_statements.rb

@@ -3,10 +3,6 @@ module ActiveRecord
     module SQLServer
       module DatabaseStatements
 
-        def select_rows(sql, name = nil, binds = [])
-          sp_executesql sql, name, binds, fetch: :rows
-        end
-
         def execute(sql, name = nil)
           if id_insert_table_name = query_requires_identity_insert?(sql)
             with_identity_insert_enabled(id_insert_table_name) { do_execute(sql, name) }
@@ -19,22 +15,22 @@ module ActiveRecord
           sp_executesql(sql, name, binds, prepare: prepare)
         end
 
-        def exec_insert(sql, name, binds, pk = nil, _sequence_name = nil)
+        def exec_insert(sql, name = nil, binds = [], pk = nil, _sequence_name = nil)
           if id_insert_table_name = exec_insert_requires_identity?(sql, pk, binds)
-            with_identity_insert_enabled(id_insert_table_name) { exec_query(sql, name, binds) }
+            with_identity_insert_enabled(id_insert_table_name) { super(sql, name, binds, pk) }
           else
-            exec_query(sql, name, binds)
+            super(sql, name, binds, pk)
           end
         end
 
         def exec_delete(sql, name, binds)
-          sql << '; SELECT @@ROWCOUNT AS AffectedRows'
-          super.rows.first.first
+          sql = sql.dup << '; SELECT @@ROWCOUNT AS AffectedRows'
+          super(sql, name, binds).rows.first.first
         end
 
         def exec_update(sql, name, binds)
-          sql << '; SELECT @@ROWCOUNT AS AffectedRows'
-          super.rows.first.first
+          sql = sql.dup << '; SELECT @@ROWCOUNT AS AffectedRows'
+          super(sql, name, binds).rows.first.first
         end
 
         def supports_statement_cache?
@@ -80,7 +76,7 @@ module ActiveRecord
         end
 
         def case_sensitive_comparison(table, attribute, column, value)
-          if value && value.acts_like?(:string)
+          if column.collation && !column.case_sensitive?
             table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
           else
             super
@@ -88,7 +84,7 @@ module ActiveRecord
         end
 
         def can_perform_case_insensitive_comparison_for?(column)
-          column.type == :string
+          column.type == :string && (!column.collation || column.case_sensitive?)
         end
         private :can_perform_case_insensitive_comparison_for?
 
@@ -196,9 +192,20 @@ module ActiveRecord
             table_name = query_requires_identity_insert?(sql)
             pk = primary_key(table_name)
           end
-          sql = if pk && self.class.use_output_inserted && !database_prefix_remote_server?
+          sql = if pk && use_output_inserted? && !database_prefix_remote_server?
                   quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
-                  sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
+                  table_name ||= get_table_name(sql)
+                  exclude_output_inserted = exclude_output_inserted_table_name?(table_name, sql)
+                  if exclude_output_inserted
+                    id_sql_type = exclude_output_inserted.is_a?(TrueClass) ? 'bigint' : exclude_output_inserted
+                    <<-SQL.strip_heredoc
+                      DECLARE @ssaIdInsertTable table (#{quoted_pk} #{id_sql_type});
+                      #{sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk} INTO @ssaIdInsertTable"}
+                      SELECT CAST(#{quoted_pk} AS #{id_sql_type}) FROM @ssaIdInsertTable
+                    SQL
+                  else
+                    sql.dup.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
+                  end
                 else
                   "#{sql}; SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident"
                 end
@@ -241,7 +248,7 @@ module ActiveRecord
           return attr.type.sqlserver_type if attr.type.respond_to?(:sqlserver_type)
           case value = attr.value_for_database
           when Numeric
-            'int'.freeze
+            value > 2_147_483_647 ? 'bigint'.freeze : 'int'.freeze
           else
             'nvarchar(max)'.freeze
           end
@@ -261,7 +268,7 @@ module ActiveRecord
           if name == 'EXPLAIN'
             params.each.with_index do |param, index|
               substitute_at_finder = /(@#{index})(?=(?:[^']|'[^']*')*$)/ # Finds unquoted @n values.
-              sql.sub! substitute_at_finder, param.to_s
+              sql = sql.sub substitute_at_finder, param.to_s
             end
           else
             types = quote(types.join(', '))
@@ -283,6 +290,21 @@ module ActiveRecord
 
         # === SQLServer Specific (Identity Inserts) ===================== #
 
+        def use_output_inserted?
+          self.class.use_output_inserted
+        end
+
+        def exclude_output_inserted_table_names?
+          !self.class.exclude_output_inserted_table_names.empty?
+        end
+
+        def exclude_output_inserted_table_name?(table_name, sql)
+          return false unless exclude_output_inserted_table_names?
+          table_name ||= get_table_name(sql)
+          return false unless table_name
+          self.class.exclude_output_inserted_table_names[table_name]
+        end
+
         def exec_insert_requires_identity?(sql, pk, binds)
           query_requires_identity_insert?(sql) if pk && binds.map(&:name).include?(pk)
         end
@@ -291,7 +313,8 @@ module ActiveRecord
           if insert_sql?(sql)
             table_name = get_table_name(sql)
             id_column = identity_columns(table_name).first
-            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
+            # id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
+            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? table_name : false
           else
             false
           end