Merge branch '5-2-stable' into 5-1-stable-with-odbc

Author: smlsml

.gitignore

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

.travis.yml

@@ -4,25 +4,22 @@ services:
   - docker
 env:
   global:
-    - TINYTDS_VERSION=2.1.0
-    - ACTIVERECORD_UNITTEST_HOST=localhost
-    - ACTIVERECORD_UNITTEST_DATASERVER=localhost
-rvm:
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+    - COMPOSE_FILE: docker-compose.ci.yml
 before_install:
-  - export PATH=/opt/local/bin:$PATH
-  - docker info
-  - sudo ./test/bin/setup.sh
-  - sudo ./test/bin/install-openssl.sh
-  - openssl version
-  - sudo ./test/bin/install-freetds.sh
-  - tsql -C
+  - 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:
-  - export PATH=/opt/local/bin:$PATH
-  - gem install bundler
-  - bundle --version
-  - bundle install
+  - docker-compose build --build-arg TARGET_VERSION=$TARGET_VERSION
 script:
-  - bundle exec rake
+  - 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

BACKERS.md

@@ -1,54 +1,25 @@
-## v5.1.6
+## v5.2.0
 
-#### Added
+- #686 sql_for_insert set table name in case when pk is not nil
 
-* Use lock hint when joining table in query.
-
-
-## v5.1.5
+## v5.2.0.rc2
 
 #### Fixed
 
-* Memoize `@@version` queries. Fixes #632
-
+- #681 change_column_null should not clear other column attributes. Fixes #582.
+- #684 Fix explain with array conditions. Fixes #673.
 
-## v5.1.4
+## v5.2.0.rc1
 
 #### Fixed
 
-* Add case insensitive comparison for better performance with CI collations. Fixes #624
-
-
-## v5.1.3
-
-#### Fixed
-
-* Use bigint type in sqlserver_type when needed. Fixes #616
-
-
-## v5.1.2
-
-#### Fixed
-
-* 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.1.1
-
-#### Fixed
-
-* Use `ActiveSupport.on_load` to hook into ActiveRecord Fixes #588 #598
-
-
-## v5.1.0
+- #638 Don't disable referential integrity for the same table twice.
+- #646 Make String equality check work for Type::Data values. Fixes #645.
+- #671 Fix tinyint columns schema migration. Fixes #670.
 
 #### Changed
 
-* The `drop_table` with force cascade option now mimics in via pure SQL for us.
-
-#### Added
+- #642 Added with (nolock) hint to information_schema.views.
 
-* Support MismatchedForeignKey exception.
 
+Please check [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/5-1-stable/CHANGELOG.md) for previous changes.

CHANGELOG.md

@@ -0,0 +1,14 @@
+ARG TARGET_VERSION=2.6.3
+
+FROM wpolicarpo/activerecord-sqlserver-adapter:${TARGET_VERSION}
+
+ENV WORKDIR /activerecord-sqlserver-adapter
+
+RUN mkdir -p $WORKDIR
+WORKDIR $WORKDIR
+
+COPY . $WORKDIR
+
+RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
+
+CMD ["sh"]

Dockerfile

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

Gemfile

@@ -7,20 +7,15 @@
 * [![Dependency Status](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter/badge)](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter) - Dependency Status
 * [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter) - Community
 
