ibm_db 5.2.0 → 5.3.1

data/test/cases/reload_models_test.rb

@@ -1,22 +1,26 @@
+# frozen_string_literal: true
+
 require "cases/helper"
-require 'models/owner'
-require 'models/pet'
+require "models/owner"
+require "models/pet"
 
 class ReloadModelsTest < ActiveRecord::TestCase
+  include ActiveSupport::Testing::Isolation
+
   fixtures :pets, :owners
 
   def test_has_one_with_reload
-    pet = Pet.find_by_name('parrot')
-    pet.owner = Owner.find_by_name('ashley')
+    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(File.join(File.dirname(__FILE__), "../models/owner.rb")))
+    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?

data/test/cases/reserved_word_test.rb

@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+require "cases/helper"
+
+class ReservedWordTest < ActiveRecord::TestCase
+  self.use_instantiated_fixtures = true
+  self.use_transactional_tests = false
+
+  class Group < ActiveRecord::Base
+    Group.table_name = "group"
+    belongs_to :select
+    has_one :values
+  end
+
+  class Select < ActiveRecord::Base
+    Select.table_name = "select"
+    has_many :groups
+  end
+
+  class Values < ActiveRecord::Base
+    Values.table_name = "values"
+  end
+
+  class Distinct < ActiveRecord::Base
+    Distinct.table_name = "distinct"
+    has_and_belongs_to_many :selects
+    has_many :values, through: :groups
+  end
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table :select, force: true
+    @connection.create_table :distinct, force: true
+    @connection.create_table :distinct_select, id: false, force: true do |t|
+      t.belongs_to :distinct
+      t.belongs_to :select
+    end
+    @connection.create_table :group, force: true do |t|
+      t.string :order
+      t.belongs_to :select
+    end
+    @connection.create_table :values, primary_key: :as, force: true do |t|
+      t.belongs_to :group
+    end
+  end
+
+  def teardown
+    @connection.drop_table :select, if_exists: true
+    @connection.drop_table :distinct, if_exists: true
+    @connection.drop_table :distinct_select, if_exists: true
+    @connection.drop_table :group, if_exists: true
+    @connection.drop_table :values, if_exists: true
+    @connection.drop_table :order, if_exists: true
+  end
+
+  def test_create_tables
+    assert_not @connection.table_exists?(:order)
+
+    @connection.create_table :order do |t|
+      t.string :group
+    end
+
+    assert @connection.table_exists?(:order)
+  end
+
+  def test_rename_tables
+    assert_nothing_raised { @connection.rename_table(:group, :order) }
+  end
+
+  def test_change_columns
+    assert_nothing_raised { @connection.change_column_default(:group, :order, "whatever") }
+    assert_nothing_raised { @connection.change_column("group", "order", :text, default: nil) }
+    assert_nothing_raised { @connection.rename_column(:group, :order, :values) }
+  end
+
+  def test_introspect
+    assert_equal ["id", "order", "select_id"], @connection.columns(:group).map(&:name).sort
+    assert_equal ["index_group_on_select_id"], @connection.indexes(:group).map(&:name).sort
+  end
+
+  def test_activerecord_model
+    x = Group.new
+    x.order = "x"
+    x.save!
+    x.order = "y"
+    x.save!
+    assert_equal x, Group.find_by_order("y")
+    assert_equal x, Group.find(x.id)
+  end
+
+  def test_delete_all_with_subselect
+    create_test_fixtures :values
+    assert_equal 1, Values.order(:as).limit(1).offset(1).delete_all
+    assert_raise(ActiveRecord::RecordNotFound) { Values.find(2) }
+    assert Values.find(1)
+  end
+
+  def test_has_one_associations
+    create_test_fixtures :group, :values
+    v = Group.find(1).values
+    assert_equal 2, v.id
+  end
+
+  def test_belongs_to_associations
+    create_test_fixtures :select, :group
+    gs = Select.find(2).groups
+    assert_equal 2, gs.length
+    assert_equal [2, 3], gs.collect(&:id).sort
+  end
+
+  def test_has_and_belongs_to_many
+    create_test_fixtures :select, :distinct, :distinct_select
+    s = Distinct.find(1).selects
+    assert_equal 2, s.length
+    assert_equal [1, 2], s.collect(&:id).sort
+  end
+
+  def test_activerecord_introspection
+    assert_predicate Group, :table_exists?
+    assert_equal ["id", "order", "select_id"], Group.columns.map(&:name).sort
+  end
+
+  def test_calculations_work_with_reserved_words
+    create_test_fixtures :group
+    assert_equal 3, Group.count
+  end
+
+  def test_associations_work_with_reserved_words
+    create_test_fixtures :select, :group
+    selects = Select.all.merge!(includes: [:groups]).to_a
+    assert_no_queries do
+      selects.each { |select| select.groups }
+    end
+  end
+
+  private
+    # custom fixture loader, uses FixtureSet#create_fixtures and appends base_path to the current file's path
+    def create_test_fixtures(*fixture_names)
+      ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT + "/reserved_words", fixture_names)
+    end
+end

