From 90ab5a59bb28053c9da768679b8036caa7885e95 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 7 Jul 2015 15:34:06 +0200
Subject: [PATCH] Use native Postgres database cleaning during backup restore

We were using hacks to drop tables etc during a Postgres backup
restore. With this change, we let pg_dump insert the DROP TABLE
statements it needs at the start of the SQL dump.
---
 CHANGELOG                                            |  1 +
 lib/backup/database.rb                               |  7 ++-----
 lib/tasks/gitlab/db/drop_all_postgres_sequences.rake | 10 ----------
 lib/tasks/gitlab/db/drop_all_tables.rake             | 10 ----------
 4 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 lib/tasks/gitlab/db/drop_all_postgres_sequences.rake
 delete mode 100644 lib/tasks/gitlab/db/drop_all_tables.rake

diff --git a/CHANGELOG b/CHANGELOG
index d538bb42992..170cb81bcce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 7.13.0 (unreleased)
   - Correctly show anonymous authorized applications under Profile > Applications.
   - Query Optimization in MySQL.
   - Allow users to be blocked and unblocked via the API
+  - Use native Postgres database cleaning during backup restore
 
 v 7.12.2
   - Correctly show anonymous authorized applications under Profile > Applications.
diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index 9ab6aca276d..7aa54dd55ae 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -18,7 +18,8 @@ module Backup
       when "postgresql" then
         $progress.print "Dumping PostgreSQL database #{config['database']} ... "
         pg_env
-        system('pg_dump', config['database'], out: db_file_name)
+        # Pass '--clean' to include 'DROP TABLE' statements in the DB dump.
+        system('pg_dump', '--clean', config['database'], out: db_file_name)
       end
       report_success(success)
       abort 'Backup failed' unless success
@@ -31,10 +32,6 @@ module Backup
         system('mysql', *mysql_args, config['database'], in: db_file_name)
       when "postgresql" then
         $progress.print "Restoring PostgreSQL database #{config['database']} ... "
-        # Drop all tables because PostgreSQL DB dumps do not contain DROP TABLE
-        # statements like MySQL.
-        Rake::Task["gitlab:db:drop_all_tables"].invoke
-        Rake::Task["gitlab:db:drop_all_postgres_sequences"].invoke
         pg_env
         system('psql', config['database'], '-f', db_file_name)
       end
diff --git a/lib/tasks/gitlab/db/drop_all_postgres_sequences.rake b/lib/tasks/gitlab/db/drop_all_postgres_sequences.rake
deleted file mode 100644
index e9cf0a9b5e8..00000000000
--- a/lib/tasks/gitlab/db/drop_all_postgres_sequences.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace :gitlab do
-  namespace :db do
-    task drop_all_postgres_sequences: :environment do
-      connection = ActiveRecord::Base.connection
-      connection.execute("SELECT c.relname FROM pg_class c WHERE c.relkind = 'S';").each do |sequence|
-        connection.execute("DROP SEQUENCE #{sequence['relname']}")
-      end
-    end
-  end
-end
diff --git a/lib/tasks/gitlab/db/drop_all_tables.rake b/lib/tasks/gitlab/db/drop_all_tables.rake
deleted file mode 100644
index a66030ab93a..00000000000
--- a/lib/tasks/gitlab/db/drop_all_tables.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace :gitlab do
-  namespace :db do
-    task drop_all_tables: :environment do
-      connection = ActiveRecord::Base.connection
-      connection.tables.each do |table|
-        connection.drop_table(table)
-      end
-    end
-  end
-end