Merge pull request #653 from matthewdunbar/master

matthewdunbar · web-flow · commit d4b6e4134e15 · 2018-09-28T07:41:17.000-04:00
Upgrade to Rails 5.2
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,10 @@ env:
     - ACTIVERECORD_UNITTEST_HOST=localhost
     - ACTIVERECORD_UNITTEST_DATASERVER=localhost
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 before_install:
   - export PATH=/opt/local/bin:$PATH
   - docker info
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'sqlite3'
-gem 'minitest', '< 5.3.4'
 gem 'bcrypt'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.6
+5.2.0
diff --git a/activerecord-sqlserver-adapter.gemspec b/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
diff --git a/circle.yml b/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.2.10 bundle install
+    - rvm-exec 2.3.7 bundle install
+    - rvm-exec 2.4.4 bundle install
+    - rvm-exec 2.5.1 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.2.10 bundle exec rake test
+    - rvm-exec 2.3.7 bundle exec rake test
+    - rvm-exec 2.4.4 bundle exec rake test
+    - rvm-exec 2.5.1 bundle exec rake test
diff --git a/lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb b/lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb
@@ -9,19 +9,7 @@ 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)
-
-            Arel::SelectManager.new(subquery).project(select_value)
+            super(relation.unscope(:order), column_name, distinct)
           end
         end
       end
@@ -30,10 +18,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
diff --git a/lib/active_record/connection_adapters/sqlserver/database_statements.rb b/lib/active_record/connection_adapters/sqlserver/database_statements.rb
@@ -33,10 +33,6 @@ def exec_update(sql, name, binds)
           super(sql, name, binds).rows.first.first
         end
 
-        def supports_statement_cache?
-          true
-        end
-
         def begin_db_transaction
           do_execute 'BEGIN TRANSACTION'
         end
@@ -77,7 +73,7 @@ def release_savepoint(name = current_savepoint_name)
 
         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
@@ -88,6 +84,21 @@ def can_perform_case_insensitive_comparison_for?(column)
         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 +248,8 @@ def sp_executesql(sql, name, binds, options = {})
         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 +267,12 @@ def sp_executesql_sql_type(attr)
         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 +318,7 @@ def exclude_output_inserted_table_name?(table_name, sql)
         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)
diff --git a/lib/active_record/connection_adapters/sqlserver/schema_creation.rb b/lib/active_record/connection_adapters/sqlserver/schema_creation.rb
@@ -8,7 +8,8 @@ class SchemaCreation < AbstractAdapter::SchemaCreation
         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
diff --git a/lib/active_record/connection_adapters/sqlserver/schema_dumper.rb b/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 @@ def schema_limit(column)
 
         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)
diff --git a/lib/active_record/connection_adapters/sqlserver/schema_statements.rb b/lib/active_record/connection_adapters/sqlserver/schema_statements.rb
@@ -32,22 +32,33 @@ def drop_table(table_name, options = {})
           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
@@ -235,7 +246,8 @@ def columns_for_distinct(columns, orders)
               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,6 +266,10 @@ def change_column_null(table_name, column_name, allow_null, default = nil)
           do_execute sql
         end
 
+        def create_schema_dumper(options)
+          SQLServer::SchemaDumper.create(self, options)
+        end
+
         private
 
         def data_source_sql(name = nil, type: nil)
diff --git a/lib/active_record/connection_adapters/sqlserver/type/json.rb b/lib/active_record/connection_adapters/sqlserver/type/json.rb
@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Type
-        class Json < ActiveRecord::Type::Internal::AbstractJson
+        class Json < ActiveRecord::Type::Json
 
         end
       end
diff --git a/lib/active_record/connection_adapters/sqlserver/type/time_value_fractional.rb b/lib/active_record/connection_adapters/sqlserver/type/time_value_fractional.rb
@@ -14,15 +14,15 @@ def apply_seconds_precision(value)
 
           def seconds_precision(value)
             return 0 if fractional_scale == 0
