activerecord-jdbcsqlserver-adapter 50.1.0 → 51.0.0

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -48,7 +48,7 @@ module ActiveRecord
         create true
       end
 
-      def structure_dump(filename)
+      def structure_dump(filename, extra_flags)
         command = [
           "defncopy",
           "-S #{Shellwords.escape(configuration['host'])}",
@@ -71,7 +71,7 @@ module ActiveRecord
         File.open(filename, "w") { |file| file.puts dump }
       end
 
-      def structure_load(filename)
+      def structure_load(filename, extra_flags)
         connection.execute File.read(filename)
       end
 

data/lib/activerecord-jdbcsqlserver-adapter.rb

@@ -2,7 +2,7 @@
 require 'active_record/connection_adapters/sqlserver/core_ext/date_time'
 
 # Load the jar file for the jdbc driver
-require_relative './jdbc_mssql_driver_loader'
+require 'jdbc/mssql'
 
 # Standadard arjdbc functionality
 require 'arjdbc/abstract/connection_management'

data/lib/arel/visitors/sqlserver.rb

@@ -95,17 +95,29 @@ module Arel
           collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector
         end
         if o.right.any?
-          collector << " " if o.left
+          collector << SPACE if o.left
           collector = inject_join o.right, collector, ' '
         end
         collector
       end
 
+      def visit_Arel_Nodes_InnerJoin o, collector
+        collector << "INNER JOIN "
+        collector = visit o.left, collector
+        collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
+        if o.right
+          collector << SPACE
+          visit(o.right, collector)
+        else
+          collector
+        end
+      end
+
       def visit_Arel_Nodes_OuterJoin o, collector
         collector << "LEFT OUTER JOIN "
         collector = visit o.left, collector
         collector = visit_Arel_Nodes_SelectStatement_SQLServer_Lock collector, space: true
-        collector << " "
+        collector << SPACE
         visit o.right, collector
       end
 
@@ -190,7 +202,8 @@ module Arel
 
       def primary_Key_From_Table t
         return unless t
-        column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
+        column_name = @connection.schema_cache.primary_keys(t.name) ||
+          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
         column_name ? t[column_name] : nil
       end
 

data/test/bin/setup.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+tag=2017-GA
+
+docker pull metaskills/mssql-server-linux-rails:$tag
+
+container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-rails:$tag)
+if [[ -z $container ]]; then
+  docker run -p 1433:1433 -d metaskills/mssql-server-linux-rails:$tag && sleep 10
+  exit
+fi
+
+container=$(docker ps -q --filter ancestor=metaskills/mssql-server-linux-rails:$tag)
+if [[ -z $container ]]; then
+  docker start $container && sleep 10
+fi

data/test/cases/adapter_test_sqlserver.rb

@@ -13,10 +13,10 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   let(:basic_update_sql) { "UPDATE [customers] SET [address_street] = NULL WHERE [id] = 2" }
   let(:basic_select_sql) { "SELECT * FROM [customers] WHERE ([customers].[id] = 1)" }
 
-  it 'has basic and non-senstive information in the adpaters inspect method' do
+  it 'has basic and non-sensitive information in the adapters inspect method' do
     string = connection.inspect
     string.must_match %r{ActiveRecord::ConnectionAdapters::SQLServerAdapter}
-    string.must_match %r{version\: \d\d\.\d}
+    string.must_match %r{version\: \d+\.\d}
     string.must_match %r{mode: (dblib|jdbc)}
     string.must_match %r{azure: (true|false)}
     string.wont_match %r{host}
@@ -37,10 +37,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     assert_equal 'SQLServer', connection.adapter_name
   end
 
-  it 'supports migrations' do
-    assert connection.supports_migrations?
-  end
-
   it 'support DDL in transactions' do
     assert connection.supports_ddl_transactions?
   end
@@ -145,12 +141,12 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column' do
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_sp)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted_sp)
-      assert_equal '[funny_jokes]', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unquoted_sp)
+      assert_equal 'funny_jokes', connection.send(:query_requires_identity_insert?,@identity_insert_sql_unordered_sp)
     end
 
     it 'return false to #query_requires_identity_insert? for normal SQL' do
@@ -266,23 +262,23 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     end
 
     it 'create integers when limit is 4' do
