ibm_db 5.6.1 → 5.7.0

data/test/cases/reload_models_test.rb

@@ -5,22 +5,26 @@ require "models/owner"
 require "models/pet"
 
 class ReloadModelsTest < ActiveRecord::TestCase
-  include ActiveSupport::Testing::Isolation
+  if ENV["ARCONN"] != "ibm_db" && !in_memory_db?
+    include ActiveSupport::Testing::Isolation
+  end
 
-  fixtures :pets, :owners
+  unless in_memory_db?
+    fixtures :pets, :owners
 
-  def test_has_one_with_reload
-    pet = Pet.find_by_name("parrot")
-    pet.owner = Owner.find_by_name("ashley")
+    def test_has_one_with_reload
+      pet = Pet.find_by_name("parrot")
+      pet.owner = Owner.find_by_name("ashley")
 
-    # Reload the class Owner, simulating auto-reloading of model classes in a
-    # development environment. Note that meanwhile the class Pet is not
-    # reloaded, simulating a class that is present in a plugin.
-    Object.class_eval { remove_const :Owner }
-    Kernel.load(File.expand_path("../models/owner.rb", __dir__))
+      # Reload the class Owner, simulating auto-reloading of model classes in a
+      # development environment. Note that meanwhile the class Pet is not
+      # reloaded, simulating a class that is present in a plugin.
+      Object.class_eval { remove_const :Owner }
+      Kernel.load(File.expand_path("../models/owner.rb", __dir__))
 
-    pet = Pet.find_by_name("parrot")
-    pet.owner = Owner.find_by_name("ashley")
-    assert_equal pet.owner, Owner.find_by_name("ashley")
+      pet = Pet.find_by_name("parrot")
+      pet.owner = Owner.find_by_name("ashley")
+      assert_equal pet.owner, Owner.find_by_name("ashley")
+    end
   end
-end unless in_memory_db?
+end

data/test/cases/reserved_word_test.rb

@@ -28,7 +28,7 @@ class ReservedWordTest < ActiveRecord::TestCase
   end
 
   def setup
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Base.lease_connection
     @connection.create_table :select, force: true
     @connection.create_table :distinct, force: true
     @connection.create_table :distinct_select, id: false, force: true do |t|
@@ -69,6 +69,7 @@ class ReservedWordTest < ActiveRecord::TestCase
 
   def test_change_columns
     assert_nothing_raised { @connection.change_column_default(:group, :order, "whatever") }
+    skip "IBM_DB: SQL0190N - Column datatype change to CLOB/TEXT not supported on existing columns" if ActiveRecord::Base.connection.adapter_name.match?(/ibm/i)
     assert_nothing_raised { @connection.change_column("group", "order", :text, default: nil) }
     assert_nothing_raised { @connection.rename_column(:group, :order, :values) }
   end

data/test/cases/result_test.rb

@@ -12,28 +12,6 @@ module ActiveRecord
       ])
     end
 
-    test "map! is deprecated" do
-      assert_deprecated do
-        result.map! { nil }
-      end
-      assert_equal [
-        { "col_1" => "row 1 col 1", "col_2" => "row 1 col 2" },
-        { "col_1" => "row 2 col 1", "col_2" => "row 2 col 2" },
-        { "col_1" => "row 3 col 1", "col_2" => "row 3 col 2" },
-      ], result.to_a
-    end
-
-    test "collect! is deprecated" do
-      assert_deprecated do
-        result.collect! { nil }
-      end
-      assert_equal [
-        { "col_1" => "row 1 col 1", "col_2" => "row 1 col 2" },
-        { "col_1" => "row 2 col 1", "col_2" => "row 2 col 2" },
-        { "col_1" => "row 3 col 1", "col_2" => "row 3 col 2" },
-      ], result.to_a
-    end
-
     test "includes_column?" do
       assert result.includes_column?("col_1")
       assert_not result.includes_column?("foo")
@@ -137,5 +115,19 @@ module ActiveRecord
 
       assert_equal [[1.1, 2.2], [3.3, 4.4]], result.cast_values("col1" => Type::Float.new)
     end
