diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-11-22 04:01:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 04:01:37 +0900 |
| commit | ca0339215f07dfbb927d727b3f66701f176d0a67 (patch) | |
| tree | feccfe197fc3163b815e478ee3d041f992afb1a7 /activerecord/lib | |
| parent | 536a190ab3690810a3b342b897f2585c4971229d (diff) | |
| parent | a6e0eeb8623168acd62edd23478368f04d25faa5 (diff) | |
| download | rails-ca0339215f07dfbb927d727b3f66701f176d0a67.tar.gz rails-ca0339215f07dfbb927d727b3f66701f176d0a67.tar.bz2 rails-ca0339215f07dfbb927d727b3f66701f176d0a67.zip | |
Merge pull request #34498 from ThomBian/thombian/fix-opclass-parsing
Fixing an issue when parsing an opclass by allowing indexed column in indexdef to be wrapped up by double quotes
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index fae3ddbad4..f39e94ee7f 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -124,7 +124,7 @@ module ActiveRecord # add info on sort order (only desc order is explicitly specified, asc is the default) # and non-default opclasses - expressions.scan(/(?<column>\w+)\s?(?<opclass>\w+_ops)?\s?(?<desc>DESC)?\s?(?<nulls>NULLS (?:FIRST|LAST))?/).each do |column, opclass, desc, nulls| + expressions.scan(/(?<column>\w+)"?\s?(?<opclass>\w+_ops)?\s?(?<desc>DESC)?\s?(?<nulls>NULLS (?:FIRST|LAST))?/).each do |column, opclass, desc, nulls| opclasses[column] = opclass.to_sym if opclass if nulls orders[column] = [desc, nulls].compact.join(" ") |