diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 16:20:48 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-04-08 16:20:48 -0700 |
| commit | c8140beae74bd63f2c1edd31d6e7ce9bcd31169d (patch) | |
| tree | d1d5aed6ab16adada7807bd34964f31464c01931 /lib/arel/visitors.rb | |
| parent | 4e2e1cc63a81bf549712c4cacfe1f3dc32e632a2 (diff) | |
| parent | 55c0071ce3685a78b4f039be24b2ab40b8779467 (diff) | |
| download | rails-c8140beae74bd63f2c1edd31d6e7ce9bcd31169d.tar.gz rails-c8140beae74bd63f2c1edd31d6e7ce9bcd31169d.tar.bz2 rails-c8140beae74bd63f2c1edd31d6e7ce9bcd31169d.zip | |
Merge branch 'master' into collector
* master:
remove order_clauses since we do not use it
fix whitespace and unsupported method args
Add Regexp and NotRegexp nodes for PostgreSQL
Revert "Merge pull request #253 from corrupt952/master"
flatten object.children in visit_Arel_Node_And
Added right and full outer joins
Conflicts:
lib/arel/visitors/to_sql.rb
lib/arel/visitors/visitor.rb
Diffstat (limited to 'lib/arel/visitors.rb')
| -rw-r--r-- | lib/arel/visitors.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/arel/visitors.rb b/lib/arel/visitors.rb index 8276eace2b..3986ad9ce5 100644 --- a/lib/arel/visitors.rb +++ b/lib/arel/visitors.rb @@ -8,7 +8,6 @@ require 'arel/visitors/mssql' require 'arel/visitors/oracle' require 'arel/visitors/join_sql' require 'arel/visitors/where_sql' -require 'arel/visitors/order_clauses' require 'arel/visitors/dot' require 'arel/visitors/ibm_db' require 'arel/visitors/informix' |