+
+    test "each when two columns have the same name" do
+      result = Result.new(["foo", "foo"], [
+        ["col 1", "col 2"],
+        ["col 1", "col 2"],
+        ["col 1", "col 2"],
+      ])
+
+      assert_equal 2, result.columns.size
+      result.each do |row|
+        assert_equal 1, row.size
+        assert_equal "col 2", row["foo"]
+      end
+    end
   end
 end

data/test/cases/sanitize_test.rb

@@ -11,29 +11,33 @@ class SanitizeTest < ActiveRecord::TestCase
   end
 
   def test_sanitize_sql_array_handles_string_interpolation
-    quoted_bambi = ActiveRecord::Base.connection.quote_string("Bambi")
+    quoted_bambi = ActiveRecord::Base.lease_connection.quote_string("Bambi")
     assert_equal "name='#{quoted_bambi}'", Binary.sanitize_sql_array(["name='%s'", "Bambi"])
     assert_equal "name='#{quoted_bambi}'", Binary.sanitize_sql_array(["name='%s'", "Bambi".mb_chars])
-    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote_string("Bambi\nand\nThumper")
+    quoted_bambi_and_thumper = ActiveRecord::Base.lease_connection.quote_string("Bambi\nand\nThumper")
     assert_equal "name='#{quoted_bambi_and_thumper}'", Binary.sanitize_sql_array(["name='%s'", "Bambi\nand\nThumper"])
     assert_equal "name='#{quoted_bambi_and_thumper}'", Binary.sanitize_sql_array(["name='%s'", "Bambi\nand\nThumper".mb_chars])
   end
 
   def test_sanitize_sql_array_handles_bind_variables
-    quoted_bambi = ActiveRecord::Base.connection.quote("Bambi")
+    quoted_bambi = ActiveRecord::Base.lease_connection.quote("Bambi")
     assert_equal "name=#{quoted_bambi}", Binary.sanitize_sql_array(["name=?", "Bambi"])
     assert_equal "name=#{quoted_bambi}", Binary.sanitize_sql_array(["name=?", "Bambi".mb_chars])
-    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
+    quoted_bambi_and_thumper = ActiveRecord::Base.lease_connection.quote("Bambi\nand\nThumper")
     assert_equal "name=#{quoted_bambi_and_thumper}", Binary.sanitize_sql_array(["name=?", "Bambi\nand\nThumper"])
     assert_equal "name=#{quoted_bambi_and_thumper}", Binary.sanitize_sql_array(["name=?", "Bambi\nand\nThumper".mb_chars])
   end
 
   def test_sanitize_sql_array_handles_named_bind_variables
-    quoted_bambi = ActiveRecord::Base.connection.quote("Bambi")
+    quoted_bambi = ActiveRecord::Base.lease_connection.quote("Bambi")
     assert_equal "name=#{quoted_bambi}", Binary.sanitize_sql_array(["name=:name", name: "Bambi"])
-    assert_equal "name=#{quoted_bambi} AND id=1", Binary.sanitize_sql_array(["name=:name AND id=:id", name: "Bambi", id: 1])
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "name=#{quoted_bambi} AND id='1'", Binary.sanitize_sql_array(["name=:name AND id=:id", name: "Bambi", id: 1])
+    else
+      assert_equal "name=#{quoted_bambi} AND id=1", Binary.sanitize_sql_array(["name=:name AND id=:id", name: "Bambi", id: 1])
+    end
 
-    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
+    quoted_bambi_and_thumper = ActiveRecord::Base.lease_connection.quote("Bambi\nand\nThumper")
     assert_equal "name=#{quoted_bambi_and_thumper}", Binary.sanitize_sql_array(["name=:name", name: "Bambi\nand\nThumper"])
     assert_equal "name=#{quoted_bambi_and_thumper} AND name2=#{quoted_bambi_and_thumper}", Binary.sanitize_sql_array(["name=:name AND name2=:name", name: "Bambi\nand\nThumper"])
   end
@@ -71,6 +75,11 @@ class SanitizeTest < ActiveRecord::TestCase
     assert_equal "normal string 42", Binary.sanitize_sql_like("normal string 42", "!")
   end
 
