More version checks removed

Author: enebo

test/db/h2/schema_dump_test.rb

@@ -19,11 +19,7 @@ class H2SchemaDumpTest < Test::Unit::TestCase
   def test_schema_dump_decimal_when_scale_specified
     output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
     # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
-    if ar_version('4.0')
-      assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
-    else
-      assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
-    end
+    assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
   end
 
   # @override
@@ -32,13 +28,7 @@ def test_schema_dump_keeps_id_column_when_id_is_false_and_id_column_added
     match = output.match(%r{create_table "string_ids"(.*)do.*\n(.*)\n})
     assert_not_nil(match, "string_ids table not found")
     assert_match %r((:id => false)|(id: false)), match[1], "no table id not preserved"
-    if ar_version('4.2')
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+limit:[[:space:]]+255,[[:space:]]+null:[[:space:]]+false$}, match[2], "non-primary key id column not preserved"
-    elsif ar_version('4.0')
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+null: false$}, match[2], "non-primary key id column not preserved"
-    else
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+:null => false$}, match[2], "non-primary key id column not preserved"
-    end
+    assert_match %r{t.string[[:space:]]+"id",[[:space:]]+limit:[[:space:]]+255,[[:space:]]+null:[[:space:]]+false$}, match[2], "non-primary key id column not preserved"
   end
 
-end
+end

test/db/h2/serialize_test.rb

@@ -15,6 +15,6 @@ def test_serialized_attribute_should_raise_exception_on_save_with_wrong_type
     rescue ActiveRecord::JDBCError => e
       e.sql_exception.printStackTrace if e.sql_exception
     end
-  end if Test::Unit::TestCase.ar_version('3.2')
+  end
 
 end

test/db/h2/simple_test.rb

@@ -3,15 +3,15 @@
 
 class H2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
-  include ExplainSupportTestMethods if ar_version("3.1")
+  include ExplainSupportTestMethods
   include ActiveRecord3TestMethods
   include CustomSelectTestMethods
 
   test 'returns correct visitor type' do
     assert_not_nil visitor = connection.instance_variable_get(:@visitor)
     assert defined? Arel::Visitors::HSQLDB
     assert_kind_of Arel::Visitors::HSQLDB, visitor
-  end if ar_version('3.0')
+  end
 
 end
 
@@ -56,13 +56,8 @@ def teardown
   end
 
   def test_find_in_other_schema
-    if ar_version('4.0')
-      all = Entry.includes(:user).references(:user)
-      assert ! all.empty?, "expected `Entry.includes(:user)` to not be empty but was"
-    else
-      all = Entry.all(:include => :user)
-      assert ! all.empty?, "expected `Entry.all(:include => :user)` to not be empty but was"
-    end
+    all = Entry.includes(:user).references(:user)
+    assert ! all.empty?, "expected `Entry.includes(:user)` to not be empty but was"
   end
 
-end
+end

test/db/h2/transaction_test.rb

@@ -23,7 +23,7 @@ def test_transaction_isolation_read_committed
       end
     end
     assert_equal 1, Entry.count
-  end if Test::Unit::TestCase.ar_version('4.0')
+  end
 
   # @override whole table gets locked!
   def test_transaction_isolation_repeatable_read
@@ -43,6 +43,6 @@ def test_transaction_isolation_repeatable_read
     end
     #entry.reload
     #assert_equal '567', entry.title
-  end if Test::Unit::TestCase.ar_version('4.0')
+  end
 
 end

test/db/hsqldb/schema_dump_test.rb

@@ -9,11 +9,7 @@ class HSQLDBSchemaDumpTest < Test::Unit::TestCase
   def test_schema_dump_decimal_when_scale_specified
     output = standard_dump(StringIO.new, [/^[^d]/]) # keep db_types
     # t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2, :default => 3.14
-    if ar_version('4.0')
-      assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
-    else
-      assert_match %r{t.decimal\s+"sample_small_decimal",\s+:precision => 3,\s+:scale => 2}, output
-    end
+    assert_match %r{t.decimal\s+"sample_small_decimal",\s+precision: 3,\s+scale: 2}, output
   end
 
   # @override
@@ -22,13 +18,7 @@ def test_schema_dump_keeps_id_column_when_id_is_false_and_id_column_added
     match = output.match(%r{create_table "string_ids"(.*)do.*\n(.*)\n})
     assert_not_nil(match, "string_ids table not found")
     assert_match %r((:id => false)|(id: false)), match[1], "no table id not preserved"
-    if ar_version('4.2')
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+limit:[[:space:]]+255,[[:space:]]+null:[[:space:]]+false$}, match[2], "non-primary key id column not preserved"
-    elsif ar_version('4.0')
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+null: false$}, match[2], "non-primary key id column not preserved"
-    else
-      assert_match %r{t.string[[:space:]]+"id",[[:space:]]+:null => false$}, match[2], "non-primary key id column not preserved"
-    end
+    assert_match %r{t.string[[:space:]]+"id",[[:space:]]+limit:[[:space:]]+255,[[:space:]]+null:[[:space:]]+false$}, match[2], "non-primary key id column not preserved"
   end
 
