diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-27 20:46:07 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-27 20:46:07 -0700 |
commit | cf46c314e2909748b3a0319e3830c116fe6672da (patch) | |
tree | 9f8317610a85ef1e74b49ac08cbc329a03be6908 /activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | |
parent | 0739d146bcd31247391d64b852885634d78e576d (diff) | |
parent | 9600e0b02973ce5dd36642511d542a6b62983a5e (diff) | |
download | rails-cf46c314e2909748b3a0319e3830c116fe6672da.tar.gz rails-cf46c314e2909748b3a0319e3830c116fe6672da.tar.bz2 rails-cf46c314e2909748b3a0319e3830c116fe6672da.zip |
Merge pull request #9944 from where/rebased-fulltext-spacial
Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 4 |
1 files changed, 2 insertions, 2 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 0e1afbae8d..0168c36abc 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -160,9 +160,9 @@ module ActiveRecord desc_order_columns = inddef.scan(/(\w+) DESC/).flatten orders = desc_order_columns.any? ? Hash[desc_order_columns.map {|order_column| [order_column, :desc]}] : {} where = inddef.scan(/WHERE (.+)$/).flatten[0] - type = inddef.scan(/USING (.+?) /).flatten[0].to_sym + using = inddef.scan(/USING (.+?) /).flatten[0].to_sym - column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, type) + column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, nil, using) end.compact end |