data/test/cases/result_test.rb

@@ -1,54 +1,105 @@
+# frozen_string_literal: true
+
 require "cases/helper"
 
 module ActiveRecord
   class ResultTest < ActiveRecord::TestCase
     def result
-      Result.new(['col_1', 'col_2'], [
-        ['row 1 col 1', 'row 1 col 2'],
-        ['row 2 col 1', 'row 2 col 2'],
-        ['row 3 col 1', 'row 3 col 2'],
+      Result.new(["col_1", "col_2"], [
+        ["row 1 col 1", "row 1 col 2"],
+        ["row 2 col 1", "row 2 col 2"],
+        ["row 3 col 1", "row 3 col 2"],
       ])
     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")
+    end
+
     test "length" do
       assert_equal 3, result.length
     end
 
-    test "to_hash returns row_hashes" do
+    test "to_a returns row_hashes" do
       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_hash
+        { "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 "first returns first row as a hash" do
       assert_equal(
-        {'col_1' => 'row 1 col 1', 'col_2' => 'row 1 col 2'}, result.first)
+        { "col_1" => "row 1 col 1", "col_2" => "row 1 col 2" }, result.first)
+      assert_equal [
+        { "col_1" => "row 1 col 1", "col_2" => "row 1 col 2" },
+      ], result.first(1)
+      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" },
+      ], result.first(2)
+      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.first(3)
     end
 
     test "last returns last row as a hash" do
       assert_equal(
-        {'col_1' => 'row 3 col 1', 'col_2' => 'row 3 col 2'}, result.last)
+        { "col_1" => "row 3 col 1", "col_2" => "row 3 col 2" }, result.last)
+      assert_equal [
+        { "col_1" => "row 3 col 1", "col_2" => "row 3 col 2" },
+      ], result.last(1)
+      assert_equal [
+        { "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.last(2)
+      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.last(3)
     end
 
     test "each with block returns row hashes" do
       result.each do |row|
-        assert_equal ['col_1', 'col_2'], row.keys
+        assert_equal ["col_1", "col_2"], row.keys
       end
     end
 
     test "each without block returns an enumerator" do
       result.each.with_index do |row, index|
-        assert_equal ['col_1', 'col_2'], row.keys
+        assert_equal ["col_1", "col_2"], row.keys
         assert_kind_of Integer, index
       end
     end
 
-    if Enumerator.method_defined? :size
-      test "each without block returns a sized enumerator" do
-        assert_equal 3, result.each.size
-      end
+    test "each without block returns a sized enumerator" do
+      assert_equal 3, result.each.size
     end
 
     test "cast_values returns rows after type casting" do

data/test/cases/sanitize_test.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require "cases/helper"
-require 'models/binary'
-require 'models/author'
-require 'models/post'
+require "models/binary"
+require "models/author"
+require "models/post"
+require "models/customer"
 
 class SanitizeTest < ActiveRecord::TestCase
   def setup
@@ -9,97 +12,105 @@ class SanitizeTest < ActiveRecord::TestCase
 
   def test_sanitize_sql_array_handles_string_interpolation
     quoted_bambi = ActiveRecord::Base.connection.quote_string("Bambi")
-    assert_equal "name='#{quoted_bambi}'", Binary.send(:sanitize_sql_array, ["name='%s'", "Bambi"])
-    assert_equal "name='#{quoted_bambi}'", Binary.send(:sanitize_sql_array, ["name='%s'", "Bambi".mb_chars])
+    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")
-    assert_equal "name='#{quoted_bambi_and_thumper}'",Binary.send(:sanitize_sql_array, ["name='%s'", "Bambi\nand\nThumper"])
-    assert_equal "name='#{quoted_bambi_and_thumper}'",Binary.send(:sanitize_sql_array, ["name='%s'", "Bambi\nand\nThumper".mb_chars])
+    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")
-    assert_equal "name=#{quoted_bambi}", Binary.send(:sanitize_sql_array, ["name=?", "Bambi"])
-    assert_equal "name=#{quoted_bambi}", Binary.send(:sanitize_sql_array, ["name=?", "Bambi".mb_chars])
+    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")
-    assert_equal "name=#{quoted_bambi_and_thumper}", Binary.send(:sanitize_sql_array, ["name=?", "Bambi\nand\nThumper"])
-    assert_equal "name=#{quoted_bambi_and_thumper}", Binary.send(:sanitize_sql_array, ["name=?", "Bambi\nand\nThumper".mb_chars])
+    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")
-    assert_equal "name=#{quoted_bambi}", Binary.send(:sanitize_sql_array, ["name=:name", name: "Bambi"])
-    assert_equal "name=#{quoted_bambi} AND id=1", Binary.send(:sanitize_sql_array, ["name=:name AND id=:id", name: "Bambi", id: 1])
+    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])
 
     quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
