diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-09 22:35:47 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-09 22:35:47 +0000 |
commit | b51a36cb2b34b63246beac2bd7ebf4f646ca906a (patch) | |
tree | 860ec815d458d5c179ade74a3e3d163724867cb1 | |
parent | dbc4f71868b63a01b2da31d6330a834f05757501 (diff) | |
parent | bf92ea687f7085d8ea0168f47507d0bc459b6d36 (diff) | |
download | gitlab-ce-b51a36cb2b34b63246beac2bd7ebf4f646ca906a.tar.gz |
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
-rw-r--r-- | lib/tasks/gitlab/db.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index e3135532540..7230b9485be 100644 --- 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' |