AREL values passed to #to_sql not handled correctly on AR-3.0 (fixes #365)

Author: kares

lib/arjdbc/jdbc/adapter.rb

@@ -383,30 +383,41 @@ def primary_keys(table)
         @connection.primary_keys(table)
       end
 
-      if ActiveRecord::VERSION::MAJOR >= 3
-        
-      # Converts an arel AST to SQL
-      def to_sql(arel, binds = [])
-        if arel.respond_to?(:ast)
-          visitor.accept(arel.ast) do
-            quote(*binds.shift.reverse)
-          end
-        else # for backwards compatibility :
+      if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+      
+        #attr_reader :visitor unless method_defined?(:visitor) # not in 3.0
+
+        # Converts an AREL AST to SQL.
+        def to_sql(arel, binds = [])
+          # NOTE: can not handle `visitor.accept(arel.ast)` right thus
+          # convert AREL to a SQL string and simply substitute binds :
           sql = arel.respond_to?(:to_sql) ? arel.send(:to_sql) : arel
           return sql if binds.blank?
           sql.gsub('?') { quote(*binds.shift.reverse) }
         end
-      end
+        
+      elsif ActiveRecord::VERSION::MAJOR >= 3 # AR >= 3.1 or 4.0
+      
+        # Converts an AREL AST to SQL.
+        def to_sql(arel, binds = [])
+          if arel.respond_to?(:ast)
+            visitor.accept(arel.ast) { quote(*binds.shift.reverse) }
+          else # for backwards compatibility :
+            sql = arel.respond_to?(:to_sql) ? arel.send(:to_sql) : arel
+            return sql if binds.blank?
+            sql.gsub('?') { quote(*binds.shift.reverse) }
+          end
+        end
 
       else # AR-2.3 no #to_sql method
 
-      # Substitutes SQL bind (?) parameters
-      def to_sql(sql, binds = [])
-        sql = sql.send(:to_sql) if sql.respond_to?(:to_sql)
-        return sql if binds.blank?
-        copy = binds.dup
-        sql.gsub('?') { quote(*copy.shift.reverse) }
-      end
+        # Substitutes SQL bind parameters.
+        def to_sql(sql, binds = [])
+          sql = sql.send(:to_sql) if sql.respond_to?(:to_sql)
+          return sql if binds.blank?
+          copy = binds.dup
+          sql.gsub('?') { quote(*copy.shift.reverse) }
+        end
 
       end
 

test/has_many_through.rb

@@ -11,16 +11,15 @@ def teardown
   end
 
   def test_has_many_through
-    admin_role    = Role.create :name => "Administrator", 
-        :description => "System defined super user - access to right and role management."
-    admin_role.save!
+    admin_role = Role.create! :name => "Administrator", 
+      :description => "super user - access to right and role management"
 
     assert_equal(0, admin_role.rights.sum(:hours))
 
-    role_rights   = Right.create :name => "Administrator - Full Access To Roles", 
-        :actions => "*", :controller_name => "Admin::RolesController", :hours => 0
-    right_rights  = Right.create :name => "Administrator - Full Access To Rights", 
-        :actions => "*", :controller_name => "Admin::RightsController", :hours => 1.5
+    role_rights  = Right.create :name => "Administrator - Full Access To Roles", 
+      :actions => "*", :controller_name => "Admin::RolesController", :hours => 0
+    right_rights = Right.create :name => "Administrator - Full Access To Rights", 
+      :actions => "*", :controller_name => "Admin::RightsController", :hours => 1.5
 
     admin_role.rights << role_rights
     admin_role.rights << right_rights
@@ -40,4 +39,20 @@ def test_has_many_through
     assert ! rights_only_role.has_right?(role_rights)
   end
 
+  def test_has_many_select_rows_with_relation
+    role = Role.create! :name => "main", :description => "main role"
+    Role.create! :name => "user", :description => "user role"
+    
+    Right.create! :name => "r0", :hours => 0
+    r1 = Right.create! :name => "r1", :hours => 1
+    r2 = Right.create! :name => "r2", :hours => 2
+    Right.create! :name => "r3", :hours => 3
+    
+    role.permission_groups.create! :right => r1.reload
+    role.permission_groups.create! :right => r2.reload
+    
+    groups = role.reload.permission_groups.select('right_id')
+    assert_equal [ [ r1.id ], [ r2.id ] ], role.connection.select_rows(groups)
+  end if Test::Unit::TestCase.ar_version('3.0')
+  
 end