diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-10 10:41:24 -0800 |
| commit | 522b72fd28b898c914cfbdbc31837e56702f60d5 (patch) | |
| tree | 4d1322e4a692d3c1c4b4b2519bd80e068c3b6b8b /activerecord/lib/active_record/schema_dumper.rb | |
| parent | a9a12700c72353397cf644073e58a3a1c60c30a2 (diff) | |
| parent | 3092324ef4e2f6f096adfbcf92597502b3ce91aa (diff) | |
| download | rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.gz rails-522b72fd28b898c914cfbdbc31837e56702f60d5.tar.bz2 rails-522b72fd28b898c914cfbdbc31837e56702f60d5.zip | |
Merge branch 'master' into instance_reader
* master:
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
make Range#overlaps? accept Range of Time
improved test case for partial indices
Made schema dumper recognize partial indices' where statements
Added where option to add_index to support postgresql partial indices
Diffstat (limited to 'activerecord/lib/active_record/schema_dumper.rb')
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb index 2a565b51c6..dcbd165e58 100644 --- a/activerecord/lib/active_record/schema_dumper.rb +++ b/activerecord/lib/active_record/schema_dumper.rb @@ -197,6 +197,8 @@ HEADER index_orders = (index.orders || {}) statement_parts << (':order => ' + index.orders.inspect) unless index_orders.empty? + statement_parts << (':where => ' + index.where.inspect) if index.where + ' ' + statement_parts.join(', ') end |