-    assert_equal "name=#{quoted_bambi_and_thumper}", Binary.send(:sanitize_sql_array, ["name=:name", name: "Bambi\nand\nThumper"])
-    assert_equal "name=#{quoted_bambi_and_thumper} AND name2=#{quoted_bambi_and_thumper}", Binary.send(:sanitize_sql_array, ["name=:name AND name2=:name", name: "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
 
   def test_sanitize_sql_array_handles_relations
-    david = Author.create!(name: 'David')
+    david = Author.create!(name: "David")
     david_posts = david.posts.select(:id)
 
     sub_query_pattern = /\(\bselect\b.*?\bwhere\b.*?\)/i
 
-    select_author_sql = Post.send(:sanitize_sql_array, ['id in (?)', david_posts])
-    assert_match(sub_query_pattern, select_author_sql, 'should sanitize `Relation` as subquery for bind variables')
+    select_author_sql = Post.sanitize_sql_array(["id in (?)", david_posts])
+    assert_match(sub_query_pattern, select_author_sql, "should sanitize `Relation` as subquery for bind variables")
 
-    select_author_sql = Post.send(:sanitize_sql_array, ['id in (:post_ids)', post_ids: david_posts])
-    assert_match(sub_query_pattern, select_author_sql, 'should sanitize `Relation` as subquery for named bind variables')
+    select_author_sql = Post.sanitize_sql_array(["id in (:post_ids)", post_ids: david_posts])
+    assert_match(sub_query_pattern, select_author_sql, "should sanitize `Relation` as subquery for named bind variables")
   end
 
   def test_sanitize_sql_array_handles_empty_statement
-    select_author_sql = Post.send(:sanitize_sql_array, [''])
-    assert_equal('', select_author_sql)
+    select_author_sql = Post.sanitize_sql_array([""])
+    assert_equal("", select_author_sql)
   end
 
   def test_sanitize_sql_like
-    assert_equal '100\%', Binary.send(:sanitize_sql_like, '100%')
-    assert_equal 'snake\_cased\_string', Binary.send(:sanitize_sql_like, 'snake_cased_string')
-    assert_equal 'C:\\\\Programs\\\\MsPaint', Binary.send(:sanitize_sql_like, 'C:\\Programs\\MsPaint')
-    assert_equal 'normal string 42', Binary.send(:sanitize_sql_like, 'normal string 42')
+    assert_equal '100\%', Binary.sanitize_sql_like("100%")
+    assert_equal 'snake\_cased\_string', Binary.sanitize_sql_like("snake_cased_string")
+    assert_equal 'C:\\\\Programs\\\\MsPaint', Binary.sanitize_sql_like('C:\\Programs\\MsPaint')
+    assert_equal "normal string 42", Binary.sanitize_sql_like("normal string 42")
   end
 
   def test_sanitize_sql_like_with_custom_escape_character
-    assert_equal '100!%', Binary.send(:sanitize_sql_like, '100%', '!')
-    assert_equal 'snake!_cased!_string', Binary.send(:sanitize_sql_like, 'snake_cased_string', '!')
-    assert_equal 'great!!', Binary.send(:sanitize_sql_like, 'great!', '!')
-    assert_equal 'C:\\Programs\\MsPaint', Binary.send(:sanitize_sql_like, 'C:\\Programs\\MsPaint', '!')
-    assert_equal 'normal string 42', Binary.send(:sanitize_sql_like, 'normal string 42', '!')
+    assert_equal "100!%", Binary.sanitize_sql_like("100%", "!")
+    assert_equal "snake!_cased!_string", Binary.sanitize_sql_like("snake_cased_string", "!")
+    assert_equal "great!!", Binary.sanitize_sql_like("great!", "!")
+    assert_equal 'C:\\Programs\\MsPaint', Binary.sanitize_sql_like('C:\\Programs\\MsPaint', "!")
+    assert_equal "normal string 42", Binary.sanitize_sql_like("normal string 42", "!")
   end
 
   def test_sanitize_sql_like_example_use_case
     searchable_post = Class.new(Post) do
-      def self.search(term)
-        where("title LIKE ?", sanitize_sql_like(term, '!'))
+      def self.search_as_method(term)
+        where("title LIKE ?", sanitize_sql_like(term, "!"))
       end
+
+      scope :search_as_scope, -> (term) {
+        where("title LIKE ?", sanitize_sql_like(term, "!"))
+      }
     end
 
     assert_sql(/LIKE '20!% !_reduction!_!!'/) do
-      searchable_post.search("20% _reduction_!").to_a
+      searchable_post.search_as_method("20% _reduction_!").to_a
+    end
+
+    assert_sql(/LIKE '20!% !_reduction!_!!'/) do
+      searchable_post.search_as_scope("20% _reduction_!").to_a
     end
   end
 
   def test_bind_arity
-    assert_nothing_raised                                { bind '' }
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
+    assert_nothing_raised                                { bind "" }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "", 1 }
 
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?' }
-    assert_nothing_raised                                { bind '?', 1 }
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1 }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "?" }
+    assert_nothing_raised                                { bind "?", 1 }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "?", 1, 1 }
   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