-## Supporting TinyTDS/Adapter
-
-Both TinyTDS and the Rails SQL Server Adapter are MIT-licensed open source projects. Its ongoing development is made possible thanks to the support by these awesome [backers](https://github.com/rails-sqlserver/tiny_tds/blob/master/BACKERS.md). If you'd like to join them, check out our [Patreon Campaign](https://www.patreon.com/metaskills).
-
-
 ## About The Adapter
 
-The SQL Server adapter for ActiveRecord v5.1 using SQL Server 2012 or higher.
+The SQL Server adapter for ActiveRecord v5.2 using SQL Server 2012 or higher.
 
-Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 5.0.x version of the adapter is only for the latest 5.0 version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
+Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 5.1.x version of the adapter is only for the latest 5.1 version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
 
 #### Native Data Type Support
 
-We support every data type supported by FreeTDS. All simplified Rails types in migrations will coorespond to a matching SQL Server national (unicode) data type. Always check the `initialize_native_database_types` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver/schema_statements.rb#L243) for an updated list.
+We support every data type supported by FreeTDS. All simplified Rails types in migrations will coorespond to a matching SQL Server national (unicode) data type. Always check the `initialize_native_database_types` [(here)](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/master/lib/active_record/connection_adapters/sqlserver/schema_statements.rb) for an updated list.
 
 The following types (date, datetime2, datetimeoffset, time) all require TDS version 7.3 with TinyTDS. We recommend using FreeTDS 1.0 or higher which default to using `TDSVER` to "7.3". The adapter also sets TinyTDS's `tds_version` to this as well if non is specified.
 
@@ -136,7 +131,7 @@ gem 'activerecord-sqlserver-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.
 
 * Github: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
 * Gitter: https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter

README.md

@@ -1 +1 @@
-5.1.6
+5.2.0

VERSION

@@ -16,6 +16,6 @@ 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.1.0'
+  spec.add_dependency 'activerecord', '~> 5.2.0'
   spec.add_dependency 'ruby-odbc'
 end

activerecord-sqlserver-adapter.gemspec

@@ -18,9 +18,10 @@ dependencies:
     - openssl version
     - sudo ./test/bin/install-freetds.sh
     - tsql -C
-    - rvm-exec 2.2.5 bundle install
-    - rvm-exec 2.3.1 bundle install
-    - rvm-exec 2.4.0 bundle install
+    - rvm-exec 2.3.8 bundle install
+    - rvm-exec 2.4.5 bundle install
+    - rvm-exec 2.5.3 bundle install
+    - rvm-exec 2.6.0 bundle install
 
 database:
   override:
@@ -31,6 +32,7 @@ database:
 
 test:
   override:
-    - rvm-exec 2.2.5 bundle exec rake test
-    - rvm-exec 2.3.1 bundle exec rake test
-    - rvm-exec 2.4.0 bundle exec rake test
+    - rvm-exec 2.3.8 bundle exec rake test
+    - rvm-exec 2.4.5 bundle exec rake test
+    - rvm-exec 2.5.3 bundle exec rake test
+    - rvm-exec 2.6.0 bundle exec rake test

circle.yml

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

docker-compose.ci.yml

@@ -9,19 +9,16 @@ module Calculations
           private
 
           def build_count_subquery(relation, column_name, distinct)
-            relation.select_values = [
-              if column_name == :all
-                distinct ? table[Arel.star] : Arel.sql(FinderMethods::ONE_AS_ONE)
-              else
-                column_alias = Arel.sql("count_column")
-                aggregate_column(column_name).as(column_alias)
-              end
-            ]
-
-            subquery = relation.arel.as(Arel.sql("subquery_for_count"))
-            select_value = operation_over_aggregate_column(column_alias || Arel.star, "count", false)
+            super(relation.unscope(:order), column_name, distinct)
+          end
 
-            Arel::SelectManager.new(subquery).project(select_value)
+          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
@@ -30,10 +27,6 @@ def build_count_subquery(relation, column_name, distinct)
 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
+  mod = ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::Calculations
+  ActiveRecord::Relation.prepend(mod)
 end

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

@@ -5,12 +5,11 @@ module CoreExt
         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 @@ def exec_explain(queries)
 
           # 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

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module DatabaseLimits
-
         def table_alias_length
           128
         end
@@ -32,7 +31,7 @@ def columns_per_multicolumn_index
         end
 
         def in_clause_length
-          65_536
+          10_000
         end
 
         def sql_query_length
@@ -43,6 +42,18 @@ def joins_per_query
           256
         end
 
+        private
+
+        # The max number of binds is 2100, but because sp_executesql takes
+        # the first 2 params as the query string and the list of types,
+        # we have only 2098 spaces left
+        def bind_params_length
+          2_098
+        end
+
+        def insert_rows_length
+          1_000
+        end
       end
     end
   end