Merge pull request #26753 from kamipo/fix_table_comment_dumping

Fix table comment dumping

3 files changed, 5 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 29a77580f5..83310233f0 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -239,7 +239,9 @@ module ActiveRecord
         end
 
         def table_options(table_name) # :nodoc:
-          { comment: table_comment(table_name) }
+          if comment = table_comment(table_name)
+            { comment: comment }
+          end
         end
 
         # Returns a comment stored in database for given table
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index a1d7e3ef24..6f24e6d182 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -229,7 +229,7 @@ HEADER
       end
 
       def format_options(options)
-        options.map { |key, value| "#{key}: #{value.inspect}" if value }.compact.join(", ")
+        options.map { |key, value| "#{key}: #{value.inspect}" }.join(", ")
       end
 
       def remove_prefix_and_suffix(table)
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 7f9a5798dd..ae3a5651a1 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -51,6 +51,7 @@ class SchemaDumperTest < ActiveRecord::TestCase
     output = standard_dump
     assert_match %r{create_table "accounts"}, output
     assert_match %r{create_table "authors"}, output
+    assert_no_match %r{(?<=, ) do \|t\|}, output
     assert_no_match %r{create_table "schema_migrations"}, output
     assert_no_match %r{create_table "ar_internal_metadata"}, output
   end