-      assert_equal 'integer', connection.type_to_sql(:integer, 4)
+      assert_equal 'integer', connection.type_to_sql(:integer, limit: 4)
     end
 
     it 'create integers when limit is 3' do
-      assert_equal 'integer', connection.type_to_sql(:integer, 3)
+      assert_equal 'integer', connection.type_to_sql(:integer, limit: 3)
     end
 
     it 'create smallints when limit is less than 3' do
-      assert_equal 'smallint', connection.type_to_sql(:integer, 2)
-      assert_equal 'smallint', connection.type_to_sql(:integer, 1)
+      assert_equal 'smallint', connection.type_to_sql(:integer, limit: 2)
+      assert_equal 'smallint', connection.type_to_sql(:integer, limit: 1)
     end
 
     it 'create bigints when limit is greateer than 4' do
-      assert_equal 'bigint', connection.type_to_sql(:integer, 5)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 6)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 7)
-      assert_equal 'bigint', connection.type_to_sql(:integer, 8)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 5)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 6)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 7)
+      assert_equal 'bigint', connection.type_to_sql(:integer, limit: 8)
     end
 
     it 'create floats when no limit supplied' do
@@ -427,3 +423,4 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   end
 
 end
+

data/test/cases/coerced_tests.rb

@@ -31,6 +31,9 @@ end
 require 'models/event'
 module ActiveRecord
   class AdapterTest < ActiveRecord::TestCase
+    # I really dont think we can support legacy binds.
+    coerce_tests! :test_select_all_with_legacy_binds
+
     # As far as I can tell, SQL Server does not support null bytes in strings.
     coerce_tests! :test_update_prepared_statement
     coerce_tests! :test_log_invalid_encoding if defined? JRUBY_VERSION # JRuby just happily converts the encoding
@@ -53,14 +56,14 @@ end
 
 require 'models/topic'
 class AttributeMethodsTest < ActiveRecord::TestCase
-  coerce_tests! :test_typecast_attribute_from_select_to_false
+  coerce_tests! %r{typecast attribute from select to false}
   def test_typecast_attribute_from_select_to_false_coerced
     Topic.create(:title => 'Budget')
     topic = Topic.all.merge!(:select => "topics.*, IIF (1 = 2, 1, 0) as is_test").first
     assert !topic.is_test?
   end
 
-  coerce_tests! :test_typecast_attribute_from_select_to_true
+  coerce_tests! %r{typecast attribute from select to true}
   def test_typecast_attribute_from_select_to_true_coerced
     Topic.create(:title => 'Budget')
     topic = Topic.all.merge!(:select => "topics.*, IIF (1 = 1, 1, 0) as is_test").first
@@ -88,6 +91,37 @@ class BasicsTest < ActiveRecord::TestCase
   # Caused in Rails v4.2.5 by adding `firm_id` column in this http://git.io/vBfMs
   # commit. Trust Rails has this covered.
   coerce_tests! :test_find_keeps_multiple_group_values
