Remove some more old version checks

Author: enebo

lib/arjdbc/jdbc.rb

@@ -1,13 +1,6 @@
 require 'active_support/deprecation'
 
 module ArJdbc
-
-  # @private
-  AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
-
-  # @private
-  AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'
-
   class << self
 
     # @private Internal API

lib/arjdbc/jdbc/column.rb

@@ -28,21 +28,6 @@ def initialize(config, name, *args)
           end
         end
 
-        if ArJdbc::AR52
-          # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
-        else
-          default = args[0].cast(default)
-
-          sql_type = args.delete_at(1)
-          type = args.delete_at(0)
-
-          args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
-        end
-
-        # super <= 4.1: (name, default, sql_type = nil, null = true)
-        # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)
-        # super >= 5.0: (name, default, sql_type_metadata = nil, null = true)
-
         super(name, default, *args)
         init_column(name, default, *args)
       end
@@ -80,18 +65,8 @@ def self.column_types
       end
 
       class << self
-
-        include Jdbc::TypeCast if ::ActiveRecord::VERSION::STRING >= '4.2'
-
-        if ActiveRecord::VERSION::MAJOR > 3 && ActiveRecord::VERSION::STRING < '4.2'
-
-          # @private provides compatibility between AR 3.x/4.0 API
-          def string_to_date(value); value_to_date(value) end
-
-        end
-
+        include Jdbc::TypeCast
       end
-
     end
   end
 end

lib/arjdbc/oracle/adapter.rb

@@ -285,7 +285,7 @@ def add_index(table_name, column_name, options = {})
           execute "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{quote_column_name(index_name)} #{index_type} (#{quoted_column_names})"
         end
       end
-    end if AR42
+    end
 
     # @private
     def add_index_options(table_name, column_name, options = {})
@@ -309,7 +309,7 @@ def add_index_options(table_name, column_name, options = {})
 
       quoted_column_names = column_names.map { |e| quote_column_name_or_expression(e) }.join(", ")
       [ index_name, index_type, quoted_column_names, tablespace, index_options ]
-    end if AR42
+    end
 
     # @override
     def remove_index(table_name, options = {})
@@ -327,12 +327,7 @@ def remove_index(table_name, options = {})
       end
       execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_column_name(index_name)}" rescue nil
       execute "DROP INDEX #{quote_column_name(index_name)}"
-    end if AR42
-
-    # @private
-    def remove_index(table_name, options = {})
-      execute "DROP INDEX #{index_name(table_name, options)}"
-    end unless AR42
+    end
 
     def change_column_default(table_name, column_name, default)
       execute "ALTER TABLE #{quote_table_name(table_name)} MODIFY #{quote_column_name(column_name)} DEFAULT #{quote(default)}"
@@ -361,25 +356,11 @@ def rename_column(table_name, column_name, new_column_name)
         "RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
     end
 
-    if ActiveRecord::VERSION::MAJOR >= 4
-
     # @override
     def remove_column(table_name, column_name, type = nil, options = {})
       do_remove_column(table_name, column_name)
     end
 
-    else
-
-    # @override
-    def remove_column(table_name, *column_names)
-      for column_name in column_names.flatten
-        do_remove_column(table_name, column_name)
-      end
-    end
-    alias remove_columns remove_column
-
-    end
-
     def do_remove_column(table_name, column_name)
       execute "ALTER TABLE #{quote_table_name(table_name)} DROP COLUMN #{quote_column_name(column_name)}"
     end

lib/arjdbc/util/serialized_attributes.rb

@@ -31,33 +31,11 @@ def dump_column_value(column)
         SerializedAttributes.dump_column_value(self, column)
       end
 
-      if defined? ActiveRecord::Type::Serialized # ArJdbc::AR42
-
       def self.dump_column_value(record, column)
         value = record[ column.name.to_s ]
         column.cast_type.type_cast_for_database(value)
       end
 
-      else
-
-      def self.dump_column_value(record, column)
-        value = record[ name = column.name.to_s ]
-        if record.class.respond_to?(:serialized_attributes)
-          if coder = record.class.serialized_attributes[name]
-            value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
-          end
-        else
-          if record.respond_to?(:unserializable_attribute?)
-            value = value.to_yaml if record.unserializable_attribute?(name, column)
-          else
-            value = value.to_yaml if value.is_a?(Hash)
-          end
-        end
-        value
-      end
-
-      end
-
       def self.setup(lob_type = nil, after_save_alias = nil)
         ActiveRecord::Base.send :include, self # include SerializedAttributes
         ActiveRecord::Base.lob_type = lob_type unless lob_type.nil?

test/db/h2/offset_test.rb

@@ -43,18 +43,14 @@ def test_offset
     assert_equal ['Jack', 'James', 'Jason'], query.limit(3).map(&:firstname)
     assert_equal ['Joe', 'Johanna', 'John'], query.offset(8).map(&:firstname)
     assert_equal ['Joe', 'Johanna'], query.offset(8).limit(2).map(&:firstname)
-  end if ar_version('3.0')
+  end
 
   def test_offset_arel
     query = Arel::Table.new(:persons).skip(3)
     assert_nothing_raised do
       sql = query.to_sql
-      if ArJdbc::AR42
-        assert_equal 'SELECT FROM persons LIMIT -1 OFFSET 3', sql, 'SQL statement was not generated, properly'
-      else
-        assert_equal "SELECT LIMIT 3", sql[0..13], "SQL statement was not generated, properly"
-      end
+      assert_equal 'SELECT FROM persons LIMIT -1 OFFSET 3', sql, 'SQL statement was not generated, properly'
     end
-  end if ar_version('3.0')
+  end
 
 end

test/db/hsqldb/offset_test.rb

@@ -43,18 +43,14 @@ def test_offset
     assert_equal ['Jack', 'James', 'Jason'], query.limit(3).map(&:firstname)
     assert_equal ['Joe', 'Johanna', 'John'], query.offset(8).map(&:firstname)
     assert_equal ['Joe', 'Johanna'], query.offset(8).limit(2).map(&:firstname)
-  end if ar_version('3.0')
+  end
 
   def test_offset_arel
     query = Arel::Table.new(:persons).skip(3)
     assert_nothing_raised do
       sql = query.to_sql
-      if ArJdbc::AR42
-        assert_equal 'SELECT FROM persons LIMIT 0 OFFSET 3', sql, 'SQL statement was not generated, properly'
-      else
-        assert_equal "SELECT LIMIT 3", sql[0..13], "SQL statement was not generated, properly"
-      end
+      assert_equal 'SELECT FROM persons LIMIT 0 OFFSET 3', sql, 'SQL statement was not generated, properly'
     end
-  end if ar_version('3.0')
+  end
 
 end