Remove more old AR version checks

Author: enebo

lib/arel/visitors/h2.rb

@@ -7,19 +7,7 @@ class H2 < Arel::Visitors::HSQLDB
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(-1) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} -1 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end

lib/arel/visitors/hsqldb.rb

@@ -6,27 +6,7 @@ class HSQLDB < Arel::Visitors::ToSql
       def visit_Arel_Nodes_SelectStatement(o, *)
         o.limit ||= Arel::Nodes::Limit.new(0) if o.offset
         super
-      end if ArJdbc::AR42
-
-      def visit_Arel_Nodes_SelectStatement o, a = nil
-        sql = limit_offset(o.cores.map { |x| do_visit_select_core x, a }.join, o)
-        sql << " ORDER BY #{o.orders.map { |x| do_visit x, a }.join(', ')}" unless o.orders.empty?
-        sql
-      end unless ArJdbc::AR42
-
-      private
-
-      def limit_offset sql, o
-        offset = o.offset || 0
-        offset = offset.expr unless (offset.nil? || offset == 0)
-        if limit = o.limit
-          "SELECT LIMIT #{offset} #{limit_for(limit)} #{sql[7..-1]}"
-        elsif offset > 0
-          "SELECT LIMIT #{offset} 0 #{sql[7..-1]}" # removes "SELECT "
-        else
-          sql
-        end
-      end unless ArJdbc::AR42
+      end
     end
   end
 end

lib/arel/visitors/sql_server.rb

@@ -11,44 +11,6 @@ class SQLServer < const_defined?(:MSSQL) ? MSSQL : ToSql
 
       private
 
-      def visit_Arel_Nodes_SelectStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
-        o, a = args.first, args.last
-
-        return _visit_Arel_Nodes_SelectStatement(*args) if ! o.limit && ! o.offset
-
-        unless o.orders.empty?
-          select_order_by = do_visit_columns o.orders, a, 'ORDER BY '
-        end
-
-        select_count = false; sql = ''
-        o.cores.each do |x|
-          x = x.dup
-          core_order_by = select_order_by || determine_order_by(x, a)
-          if select_count? x
-            x.projections = [
-              Arel::Nodes::SqlLiteral.new(core_order_by ? over_row_num(core_order_by) : '*')
-            ]
-            select_count = true
-          else
-            # NOTE: this should really be added here and we should built the
-            # wrapping SQL but than #replace_limit_offset! assumes it does that
-            # ... MS-SQL adapter code seems to be 'hacked' by a lot of people
-            #x.projections << Arel::Nodes::SqlLiteral.new over_row_num(order_by)
-          end
-          sql << do_visit_select_core(x, a)
-        end
-
-        #sql = "SELECT _t.* FROM (#{sql}) as _t WHERE #{get_offset_limit_clause(o)}"
-        select_order_by ||= "ORDER BY #{@connection.determine_order_clause(sql)}"
-        replace_limit_offset!(sql, limit_for(o.limit), o.offset && o.offset.value.to_i, select_order_by)
-
-        sql = "SELECT COUNT(*) AS count_id FROM (#{sql}) AS subquery" if select_count
-
-        add_lock!(sql, :lock => o.lock && true)
-
-        sql
-      end unless ArJdbc::AR42
-
       # @private
       MAX_LIMIT_VALUE = 9_223_372_036_854_775_807
 
@@ -60,14 +22,6 @@ def visit_Arel_Nodes_UpdateStatement(*args) # [o] AR <= 4.0 [o, a] on 4.1
         super
       end
 
-      def visit_Arel_Nodes_Lock o, a = nil
-        # MS-SQL doesn't support "SELECT...FOR UPDATE".  Instead, it needs
-        # WITH(ROWLOCK,UPDLOCK) specified after each table in the FROM clause.
-        #
-        # we return nothing here and add the appropriate stuff with #add_lock!
-        #do_visit o.expr, a
-      end unless ArJdbc::AR42
-
       def visit_Arel_Nodes_Top o, a = nil
         # `top` wouldn't really work here:
         #   User.select("distinct first_name").limit(10)
@@ -76,29 +30,6 @@ def visit_Arel_Nodes_Top o, a = nil
         a || ''
       end
 
-      def visit_Arel_Nodes_Limit o, a = nil
-        "TOP (#{do_visit o.expr, a})"
-      end unless ArJdbc::AR42
-
-      def visit_Arel_Nodes_Ordering o, a = nil
-        expr = do_visit o.expr, a
-        if o.respond_to?(:direction)
-          "#{expr} #{o.ascending? ? 'ASC' : 'DESC'}"
-        else
-          expr
-        end
-      end unless ArJdbc::AR42
-
-      def visit_Arel_Nodes_Bin o, a = nil
-        expr = o.expr; sql = do_visit expr, a
-        if expr.respond_to?(:val) && expr.val.is_a?(Numeric)
-          sql
-        else
-          sql << " #{::ArJdbc::MSSQL.cs_equality_operator} "
-          sql
-        end
-      end unless ArJdbc::AR42
-
       private
 
       def self.possibly_private_method_defined?(name)
@@ -140,25 +71,7 @@ def do_visit_columns(colls, a, sql)
           visit(x, sql); sql << ', ' unless i == last
         end
         sql.value
-      end if ArJdbc::AR42
-
-      def do_visit_columns(colls, a, sql)
-        non_simple_order = /\sASC|\sDESC|\sCASE|\sCOLLATE|[\.,\[\(]/i # MIN(width)
-
-        last = colls.size - 1
-        colls.each_with_index do |x, i|
-          coll = do_visit(x, a)
-
-          if coll !~ non_simple_order && coll.to_i == 0
-            sql << @connection.quote_column_name(coll)
-          else
-            sql << coll
-          end
-
-          sql << ', ' unless i == last
-        end
-        sql
-      end if Arel::VERSION < '4.0.0'
+      end
 
       def over_row_num order_by
         "ROW_NUMBER() OVER (#{order_by}) as _row_num"
@@ -174,20 +87,6 @@ def table_from_select_core core
         end
       end
 
-      def table_from_select_core core
-        table_finder = lambda do |x|
-          case x
-          when Arel::Table
-            x
-          when Arel::Nodes::SqlLiteral
-            Arel::Table.new(x, @engine)
-          when Arel::Nodes::Join
-            table_finder.call(x.left)
-          end
-        end
-        table_finder.call(core.froms)
-      end if ActiveRecord::VERSION::STRING < '3.2'
-
       def primary_key_from_table t
         return unless t
         return t.primary_key if t.primary_key
@@ -219,7 +118,7 @@ class SQLServer2000 < SQLServer
       include ArJdbc::MSSQL::LimitHelpers::SqlServer2000ReplaceLimitOffset
     end
 
-    load 'arel/visitors/sql_server/ng42.rb' if ArJdbc::AR42
+    load 'arel/visitors/sql_server/ng42.rb'
 
   end
 end