+  def test_sanitize_sql_like_with_wildcard_as_escape_character
+    assert_equal "1__000_%", Binary.sanitize_sql_like("1_000%", "_")
+    assert_equal "1%_000%%", Binary.sanitize_sql_like("1_000%", "%")
+  end
+
   def test_sanitize_sql_like_example_use_case
     searchable_post = Class.new(Post) do
       def self.search_as_method(term)
@@ -82,15 +91,33 @@ class SanitizeTest < ActiveRecord::TestCase
       }
     end
 
-    assert_sql(/LIKE '20!% !_reduction!_!!'/) do
+    query = if searchable_post.lease_connection.prepared_statements
+      if current_adapter?(:PostgreSQLAdapter)
+        /title LIKE \$1/
+      else
+        /title LIKE \?/
+      end
+    else
+      /LIKE '20!% !_reduction!_!!'/
+    end
+
+    assert_queries_match(query) do
       searchable_post.search_as_method("20% _reduction_!").to_a
     end
 
-    assert_sql(/LIKE '20!% !_reduction!_!!'/) do
+    assert_queries_match(query) do
       searchable_post.search_as_scope("20% _reduction_!").to_a
     end
   end
 
+  def test_disallow_raw_sql_with_unknown_attribute_string
+    assert_raise(ActiveRecord::UnknownAttributeReference) { Binary.disallow_raw_sql!(["field(id, ?)"]) }
+  end
+
+  def test_disallow_raw_sql_with_unknown_attribute_sql_literal
+    assert_nothing_raised { Binary.disallow_raw_sql!([Arel.sql("field(id, ?)")]) }
+  end
+
   def test_bind_arity
     assert_nothing_raised                                { bind "" }
     assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "", 1 }
@@ -101,8 +128,13 @@ class SanitizeTest < ActiveRecord::TestCase
   end
 
   def test_named_bind_variables
-    assert_equal "1", bind(":a", a: 1) # ' ruby-mode
-    assert_equal "1 1", bind(":a :a", a: 1)  # ' ruby-mode
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'1'", bind(":a", a: 1) # ' ruby-mode
+      assert_equal "'1' '1'", bind(":a :a", a: 1)  # ' ruby-mode
+    else
+      assert_equal "1", bind(":a", a: 1) # ' ruby-mode
+      assert_equal "1 1", bind(":a :a", a: 1)  # ' ruby-mode
+    end
 
     assert_nothing_raised { bind("'+00:00'", foo: "bar") }
   end
@@ -126,49 +158,70 @@ class SanitizeTest < ActiveRecord::TestCase
   end
 
   def test_bind_enumerable