+
+  def test_update_date_time_attributes
+    Time.use_zone("Eastern Time (US & Canada)") do
+      topic = Topic.find(1)
+      time = Time.zone.parse("2017-07-17 10:56")
+      topic.update_attributes!(written_on: time)
+      assert_equal(time, topic.written_on)
+    end
+  end
+
+  def test_update_date_time_attributes_with_default_timezone_local
+    with_env_tz 'America/New_York' do
+      with_timezone_config default: :local do
+        Time.use_zone("Eastern Time (US & Canada)") do
+          topic = Topic.find(1)
+          time = Time.zone.parse("2017-07-17 10:56")
+          topic.update_attributes!(written_on: time)
+          assert_equal(time, topic.written_on)
+        end
+      end
+    end
+  end
+
+  coerce_tests! %r{column names are quoted when using #from clause and model has ignored columns}
+  def test_column_names_are_quoted_when_using_from_clause_and_model_has_ignored_columns_coerced
+    refute_empty Developer.ignored_columns
+    query = Developer.from("developers").to_sql
+    quoted_id = "#{Developer.quoted_table_name}.#{Developer.quoted_primary_key}"
+
+    assert_match(/SELECT #{Regexp.quote(quoted_id)}.* FROM developers/, query)
+  end
 end
 
 
@@ -119,6 +153,15 @@ end
 
 
 class CalculationsTest < ActiveRecord::TestCase
+  # This fails randomly due to schema cache being lost?
+  coerce_tests! :test_offset_is_kept
+  def test_offset_is_kept_coerced
+    Account.first
+    queries = assert_sql { Account.offset(1).count }
+    assert_equal 1, queries.length
+    assert_match(/OFFSET/, queries.first)
+  end
+
   # Are decimal, not integer.
   coerce_tests! :test_should_return_decimal_average_of_integer_field
   def test_should_return_decimal_average_of_integer_field_coerced
@@ -174,6 +217,29 @@ end
 
 
 
+module ActiveRecord
+  module ConnectionAdapters
+    class QuoteARBaseTest < ActiveRecord::TestCase
+
+      # Use our date format.
+      coerce_tests! :test_quote_ar_object
+      def test_quote_ar_object_coerced
+        value = DatetimePrimaryKey.new(id: @time)
+        assert_equal "'02-14-2017 12:34:56.789'",  @connection.quote(value)
+      end
+
+      # Use our date format.
+      coerce_tests! :test_type_cast_ar_object
+      def test_type_cast_ar_object_coerced
+        value = DatetimePrimaryKey.new(id: @time)
+        assert_equal "02-14-2017 12:34:56.789",  @connection.type_cast(value)
+      end
+
+    end
+  end
+end
+
+
 
 module ActiveRecord
   class Migration
@@ -302,6 +368,10 @@ end
 
 
 module ActiveRecord
+  class DatabaseTasksDumpSchemaCacheTest < ActiveRecord::TestCase
+    # Skip this test with /tmp/my_schema_cache.yml path on Windows.
+    coerce_tests! :test_dump_schema_cache if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+  end
   class DatabaseTasksCreateAllTest < ActiveRecord::TestCase
     # We extend `local_database?` so that common VM IPs can be used.
     coerce_tests! :test_ignores_remote_databases, :test_warning_for_remote_databases
@@ -395,12 +465,6 @@ class FinderTest < ActiveRecord::TestCase
     end
   end if defined? JRUBY_VERSION
 
-  coerce_tests! :test_string_sanitation
-  def test_string_sanitation_coerced
-    assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
-    assert_equal "N'something; select table'", ActiveRecord::Base.sanitize("something; select table")
-  end
-
   coerce_tests! :test_take_and_first_and_last_with_integer_should_use_sql_limit
   def test_take_and_first_and_last_with_integer_should_use_sql_limit_coerced
     assert_sql(/OFFSET 0 ROWS FETCH NEXT @0 ROWS ONLY.* @0 = 3/) { Topic.take(3).entries }
@@ -603,6 +667,15 @@ end
 
 
 
+class PrimaryKeysTest < ActiveRecord::TestCase
+  # Gonna trust Rails core for this. We end up with 2 querys vs 3 asserted
+  # but as far as I can tell, this is only one for us anyway.
+  coerce_tests! :test_create_without_primary_key_no_extra_query
+end
+
+
+
+
 require 'models/task'
 class QueryCacheTest < ActiveRecord::TestCase
   coerce_tests! :test_cache_does_not_wrap_string_results_in_arrays
@@ -646,6 +719,26 @@ class RelationTest < ActiveRecord::TestCase
   # Leave it up to users to format selects/functions so HAVING works correctly.
   coerce_tests! :test_multiple_where_and_having_clauses
   coerce_tests! :test_having_with_binds_for_both_where_and_having
+
+  # Find any limit via our expression.
+  coerce_tests! %r{relations don't load all records in #inspect}
+  def test_relations_dont_load_all_records_in_inspect_coerced
+    assert_sql(/NEXT \? ROWS ONLY/) do
+      Post.all.inspect
+    end
+  end
+
+  # I wanted to add `.order("author_id")` scope to avoid error: Column "posts.id" is invalid in the ORDER BY
+  # However, this pull request on Rails core drops order on exists relation. https://github.com/rails/rails/pull/28699
+  # so we are skipping all together.
+  coerce_tests! :test_empty_complex_chained_relations
+
+  # Use LEN() vs length() function.
+  coerce_tests! :test_reverse_arel_assoc_order_with_function
+  def test_reverse_arel_assoc_order_with_function_coerced
+    topics = Topic.order(Arel.sql("LEN(title)") => :asc).reverse_order
+    assert_equal topics(:second).title, topics.first.title
+  end
 end
 
 
@@ -677,9 +770,6 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_match %r{t.decimal\s+"atoms_in_universe",\s+precision: 38}, output
   end
 
-  # This accidently returns the wrong number because of our tables too.
-  coerce_tests! :test_types_line_up
-
   # This is a poorly written test and really does not catch the bottom'ness it is meant too. Ours throw it off.
   coerce_tests! :test_foreign_keys_are_dumped_at_the_bottom_to_circumvent_dependency_issues
 
@@ -843,3 +933,19 @@ module ActiveRecord
     #coerce_tests! :test_find_does_not_use_statement_cache_if_table_name_is_changed
   end
 end
+
+
+
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SchemaCacheTest < ActiveRecord::TestCase
+      private
+      # We need to give the full path for this to work.
+      def schema_dump_path
+        File.join ARTest::SQLServer.root_activerecord, 'test/assets/schema_dump_5_1.yml'
+      end
+    end
+  end
+end
+

data/test/cases/column_test_sqlserver.rb

@@ -36,7 +36,7 @@ class ColumnTestSQLServer < ActiveRecord::TestCase
     it 'bigint(8)' do
       col = column('bigint')
       col.sql_type.must_equal           'bigint(8)'
-      col.type.must_equal               :bigint
+      col.type.must_equal               :integer
       col.null.must_equal               true
       col.default.must_equal            42
       obj.bigint.must_equal             42

data/test/cases/helper_sqlserver.rb

@@ -9,7 +9,7 @@ require 'support/load_schema_sqlserver'
 require 'support/coerceable_test_sqlserver'
 require 'support/sql_counter_sqlserver'
 require 'support/connection_reflection'
-require 'mocha/minitest'
+require 'mocha/mini_test'
 
 module ActiveRecord
   class TestCase < ActiveSupport::TestCase
@@ -23,9 +23,14 @@ module ActiveRecord
 
     let(:logger) { ActiveRecord::Base.logger }
 
+    setup :ensure_clean_rails_env
 
     private
 
+    def ensure_clean_rails_env
+      Rails.instance_variable_set(:@_env, nil) if defined?(::Rails)
+    end
+
     def host_windows?
       RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     end

data/test/cases/pessimistic_locking_test_sqlserver.rb

@@ -46,23 +46,40 @@ class PessimisticLockingTestSQLServer < ActiveRecord::TestCase
       end
     end
 
-    it 'reload with lock when #lock! called' do
-      assert_nothing_raised do
-        Person.transaction do
-          person = Person.find 1
-          old, person.first_name = person.first_name, 'fooman'
-          person.lock!
-          assert_equal old, person.first_name
-        end
-      end
-    end
-
     it 'can add a custom lock directive' do
       assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(HOLDLOCK, ROWLOCK\)| do
         Person.lock('WITH(HOLDLOCK, ROWLOCK)').load
       end
     end
 
+    describe 'joining tables' do
+
+      it 'joined tables use updlock by default' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(UPDLOCK\) INNER JOIN \[readers\] WITH\(UPDLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock(true).joins(:readers).load
+        end
+      end
+
+      it 'joined tables can use custom lock directive' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(NOLOCK\) INNER JOIN \[readers\] WITH\(NOLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock('WITH(NOLOCK)').joins(:readers).load
+        end
+      end
+
+      it 'left joined tables use updlock by default' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(UPDLOCK\) LEFT OUTER JOIN \[readers\] WITH\(UPDLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock(true).left_joins(:readers).load
+        end
+      end
+
+      it 'left joined tables can use custom lock directive' do
+        assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH\(NOLOCK\) LEFT OUTER JOIN \[readers\] WITH\(NOLOCK\)\s+ON \[readers\]\.\[person_id\] = \[people\]\.\[id\]| do
+          Person.lock('WITH(NOLOCK)').left_joins(:readers).load
+        end
+      end
+
+    end
+
   end
 
   describe 'For paginated finds' do