diff --git a/lib/capistrano-db-tasks/database.rb b/lib/capistrano-db-tasks/database.rb index 8eace6d..5218c90 100644 --- a/lib/capistrano-db-tasks/database.rb +++ b/lib/capistrano-db-tasks/database.rb @@ -44,7 +44,7 @@ def dump_cmd if mysql? "mysqldump #{credentials} #{database} --lock-tables=false" elsif postgresql? - "#{pgpass} pg_dump --no-acl --no-owner #{credentials} #{database}" + "#{pgpass} pg_dump --no-acl --no-owner -c #{credentials} #{database}" end end @@ -52,8 +52,7 @@ def import_cmd(file) if mysql? "mysql #{credentials} -D #{database} < #{file}" elsif postgresql? - terminate_connection_sql = "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '#{database}' AND pid <> pg_backend_pid();" - "#{pgpass} psql -c \"#{terminate_connection_sql};\" #{credentials}; #{pgpass} dropdb #{credentials} #{database}; #{pgpass} createdb #{credentials} #{database}; #{pgpass} psql #{credentials} -d #{database} < #{file}" + "#{pgpass} psql #{credentials} -d #{database} < #{file}" end end