-    quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
+    quoted_abc = %(#{ActiveRecord::Base.lease_connection.quote('a')},#{ActiveRecord::Base.lease_connection.quote('b')},#{ActiveRecord::Base.lease_connection.quote('c')})
 
-    assert_equal "1,2,3", bind("?", [1, 2, 3])
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'1','2','3'", bind("?", [1, 2, 3])
+    else
+      assert_equal "1,2,3", bind("?", [1, 2, 3])
+    end
     assert_equal quoted_abc, bind("?", %w(a b c))
 
-    assert_equal "1,2,3", bind(":a", a: [1, 2, 3])
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'1','2','3'", bind(":a", a: [1, 2, 3])
+    else
+      assert_equal "1,2,3", bind(":a", a: [1, 2, 3])
+    end
     assert_equal quoted_abc, bind(":a", a: %w(a b c)) # '
 
-    assert_equal "1,2,3", bind("?", SimpleEnumerable.new([1, 2, 3]))
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'1','2','3'", bind("?", SimpleEnumerable.new([1, 2, 3]))
+    else
+      assert_equal "1,2,3", bind("?", SimpleEnumerable.new([1, 2, 3]))
+    end
     assert_equal quoted_abc, bind("?", SimpleEnumerable.new(%w(a b c)))
 
-    assert_equal "1,2,3", bind(":a", a: SimpleEnumerable.new([1, 2, 3]))
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'1','2','3'", bind(":a", a: SimpleEnumerable.new([1, 2, 3]))
+    else
+      assert_equal "1,2,3", bind(":a", a: SimpleEnumerable.new([1, 2, 3]))
+    end
     assert_equal quoted_abc, bind(":a", a: SimpleEnumerable.new(%w(a b c))) # '
   end
 
   def test_bind_empty_enumerable
-    quoted_nil = ActiveRecord::Base.connection.quote(nil)
+    quoted_nil = ActiveRecord::Base.lease_connection.quote(nil)
     assert_equal quoted_nil, bind("?", [])
     assert_equal " in (#{quoted_nil})", bind(" in (?)", [])
     assert_equal "foo in (#{quoted_nil})", bind("foo in (?)", [])
   end
 
   def test_bind_range
-    quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
-    assert_equal "0", bind("?", 0..0)
-    assert_equal "1,2,3", bind("?", 1..3)
+    quoted_abc = %(#{ActiveRecord::Base.lease_connection.quote('a')},#{ActiveRecord::Base.lease_connection.quote('b')},#{ActiveRecord::Base.lease_connection.quote('c')})
+    if current_adapter?(:Mysql2Adapter, :TrilogyAdapter)
+      assert_equal "'0'", bind("?", 0..0)
+      assert_equal "'1','2','3'", bind("?", 1..3)
+    else
+      assert_equal "0", bind("?", 0..0)
+      assert_equal "1,2,3", bind("?", 1..3)
+    end
     assert_equal quoted_abc, bind("?", "a"..."d")
   end
 
   def test_bind_empty_range
-    quoted_nil = ActiveRecord::Base.connection.quote(nil)
+    quoted_nil = ActiveRecord::Base.lease_connection.quote(nil)
     assert_equal quoted_nil, bind("?", 0...0)
     assert_equal quoted_nil, bind("?", "a"..."a")
   end
 
   def test_bind_empty_string
-    quoted_empty = ActiveRecord::Base.connection.quote("")
+    quoted_empty = ActiveRecord::Base.lease_connection.quote("")
     assert_equal quoted_empty, bind("?", "")
   end
 
   def test_bind_chars
-    quoted_bambi = ActiveRecord::Base.connection.quote("Bambi")
-    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
+    quoted_bambi = ActiveRecord::Base.lease_connection.quote("Bambi")
+    quoted_bambi_and_thumper = ActiveRecord::Base.lease_connection.quote("Bambi\nand\nThumper")
     assert_equal "name=#{quoted_bambi}", bind("name=?", "Bambi")
     assert_equal "name=#{quoted_bambi_and_thumper}", bind("name=?", "Bambi\nand\nThumper")
     assert_equal "name=#{quoted_bambi}", bind("name=?", "Bambi".mb_chars)
@@ -178,15 +231,24 @@ class SanitizeTest < ActiveRecord::TestCase
   def test_named_bind_with_postgresql_type_casts
     l = Proc.new { bind(":a::integer '2009-01-01'::date", a: "10") }
     assert_nothing_raised(&l)
-    assert_equal "#{ActiveRecord::Base.connection.quote('10')}::integer '2009-01-01'::date", l.call
+    assert_equal "#{ActiveRecord::Base.lease_connection.quote('10')}::integer '2009-01-01'::date", l.call
+  end
+
+  def test_named_bind_with_literal_colons
+    assert_equal "TO_TIMESTAMP('2017/08/02 10:59:00', 'YYYY/MM/DD HH12:MI:SS')", bind("TO_TIMESTAMP(:date, 'YYYY/MM/DD HH12\\:MI\\:SS')", date: "2017/08/02 10:59:00")
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "TO_TIMESTAMP(:date, 'YYYY/MM/DD HH12:MI:SS')", date: "2017/08/02 10:59:00" }
   end
 
   private
     def bind(statement, *vars)
       if vars.first.is_a?(Hash)
-        ActiveRecord::Base.send(:replace_named_bind_variables, statement, vars.first)
+        ActiveRecord::Base.with_connection do |c|
+          ActiveRecord::Base.send(:replace_named_bind_variables, c, statement, vars.first)
+        end
       else
-        ActiveRecord::Base.send(:replace_bind_variables, statement, vars)
+        ActiveRecord::Base.with_connection do |c|
+          ActiveRecord::Base.send(:replace_bind_variables, c, statement, vars)
+        end
       end
     end
 end