Merge remote-tracking branch 'origin/rake_drop_tables'

Conflicts:
	CHANGELOG

CHANGELOG

@@ -3,6 +3,7 @@ v 6.8.0
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
   - Make user search case-insensitive (Christopher Arnold)
   - Remove omniauth-ldap nickname bug workaround
+  - Drop all tables before restoring a Postgres backup
 v 6.7.2
   - Fix upgrader script

lib/backup/database.rb

@@ -29,9 +29,10 @@ module Backup
         print "Restoring MySQL database #{config['database']} ... "
         system('mysql', *mysql_args, config['database'], in: db_file_name)
       when "postgresql" then
-        puts "Destructively rebuilding database schema for RAILS_ENV #{Rails.env}"
-        Rake::Task["db:schema:load"].invoke
         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
         pg_env
         system('psql', config['database'], '-f', db_file_name)
       end

lib/tasks/gitlab/db/drop_all_tables.rake

+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