From 0780c444dbf9793fdffaa631fa929d77f109e24f Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Tue, 11 Oct 2016 03:55:06 +0900 Subject: Fix table comment dumping Follow up to #26735. If `table_options` returns `{ comment: nil }`, `create_table` line is broken. Example: ```ruby create_table "accounts", force: :cascade, do |t| ``` --- .../active_record/connection_adapters/postgresql/schema_statements.rb | 4 +++- activerecord/lib/active_record/schema_dumper.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') 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) -- cgit v1.2.3