From cfe67a63b6d1c48fb4ddcb9cf5a303bb47036b5f Mon Sep 17 00:00:00 2001 From: Ari Pollak Date: Fri, 24 Feb 2017 16:54:55 -0500 Subject: Only remove comments before the first statement --- .../lib/active_record/tasks/postgresql_database_tasks.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb index 83b82506d3..f1af90c1e8 100644 --- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb @@ -5,6 +5,7 @@ module ActiveRecord class PostgreSQLDatabaseTasks # :nodoc: DEFAULT_ENCODING = ENV["CHARSET"] || "utf8" ON_ERROR_STOP_1 = "ON_ERROR_STOP=1".freeze + SQL_COMMENT_BEGIN = "--".freeze delegate :connection, :establish_connection, :clear_active_connections!, to: ActiveRecord::Base @@ -67,7 +68,7 @@ module ActiveRecord end args << configuration["database"] run_cmd("pg_dump", args, "dumping") - remove_sql_comments(filename) + remove_sql_header_comments(filename) File.open(filename, "a") { |f| f << "SET search_path TO #{connection.schema_search_path};\n\n" } end @@ -114,11 +115,15 @@ module ActiveRecord msg end - def remove_sql_comments(filename) - tempfile = Tempfile.open('uncommented_structure.sql') + def remove_sql_header_comments(filename) + removing_comments = true + tempfile = Tempfile.open("uncommented_structure.sql") begin File.foreach(filename) do |line| - tempfile << line unless line.start_with?('--') + unless removing_comments && (line.start_with?(SQL_COMMENT_BEGIN) || line.blank?) + tempfile << line + removing_comments = false + end end ensure tempfile.close -- cgit v1.2.3