Prefer to place a table options before force: :cascade

Oracle enhanced adapter implements table comments options Refer rails/rails#28005 and rsim#1439
yahonda · Aug 29, 2017 · ff41e5c · ff41e5c
1 parent 8259fdb
commit ff41e5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb b/lib/active_record/connection_adapters/oracle_enhanced/schema_dumper.rb
@@ -126,14 +126,12 @@ def table(table, stream)
                 tbl.print ", id: false"
               end
 
-              tbl.print ", force: :cascade"
-
               table_options = @connection.table_options(table)
               if table_options.present?
                 tbl.print ", #{format_options(table_options)}"
               end
 
-              tbl.puts " do |t|"
+              tbl.puts ", force: :cascade do |t|"
 
               # then dump all non-primary key columns
               columns.each do |column|

diff --git a/spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
@@ -461,7 +461,7 @@ class ::TestName < ActiveRecord::Base
 
     it "should dump table comments" do
       output = dump_table_schema "test_table_comments"
-      expect(output).to match(/comment: "this is a \\"table comment\\"!"/)
+      expect(output).to match(/create_table "test_table_comments", comment: "this is a \\"table comment\\"!", force: :cascade do \|t\|$/)
     end
   end