Merge remote-tracking branch 'origin/rake_drop_tables'

Conflicts: CHANGELOG

Merge remote-tracking branch 'origin/rake_drop_tables'
Conflicts: CHANGELOG
Dmitriy Zaporozhets
2 parents e6fbf79b 77b57c11
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
CHANGELOG
lib/backup/database.rb
lib/tasks/gitlab/db/drop_all_tables.rake
@@ -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
@@ -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
@@ -0,0 +1,10 @@
+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
	@@ -3,6 +3,7 @@ v 6.8.0		@@ -3,6 +3,7 @@ v 6.8.0
3	- 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)	3	- 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)
4	- Make user search case-insensitive (Christopher Arnold)	4	- Make user search case-insensitive (Christopher Arnold)
5	- Remove omniauth-ldap nickname bug workaround	5	- Remove omniauth-ldap nickname bug workaround
		6	+ - Drop all tables before restoring a Postgres backup
6		7
7	v 6.7.2	8	v 6.7.2
8	- Fix upgrader script	9	- Fix upgrader script
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+namespace :gitlab do
	2	+ namespace :db do
	3	+ task drop_all_tables: :environment do
	4	+ connection = ActiveRecord::Base.connection
	5	+ connection.tables.each do \|table\|
	6	+ connection.drop_table(table)
	7	+ end
	8	+ end
	9	+ end
	10	+end