Merge pull request #2075 from yahonda/diag_2072

Remove `visit_Arel_Nodes_NotIn` and `visit_Arel_Nodes_In` visitors

Author: yahonda

lib/arel/visitors/oracle.rb

@@ -128,59 +128,6 @@ def visit_Arel_Nodes_HomogeneousIn(o, collector)
           collector
         end
 
-        def visit_Arel_Nodes_In(o, collector)
-          attr, values = o.left, o.right
-
-          if Array === values
-            unless values.empty?
-              values.delete_if { |value| unboundable?(value) }
-            end
-
-            return collector << "1=0" if values.empty?
-          end
-
-          in_clause_length = @connection.in_clause_length
-
-          if !Array === values || values.length <= in_clause_length
-            visit(attr, collector) << " IN ("
-            visit(values, collector) << ")"
-          else
-            collector << "("
-            values.each_slice(in_clause_length).each_with_index do |valuez, i|
-              collector << " OR " unless i == 0
-              visit(attr, collector) << " IN ("
-              visit(valuez, collector) << ")"
-            end
-            collector << ")"
-          end
-        end
-
-        def visit_Arel_Nodes_NotIn(o, collector)
-          attr, values = o.left, o.right
-
-          if Array === values
-            unless values.empty?
-              values.delete_if { |value| unboundable?(value) }
-            end
-
-            return collector << "1=1" if values.empty?
-          end
-
-          in_clause_length = @connection.in_clause_length
-
-          if !Array === values || values.length <= in_clause_length
-            visit(attr, collector) << " NOT IN ("
-            visit(values, collector) << ")"
-          else
-            values.each_slice(in_clause_length).each_with_index do |valuez, i|
-              collector << " AND " unless i == 0
-              visit(attr, collector) << " NOT IN ("
-              visit(valuez, collector) << ")"
-            end
-            collector
-          end
-        end
-
         def visit_Arel_Nodes_UpdateStatement(o, collector)
           # Oracle does not allow ORDER BY/LIMIT in UPDATEs.
           if o.orders.any? && o.limit.nil?

lib/arel/visitors/oracle12.rb

@@ -81,59 +81,6 @@ def visit_Arel_Nodes_HomogeneousIn(o, collector)
           collector
         end
 
-        def visit_Arel_Nodes_In(o, collector)
-          attr, values = o.left, o.right
-
-          if Array === values
-            unless values.empty?
-              values.delete_if { |value| unboundable?(value) }
-            end
-
-            return collector << "1=0" if values.empty?
-          end
-
-          in_clause_length = @connection.in_clause_length
-
-          if !Array === values || values.length <= in_clause_length
-            visit(attr, collector) << " IN ("
-            visit(values, collector) << ")"
-          else
-            collector << "("
-            values.each_slice(in_clause_length).each_with_index do |valuez, i|
-              collector << " OR " unless i == 0
-              visit(attr, collector) << " IN ("
-              visit(valuez, collector) << ")"
-            end
-            collector << ")"
-          end
-        end
-
-        def visit_Arel_Nodes_NotIn(o, collector)
-          attr, values = o.left, o.right
-
-          if Array === values
-            unless values.empty?
-              values.delete_if { |value| unboundable?(value) }
-            end
-
-            return collector << "1=1" if values.empty?
-          end
-
-          in_clause_length = @connection.in_clause_length
-
-          if !Array === values || values.length <= in_clause_length
-            visit(attr, collector) << " NOT IN ("
-            visit(values, collector) << ")"
-          else
-            values.each_slice(in_clause_length).each_with_index do |valuez, i|
-              collector << " AND " unless i == 0
-              visit(attr, collector) << " NOT IN ("
-              visit(valuez, collector) << ")"
-            end
-            collector
-          end
-        end
-
         def visit_Arel_Nodes_UpdateStatement(o, collector)
           # Oracle does not allow ORDER BY/LIMIT in UPDATEs.
           if o.orders.any? && o.limit.nil?

spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -707,4 +707,39 @@ class ::TestPost < ActiveRecord::Base
       expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
     end
   end
+
+  describe "homogeneous in" do
+    before(:all) do
+      ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :test_posts, force: true
+        create_table :test_comments, force: true do |t|
+          t.integer :test_post_id
+        end
+      end
+      class ::TestPost < ActiveRecord::Base
+        has_many :test_comments
+      end
+      class ::TestComment < ActiveRecord::Base
+        belongs_to :test_post
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_posts, if_exists: true
+        drop_table :test_comments, if_exists: true
+      end
+      Object.send(:remove_const, "TestPost")
+      Object.send(:remove_const, "TestComment")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should not raise undefined method length" do
+      post = TestPost.create!
+      post.test_comments << TestComment.create!
+      expect(TestComment.where(test_post_id: TestPost.select(:id)).size).to eq(1)
+    end
+  end
 end