-            seconds = value.send(fractional_property).to_f / fractional_operator.to_f
-            seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).round(fractional_scale)
+            seconds = value.send(fractional_property).to_d / fractional_operator.to_d
+            seconds = ((seconds * (1 / fractional_precision)).round / (1 / fractional_precision)).truncate(fractional_scale)
             (seconds * fractional_operator).round(0).to_i
           end
 
           def quote_fractional(value)
             return 0 if fractional_scale == 0
             frac_seconds = seconds_precision(value)
-            seconds = (frac_seconds.to_f / fractional_operator.to_f).round(fractional_scale)
+            seconds = (frac_seconds.to_d / fractional_operator.to_d).round(fractional_scale)
             seconds.to_d.to_s.split('.').last.to(fractional_scale-1)
           end
 
@@ -39,7 +39,7 @@ def fractional_operator
           end
 
           def fractional_precision
-            0.00333
+            BigDecimal('0.00333')
           end
 
           def fractional_scale
@@ -68,7 +68,7 @@ def fractional_digits
           end
 
           def fractional_precision
-            0.0000001
+            BigDecimal('0.0000001')
           end
 
           def fractional_scale
diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -34,7 +34,6 @@ class SQLServerAdapter < AbstractAdapter
               SQLServer::Quoting,
               SQLServer::DatabaseStatements,
               SQLServer::Showplan,
-              SQLServer::SchemaDumper,
               SQLServer::SchemaStatements,
               SQLServer::DatabaseLimits,
               SQLServer::DatabaseTasks
@@ -253,7 +252,7 @@ def combine_bind_parameters(from_clause: [], join_clause: [], where_clause: [],
 
       # === Abstract Adapter (Misc Support) =========================== #
 
-      def initialize_type_map(m)
+      def initialize_type_map(m = type_map)
         m.register_type              %r{.*},            SQLServer::Type::UnicodeString.new
         # Exact Numerics
         register_class_with_limit m, 'bigint(8)',         SQLServer::Type::BigInteger
diff --git a/lib/active_record/tasks/sqlserver_database_tasks.rb b/lib/active_record/tasks/sqlserver_database_tasks.rb
@@ -49,9 +49,11 @@ def purge
       end
 
       def structure_dump(filename, extra_flags)
+        server_arg = "-S #{Shellwords.escape(configuration['host'])}"
+        server_arg += ":#{Shellwords.escape(configuration['port'])}" if configuration['port']
         command = [
           "defncopy-ttds",
-          "-S #{Shellwords.escape(configuration['host'])}",
+          server_arg,
           "-D #{Shellwords.escape(configuration['database'])}",
           "-U #{Shellwords.escape(configuration['username'])}",
           "-P #{Shellwords.escape(configuration['password'])}",
diff --git a/lib/arel/visitors/sqlserver.rb b/lib/arel/visitors/sqlserver.rb
@@ -14,7 +14,7 @@ class SQLServer < Arel::Visitors::ToSql
       # SQLServer ToSql/Visitor (Overides)
 
       def visit_Arel_Nodes_BindParam o, collector
-        collector.add_bind(o) { |i| "@#{i-1}" }
+        collector.add_bind(o.value) { |i| "@#{i-1}" }
       end
 
       def visit_Arel_Nodes_Bin o, collector
diff --git a/lib/arel_sqlserver.rb b/lib/arel_sqlserver.rb
@@ -1,3 +1,2 @@
 require 'arel'
-require 'arel/visitors/bind_visitor'
 require 'arel/visitors/sqlserver'
diff --git a/test/cases/coerced_tests.rb b/test/cases/coerced_tests.rb
diff --git a/test/cases/helper_sqlserver.rb b/test/cases/helper_sqlserver.rb
diff --git a/test/cases/migration_test_sqlserver.rb b/test/cases/migration_test_sqlserver.rb
diff --git a/test/cases/order_test_sqlserver.rb b/test/cases/order_test_sqlserver.rb
