diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 29520ed9c81adaeb33b55c59e383390ca7c3fe87..51819f798075605b415035005f4fd2e6d8d4376e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -284,10 +284,10 @@ def create_table(table_name, comment: nil, **options)
         end
 
         if supports_comments? && !supports_comments_in_create?
-          change_table_comment(table_name, comment) if comment
+          change_table_comment(table_name, comment) if comment.present?
 
           td.columns.each do |column|
-            change_column_comment(table_name, column.name, column.comment) if column.comment
+            change_column_comment(table_name, column.name, column.comment) if column.comment.present?
           end
         end
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index be8511f119122dec9c05c41314c8700e8ffd0a0b..5923136df8d68f9565976b192ca19eb16f3b0e84 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -509,7 +509,7 @@ def add_index(table_name, column_name, options = {}) #:nodoc:
       end
 
       def add_sql_comment!(sql, comment) # :nodoc:
-        sql << " COMMENT #{quote(comment)}" if comment
+        sql << " COMMENT #{quote(comment)}" if comment.present?
         sql
       end
 
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index ab2d64e9031d3fe64cdc0aea056fa1128fff2804..41fed004a0493e99847280e13ed5b9c75b75139e 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -128,9 +128,7 @@ def table(table, stream)
 
           table_options = @connection.table_options(table)
           if table_options.present?
-            table_options.each do |key, value|
-              tbl.print ", #{key}: #{value.inspect}" if value.present?
-            end
+            tbl.print ", #{format_options(table_options)}"
           end
 
           tbl.puts " do |t|"
@@ -237,6 +235,10 @@ def foreign_keys(table, stream)
         end
       end
 
+      def format_options(options)
+        options.map { |key, value| "#{key}: #{value.inspect}" if value }.compact.join(", ")
+      end
+
       def remove_prefix_and_suffix(table)
         table.gsub(/^(#{@options[:table_name_prefix]})(.+)(#{@options[:table_name_suffix]})$/,  "\\2")
       end