Merge branch 'fix-issue-15259-postgresql' into 'master'

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259 See merge request !4577

Merge branch 'fix-issue-15259-postgresql' into 'master'
b51a36cb · Robert Speicher · dbc4f718 · bf92ea68 · b51a36cb
Commit b51a36cb authored Jun 09, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

db.rake lib/tasks/gitlab/db.rake +1 -1

No files found.
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -34,7 +34,7 @@ namespace :gitlab do
      # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html
      # MySQL: http://dev.mysql.com/doc/refman/5.7/en/drop-table.html
      # Add `IF EXISTS` because cascade could have already deleted a table.
-      tables.each { |t| connection.execute("DROP TABLE IF EXISTS `#{t}` CASCADE") }
+      tables.each { |t| connection.execute("DROP TABLE IF EXISTS #{connection.quote_table_name(t)} CASCADE") }
    end

    desc 'Configures the database by running migrate, or by loading the schema and seeding if needed'