activerecord-sqlserver-adapter 5.1.6 → 5.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed52e9558d488ea412397afde7def592ba77bc02
-  data.tar.gz: 74fa1e05812b1dceb9adc7c70b54340dcd8592f1
+  metadata.gz: 377130fc57eb80986c8ba867952e53d05bd45716
+  data.tar.gz: 375ddc75d6a352aec3546a0ceba47e92aa08c048
 SHA512:
-  metadata.gz: 260d513189436bcc2d1a1f109e737598f6e466872cb9e7a7d3c183f8c1088877402bbd4b8dc3b7c506e1522759ce02c7ce538d0d9d42b6436d393fe5c2e625e7
-  data.tar.gz: f95f71dc632eda2c413d1d1224664ce7d48748bdf3ff541f7cee6034535645880b2ea52700db9fbcf4bf615be79ccab2c5a65f2e9883fe4d6d35736bee0785a8
+  metadata.gz: c0d096eb7dbc408c115dc1f694455f67923caca5e3921d23641afc137ac4852d7fdd033d8b4ddc641ad2187b1bc0b83229fe8e81da20fff37b1c42f1825e9239
+  data.tar.gz: d5170789fb99e9aea3642c22c9c3e39a0ccb1ee78b0a3015a046d2dd5a179736a61f8483dd878d06c19535f0e32e4a15766ecc1474f2b140b4cb3b362c48d7d8

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,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.5
+      env: TARGET_VERSION=2.4.5
+    - name: 2.5.3
+      env: TARGET_VERSION=2.5.3
+    - name: 2.6.0
+      env: TARGET_VERSION=2.6.0

data/CHANGELOG.md

@@ -1,54 +1,14 @@
-## v5.1.6
-
-#### Added
-
-* Use lock hint when joining table in query.
-
-
-## v5.1.5
-
-#### Fixed
-
-* Memoize `@@version` queries. Fixes #632
-
-
-## v5.1.4
-
-#### Fixed
-
-* Add case insensitive comparison for better performance with CI collations. Fixes #624
-
-
-## v5.1.3
+## v5.2.0.rc1
 
 #### 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.

data/Dockerfile

@@ -0,0 +1,14 @@
+ARG TARGET_VERSION=2.5.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"]

data/Gemfile

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

data/README.md

@@ -14,13 +14,13 @@ Both TinyTDS and the Rails SQL Server Adapter are MIT-licensed open source proje
 
 ## 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 +136,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

data/VERSION

@@ -1 +1 @@
-5.1.6
+5.2.0.rc1

data/activerecord-sqlserver-adapter.gemspec

@@ -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 'tiny_tds'
 end

data/circle.yml

@@ -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

data/docker-compose.ci.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"

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

@@ -9,19 +9,16 @@ module ActiveRecord
           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 @@ module ActiveRecord
 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

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

@@ -2,7 +2,6 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module DatabaseLimits
-
         def table_alias_length
           128
         end
@@ -32,7 +31,7 @@ module ActiveRecord
         end
 
         def in_clause_length
-          65_536
+          10_000
         end
 
         def sql_query_length
@@ -43,6 +42,18 @@ module ActiveRecord
           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

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

@@ -33,10 +33,6 @@ module ActiveRecord
           super(sql, name, binds).rows.first.first
         end
 
-        def supports_statement_cache?
-          true
-        end
-
         def begin_db_transaction
           do_execute 'BEGIN TRANSACTION'
         end
@@ -77,17 +73,55 @@ module ActiveRecord
 
         def case_sensitive_comparison(table, attribute, column, value)
           if column.collation && !column.case_sensitive?
-            table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
+            table[attribute].eq(Arel::Nodes::Bin.new(value))
           else
             super
           end
         end
 