-end
+end

test/db/hsqldb/simple_test.rb

@@ -3,27 +3,27 @@
 
 class HsqldbSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
-  include ExplainSupportTestMethods if ar_version("3.1")
+  include ExplainSupportTestMethods
   include ActiveRecord3TestMethods
   include CustomSelectTestMethods
 
   # @override
   def test_empty_insert_statement
     # "INSERT INTO table DEFAULT VALUES" only works if all columns have defaults
-    pend if ar_version('4.0')
+    pend
     super
   end
 
   # @override
   def test_explain_with_binds
     skip 'HSQLDB seems to have issues EXPLAIN-ing with binds'
     super
-  end if ar_version('3.1')
+  end
 
   test 'returns correct visitor type' do
     assert_not_nil visitor = connection.instance_variable_get(:@visitor)
     assert defined? Arel::Visitors::HSQLDB
     assert_kind_of Arel::Visitors::HSQLDB, visitor
-  end if ar_version('3.0')
+  end
 
 end

test/db/hsqldb/transaction_test.rb

@@ -23,7 +23,7 @@ def test_transaction_isolation_read_committed
       end
     end
     assert_equal 1, Entry.count
-  end if Test::Unit::TestCase.ar_version('4.0')
+  end
 
   # @override whole table gets locked!
   def test_transaction_isolation_repeatable_read
@@ -43,34 +43,7 @@ def test_transaction_isolation_repeatable_read
     end
     #entry.reload
     #assert_equal '567', entry.title
-  end if Test::Unit::TestCase.ar_version('4.0')
-
-  # @override
-  def test_savepoint
-    #omit 'savepoins not supported' unless @supports_savepoints
-    Entry.create! :title => '1'
-    assert_equal 1, Entry.count
-
-    connection = ActiveRecord::Base.connection
-    connection.transaction do
-      begin
-        connection.create_savepoint
-        savepoint_created = true
-
-        Entry.create! :title => '2'
-        Entry.create! :title => '3'
-
-        assert_equal 3, Entry.count
-
-        connection.rollback_to_savepoint
-        assert_equal 1, Entry.count
-      ensure
-        # NOTE: HSQLDB seems to not support release after rollback :
-        # Invalid argument in JDBC call: 3B001 savepoint exception: invalid specification
-        #connection.release_savepoint if savepoint_created
-      end
-    end
-  end unless Test::Unit::TestCase.ar_version('4.1')
+  end
 
   # @override
   def test_using_named_savepoints
@@ -93,6 +66,6 @@ def test_using_named_savepoints
       #Entry.connection.release_savepoint("first")
       #assert_equal 'f', first.reload.content
     end
-  end if Test::Unit::TestCase.ar_version('4.1')
+  end
 
 end

test/db/mssql/custom_test.rb

@@ -19,13 +19,8 @@ def self.shutdown
     entry.reload
     assert_equal 'Hello!', entry['My Name']
 
-    if ar_version('3.1')
-      LegacyEntry.where('[My Name] IS NOT NULL').limit(1).to_a
-      LegacyEntry.order(:'My Name').limit(1).to_a
-    else
-      LegacyEntry.all(:limit => 1)
-      LegacyEntry.all(:order => :'My Name', :limit => 1)
-    end
+    LegacyEntry.where('[My Name] IS NOT NULL').limit(1).to_a
+    LegacyEntry.order(:'My Name').limit(1).to_a
   end
 
-end
+end

test/db/mssql/limit_offset_test.rb

@@ -108,36 +108,24 @@ def test_limit_with_alternate_named_primary_key
     end
     ships = LegacyShip.limit(3)
     assert_equal(3, ships.size)
-  end if ar_version('3.0')
+  end
 
   def test_limit_and_offset
     %w(one two three four five six seven eight).each do |name|
       LongShip.create!(:name => name)
     end
-    if ar_version('4.0')
-      ship_names = LongShip.offset(2).limit(3).to_a.map(&:name)
-    else
-      ship_names = LongShip.find(:all, :offset => 2, :limit => 3).map(&:name)
-    end
+    ship_names = LongShip.offset(2).limit(3).to_a.map(&:name)
     assert_equal(%w(three four five), ship_names)
   end
 
   def test_limit_and_offset_with_order
     names = %w(one two three four five six seven eight).each do |name|
       LongShip.create!(:name => name)
     end
-    if ar_version('4.0')
-      ship_names = LongShip.order("name").offset(4).limit(2).to_a.map(&:name)
-    else
-      ship_names = LongShip.find(:all, :order => "name", :offset => 4, :limit => 2).map(&:name)
-    end
+    ship_names = LongShip.order("name").offset(4).limit(2).to_a.map(&:name)
     assert_equal(names.sort[4, 2], ship_names)
 
-    if ar_version('4.0')
-      ship_names = LongShip.order("id").offset(4).limit(2).to_a.map(&:name)
-    else
-      ship_names = LongShip.find(:all, :order => "id", :offset => 4, :limit => 2).map(&:name)
-    end
+    ship_names = LongShip.order("id").offset(4).limit(2).to_a.map(&:name)
     assert_equal(%w(five six), ship_names)
   end
 
