diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-09 19:58:58 +0200 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-10 09:50:32 +0200 |
commit | 58d69d54c57fb1bbe8836f5a1a776edb59077ef5 (patch) | |
tree | 23b2bde15e9207e09cffd4010ebd8f63fe0bff86 /config | |
parent | f646a8b9bc95fd6cecaa754f7dd0e8370c201502 (diff) | |
download | gitlab-ce-58d69d54c57fb1bbe8836f5a1a776edb59077ef5.tar.gz |
Add missing `:comment` attribute
In Rails 5 IndexDefinition contains also `:comment` attribute.
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/postgresql_opclasses_support.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/initializers/postgresql_opclasses_support.rb b/config/initializers/postgresql_opclasses_support.rb index 03bda44a630..7b8afc78817 100644 --- a/config/initializers/postgresql_opclasses_support.rb +++ b/config/initializers/postgresql_opclasses_support.rb @@ -41,7 +41,12 @@ module ActiveRecord # Abstract representation of an index definition on a table. Instances of # this type are typically created and returned by methods in database # adapters. e.g. ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter#indexes - class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :type, :using, :opclasses) #:nodoc: + attrs = [:table, :name, :unique, :columns, :lengths, :orders, :where, :type, :using, :opclasses] + + # In Rails 5 the second last attribute is newly `:comment` + attrs.insert(-2, :comment) if Gitlab.rails5? + + class IndexDefinition < Struct.new(*attrs) #:nodoc: end end end |