Merge pull request #2073 from yahonda/backport_2070_to_release60

Merge pull request #2070 from koic/build_subselect_doesnt_have_ordering

Author: yahonda

lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -747,3 +747,26 @@ def bind_string(name, value)
 module ActiveRecord
   autoload :OracleEnhancedProcedures, "active_record/connection_adapters/oracle_enhanced/procedures"
 end
+
+# Backport #2070 into relese60 branch by adding some dirty monkey patch
+# Because #2002 has been merged to release61 branch or newer, not available for release60 branch.
+module Arel # :nodoc: all
+  module Visitors
+    class Oracle < Arel::Visitors::ToSql
+      private
+        def build_subselect(key, o)
+          stmt             = super
+          stmt.orders      = [] # `orders` will never be set to prevent `ORA-00907`.
+          stmt
+        end
+    end
+    class Oracle12 < Arel::Visitors::ToSql
+      private
+        def build_subselect(key, o)
+          stmt             = super
+          stmt.orders      = [] # `orders` will never be set to prevent `ORA-00907`.
+          stmt
+        end
+    end
+  end
+end

spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -150,6 +150,45 @@ class ::TestEmployee2 < ActiveRecord::Base
     end
   end
 
+  describe "`has_many` assoc has `dependent: :delete_all` with `order`" do
+    before(:all) do
+      schema_define do
+        create_table :test_posts do |t|
+          t.string      :title
+        end
+        create_table :test_comments do |t|
+          t.integer     :test_post_id
+          t.string      :description
+        end
+        add_index :test_comments, :test_post_id
+      end
+      class ::TestPost < ActiveRecord::Base
+        has_many :test_comments, -> { order(:id) }, dependent: :delete_all
+      end
+      class ::TestComment < ActiveRecord::Base
+        belongs_to :test_post
+      end
+      TestPost.transaction do
+        post = TestPost.create!(title: "Title")
+        TestComment.create!(test_post_id: post.id, description: "Description")
+      end
+    end
+
+    after(:all) do
+      schema_define do
+        drop_table :test_comments
+        drop_table :test_posts
+      end
+      Object.send(:remove_const, "TestPost")
+      Object.send(:remove_const, "TestComment")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should not occur `ActiveRecord::StatementInvalid: OCIError: ORA-00907: missing right parenthesis`" do
+      expect { TestPost.first.destroy }.not_to raise_error
+    end
+  end
+
   describe "eager loading" do
     before(:all) do
       schema_define do