diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-05 11:06:23 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-05 11:06:23 +0000 |
| commit | 10125b724ac23e7bb548c6e087109348dae5df36 (patch) | |
| tree | 71465181cc2fa4b50416147fc41a6e7228f57b10 /config/initializers | |
| parent | 7e54d0465c9bf7d52a49b08472d7b12d1c655a91 (diff) | |
| parent | 85a7e0813e9806ad3eb853e4a48c09ae5f78f94c (diff) | |
| download | gitlab-ce-10125b724ac23e7bb548c6e087109348dae5df36.tar.gz | |
Merge branch 'rails5-fix-46236' into 'master'
Support rails5 in postgres indexes function and fix some migrations
Closes #46236
See merge request gitlab-org/gitlab-ce!19400
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/postgresql_opclasses_support.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/initializers/postgresql_opclasses_support.rb b/config/initializers/postgresql_opclasses_support.rb index c2f3023b330..03bda44a630 100644 --- a/config/initializers/postgresql_opclasses_support.rb +++ b/config/initializers/postgresql_opclasses_support.rb @@ -107,8 +107,15 @@ module ActiveRecord result.map do |row| index_name = row[0] - unique = row[1] == 't' + unique = if Gitlab.rails5? + row[1] + else + row[1] == 't' + end indkey = row[2].split(" ") + if Gitlab.rails5? + indkey = indkey.map(&:to_i) + end inddef = row[3] oid = row[4] |