+    assert_equal "1", bind(":a", a: 1) # ' ruby-mode
+    assert_equal "1 1", bind(":a :a", a: 1)  # ' ruby-mode
 
-    assert_nothing_raised { bind("'+00:00'", :foo => "bar") }
+    assert_nothing_raised { bind("'+00:00'", foo: "bar") }
   end
 
   def test_named_bind_arity
-    assert_nothing_raised                                { bind "name = :name", { name: "37signals" } }
-    assert_nothing_raised                                { bind "name = :name", { name: "37signals", id: 1 } }
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "name = :name", { id: 1 } }
+    assert_nothing_raised                                { bind "name = :name", name: "37signals" }
+    assert_nothing_raised                                { bind "name = :name", name: "37signals", id: 1 }
+    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind "name = :name", id: 1 }
   end
 
   class SimpleEnumerable
@@ -117,50 +128,55 @@ class SanitizeTest < ActiveRecord::TestCase
   def test_bind_enumerable
     quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
 
-    assert_equal '1,2,3', bind('?', [1, 2, 3])
-    assert_equal quoted_abc, bind('?', %w(a b c))
+    assert_equal "1,2,3", bind("?", [1, 2, 3])
+    assert_equal quoted_abc, bind("?", %w(a b c))
 
-    assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
-    assert_equal quoted_abc, bind(':a', :a => %w(a b c)) # '
+    assert_equal "1,2,3", bind(":a", a: [1, 2, 3])
+    assert_equal quoted_abc, bind(":a", a: %w(a b c)) # '
 
-    assert_equal '1,2,3', bind('?', SimpleEnumerable.new([1, 2, 3]))
-    assert_equal quoted_abc, bind('?', SimpleEnumerable.new(%w(a b c)))
+    assert_equal "1,2,3", bind("?", SimpleEnumerable.new([1, 2, 3]))
+    assert_equal quoted_abc, bind("?", SimpleEnumerable.new(%w(a b c)))
 
-    assert_equal '1,2,3', bind(':a', :a => SimpleEnumerable.new([1, 2, 3]))
-    assert_equal quoted_abc, bind(':a', :a => SimpleEnumerable.new(%w(a b c))) # '
+    assert_equal "1,2,3", bind(":a", a: SimpleEnumerable.new([1, 2, 3]))
+    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)
-    assert_equal quoted_nil, bind('?', [])
-    assert_equal " in (#{quoted_nil})", bind(' in (?)', [])
-    assert_equal "foo in (#{quoted_nil})", bind('foo in (?)', [])
+    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)
+    assert_equal quoted_abc, bind("?", "a"..."d")
+  end
+
+  def test_bind_empty_range
+    quoted_nil = ActiveRecord::Base.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('')
-    assert_equal quoted_empty, bind('?', '')
+    quoted_empty = ActiveRecord::Base.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")
-    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)
-    assert_equal "name=#{quoted_bambi_and_thumper}", bind('name=?', "Bambi\nand\nThumper".mb_chars)
-  end
-
-  def test_bind_record
-    o = Struct.new(:quoted_id).new(1)
-    assert_equal '1', bind('?', o)
-
-    os = [o] * 3
-    assert_equal '1,1,1', bind('?', os)
+    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)
+    assert_equal "name=#{quoted_bambi_and_thumper}", bind("name=?", "Bambi\nand\nThumper".mb_chars)
   end
 
   def test_named_bind_with_postgresql_type_casts
-    l = Proc.new { bind(":a::integer '2009-01-01'::date", :a => '10') }
+    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
   end