@@ -146,11 +134,7 @@ def test_limit_and_offset_with_include
     skei.vikings.create!(:name => "Bob")
     skei.vikings.create!(:name => "Ben")
     skei.vikings.create!(:name => "Basil")
-    if ar_version('4.0')
-      ships = Viking.includes(:long_ship).offset(1).limit(2) #.all
-    else
-      ships = Viking.find(:all, :include => :long_ship, :offset => 1, :limit => 2)
-    end
+    ships = Viking.includes(:long_ship).offset(1).limit(2) #.all
     assert_equal(2, ships.size)
   end
 
@@ -163,25 +147,15 @@ def test_limit_and_offset_with_include_and_order
     boat1.vikings.create!(:name => "Carl")
     boat2.vikings.create!(:name => "Donald")
 
-    if ar_version('4.0')
-      vikings = Viking.includes(:long_ship).order('long_ships.name, vikings.name').references(:long_ship).offset(0).limit(3)
-    else
-      vikings = Viking.find(:all, :include => :long_ship, :order => "long_ships.name, vikings.name", :offset => 0, :limit => 3)
-    end
+    vikings = Viking.includes(:long_ship).order('long_ships.name, vikings.name').references(:long_ship).offset(0).limit(3)
     assert_equal ["Adam", "Carl", "Ben"], vikings.map(&:name)
   end
 
   def test_offset_without_limit
     %w( egy keto harom negy ot hat het nyolc ).each do |name|
       LongShip.create!(:name => name)
     end
-    if ar_version('4.0')
-      ships = LongShip.select(:name).offset(3).to_a
-    elsif ar_version('3.0')
-      ships = LongShip.select(:name).offset(3).all
-    else
-      ships = LongShip.find(:all, :select => 'name', :offset => 3)
-    end
+    ships = LongShip.select(:name).offset(3).to_a
     assert_equal ['negy', 'ot', 'hat', 'het', 'nyolc'], ships.map(&:name)
   end
 
@@ -195,7 +169,7 @@ def test_limit_with_group_by
 
     ships = LongShip.select(:name).group(:name).limit(2).offset(2)
     assert_equal ['three', 'four'], ships.map(&:name)
-  end if ar_version('3.0')
+  end
 
   # NOTE: can not work due how MS-SQL "rulezzz"
   # Column 'long_ships.id' is invalid in the select list because it is not
@@ -213,7 +187,7 @@ def test_limit_with_group_by
 #
 #    ships = LongShip.select(:name).group(:name).limit(2).offset(2)
 #    assert_equal ['three', 'four'], ships.map(&:name)
-#  end if ar_version('3.0')
+#  end
 
   def test_limit_with_group_by_and_aggregate_in_order_clause
     %w( one two three four five six seven eight ).each_with_index do |name, i|
@@ -231,17 +205,13 @@ def test_limit_with_group_by_and_aggregate_in_order_clause
 
     ships = LongShip.select(:name).group(:name).limit(2).order('MAX(width) DESC').all
     assert_equal ['eight', 'seven'], ships.map(&:name)
-  end if ar_version('3.0')
+  end
 
   def test_select_distinct_with_limit
     %w(c a b a b a c d c d).each do |name|
       LongShip.create!(:name => name)
     end
-    if ar_version('3.0')
-      result = LongShip.select("DISTINCT name").order("name").limit(2)
-    else
-      result = LongShip.find(:all, :select => "DISTINCT name", :order => "name", :limit => 2)
-    end
+    result = LongShip.select("DISTINCT name").order("name").limit(2)
     assert_equal %w(a b), result.map(&:name)
   end
 
@@ -257,7 +227,7 @@ def test_select_distinct_view_with_joins_and_limit
       joins(:long_ship).where(:long_ship_id => mega_ship.id).
       order('name')
     assert_equal [ '11', '12' ], result.map { |viking| viking.name }
-  end if ar_version('3.0')
+  end
 
   class Viewking < ActiveRecord::Base
     belongs_to :long_ship
@@ -278,7 +248,7 @@ def test_order_and_limit_view_with_include
 
     arel = Viewking.includes(:long_ship).limit(3)
     assert_equal 2, arel.to_a.size
-  end if ar_version('3.0')
+  end
 
   test 'ordering_on_aggregate GH-532' do
     5.times { |i| LongShip.create! :name => "ship_#{i}", :length => 1000 + i }

test/db/mssql/multibyte_test.rb

@@ -7,11 +7,7 @@ class MSSQLMultibyteTest < Test::Unit::TestCase
 
   def test_select_multibyte_string
     Entry.create!(:title => 'テスト', :content => '本文')
-    if ar_version('4.0')
-      entry = Entry.last
-    else
-      entry = Entry.find(:last)
-    end
+    entry = Entry.last
     assert_equal "テスト", entry.title
     assert_equal "本文", entry.content
     assert_equal entry, Entry.find_by_title("テスト")