+        # We should propose this change to Rails team
+        def insert_fixtures_set(fixture_set, tables_to_delete = [])
+          fixture_inserts = []
+
+          fixture_set.each do |table_name, fixtures|
+            fixtures.each_slice(insert_rows_length) do |batch|
+              fixture_inserts << build_fixture_sql(batch, table_name)
+            end
+          end
+
+          table_deletes = tables_to_delete.map { |table| "DELETE FROM #{quote_table_name table}".dup }
+          total_sql = Array.wrap(combine_multi_statements(table_deletes + fixture_inserts))
+
+          disable_referential_integrity do
+            transaction(requires_new: true) do
+              total_sql.each do |sql|
+                execute sql, "Fixtures Load"
+                yield if block_given?
+              end
+            end
+          end
+        end
+
         def can_perform_case_insensitive_comparison_for?(column)
           column.type == :string && (!column.collation || column.case_sensitive?)
         end
         private :can_perform_case_insensitive_comparison_for?
 
+        def combine_multi_statements(total_sql)
+          total_sql
+        end
+        private :combine_multi_statements
+
+        def default_insert_value(column)
+          if column.is_identity?
+            table_name = quote(quote_table_name(column.table_name))
+            Arel.sql("IDENT_CURRENT(#{table_name}) + IDENT_INCR(#{table_name})")
+          else
+            super
+          end
+        end
+        private :default_insert_value
+
         # === SQLServer Specific ======================================== #
 
         def execute_procedure(proc_name, *variables)
@@ -237,6 +271,8 @@ module ActiveRecord
         def sp_executesql_types_and_parameters(binds)
           types, params = [], []
           binds.each_with_index do |attr, index|
+            attr = attr.value if attr.is_a?(Arel::Nodes::BindParam)
+
             types << "@#{index} #{sp_executesql_sql_type(attr)}"
             params << sp_executesql_sql_param(attr)
           end
@@ -254,12 +290,12 @@ module ActiveRecord
         end
 
         def sp_executesql_sql_param(attr)
-          case attr.value_for_database
+          case value = attr.value_for_database
           when Type::Binary::Data,
                ActiveRecord::Type::SQLServer::Data
-            quote(attr.value_for_database)
+            quote(value)
           else
-            quote(type_cast(attr.value_for_database))
+            quote(type_cast(value))
           end
         end
 
@@ -305,7 +341,7 @@ module ActiveRecord
         end
 
         def exec_insert_requires_identity?(sql, pk, binds)
-          query_requires_identity_insert?(sql) if pk && binds.map(&:name).include?(pk)
+          query_requires_identity_insert?(sql)
         end
 
         def query_requires_identity_insert?(sql)

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

@@ -8,7 +8,8 @@ module ActiveRecord
         def visit_TableDefinition(o)
           if o.as
             table_name = quote_table_name(o.temporary ? "##{o.name}" : o.name)
-            projections, source = @conn.to_sql(o.as).match(%r{SELECT\s+(.*)?\s+FROM\s+(.*)?}).captures
+            query = o.as.respond_to?(:to_sql) ? o.as.to_sql : o.as
+            projections, source = query.match(%r{SELECT\s+(.*)?\s+FROM\s+(.*)?}).captures
             select_into = "SELECT #{projections} INTO #{table_name} FROM #{source}"
           else
             o.instance_variable_set :@as, nil

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module SQLServer
-      module SchemaDumper
+      class SchemaDumper < ConnectionAdapters::SchemaDumper
 
         SQLSEVER_NO_LIMIT_TYPES = [
           'text',
@@ -24,7 +24,7 @@ module ActiveRecord
 
         def schema_collation(column)
           return unless column.collation
-          column.collation if column.collation != collation
+          column.collation if column.collation != @connection.collation
         end
 
         def default_primary_key?(column)

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

@@ -32,22 +32,33 @@ module ActiveRecord
           end
         end
 
-        def indexes(table_name, name = nil)
-          data = select("EXEC sp_helpindex #{quote(table_name)}", name) rescue []
+        def indexes(table_name)
+          data = select("EXEC sp_helpindex #{quote(table_name)}", "SCHEMA") rescue []
+
           data.reduce([]) do |indexes, index|
             index = index.with_indifferent_access
+
             if index[:index_description] =~ /primary key/
               indexes
             else
               name    = index[:index_name]
               unique  = index[:index_description] =~ /unique/
               where   = select_value("SELECT [filter_definition] FROM sys.indexes WHERE name = #{quote(name)}")
-              columns = index[:index_keys].split(',').map do |column|
+              orders  = {}
+              columns = []
+
+              index[:index_keys].split(',').each do |column|
                 column.strip!
-                column.gsub! '(-)', '' if column.ends_with?('(-)')
-                column
+
+                if column.ends_with?('(-)')
+                  column.gsub! '(-)', ''
+                  orders[column] = :desc
+                end
+
+                columns << column
               end
-              indexes << IndexDefinition.new(table_name, name, unique, columns, nil, nil, where)
+
+              indexes << IndexDefinition.new(table_name, name, unique, columns, where: where, orders: orders)
             end
           end
         end
@@ -209,7 +220,8 @@ module ActiveRecord
           case type.to_s
           when 'integer'
             case limit
-            when 1..2       then  'smallint'
+            when 1          then  'tinyint'
+            when 2          then  'smallint'
             when 3..4, nil  then  'integer'
             when 5..8       then  'bigint'
             else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
@@ -235,7 +247,8 @@ module ActiveRecord
               s.gsub(/\s+(?:ASC|DESC)\b/i, '')
                .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
-          [super, *order_columns].join(', ')
+
+          (order_columns << super).join(", ")
         end
 
         def update_table_definition(table_name, base)
@@ -254,13 +267,17 @@ module ActiveRecord
           do_execute sql
         end
 
+        def create_schema_dumper(options)
+          SQLServer::SchemaDumper.create(self, options)
+        end
+
         private
 
         def data_source_sql(name = nil, type: nil)
           scope = quoted_scope name, type: type
           table_name = lowercase_schema_reflection_sql 'TABLE_NAME'
           sql = "SELECT #{table_name}"
-          sql << ' FROM INFORMATION_SCHEMA.TABLES'
+          sql << ' FROM INFORMATION_SCHEMA.TABLES WITH (NOLOCK)'
           sql << ' WHERE TABLE_CATALOG = DB_NAME()'
           sql << " AND TABLE_SCHEMA = #{quote(scope[:schema])}"
           sql << " AND TABLE_NAME = #{quote(scope[:name])}" if scope[:name]
@@ -399,11 +416,13 @@ module ActiveRecord
             ci[:default_function] = begin
               default = ci[:default_value]
               if default.nil? && view_exists
-                default = select_value "
+                default = select_value %{
                   SELECT c.COLUMN_DEFAULT
                   FROM #{database}.INFORMATION_SCHEMA.COLUMNS c
-                  WHERE c.TABLE_NAME = '#{view_tblnm}'
-                  AND c.COLUMN_NAME = '#{views_real_column_name(table_name, ci[:name])}'".squish, 'SCHEMA'
+                  WHERE
+                    c.TABLE_NAME = '#{view_tblnm}'
+                    AND c.COLUMN_NAME = '#{views_real_column_name(table_name, ci[:name])}'
+                }.squish, 'SCHEMA'
               end
               case default
               when nil
@@ -422,7 +441,7 @@ module ActiveRecord
                        else ci[:type]
                        end
                 value = default.match(/\A\((.*)\)\Z/m)[1]
-                value = select_value "SELECT CAST(#{value} AS #{type}) AS value", 'SCHEMA'
+                value = select_value("SELECT CAST(#{value} AS #{type}) AS value", 'SCHEMA')
                 [value, nil]
               end
             end
@@ -495,7 +514,7 @@ module ActiveRecord
           @view_information ||= {}
           @view_information[table_name] ||= begin
             identifier = SQLServer::Utils.extract_identifiers(table_name)
-            view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = #{quote(identifier.object)}", 'SCHEMA'
+            view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WITH (NOLOCK) WHERE TABLE_NAME = #{quote(identifier.object)}", 'SCHEMA'
             if view_info
               view_info = view_info.with_indifferent_access
               if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000