diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-21 14:58:15 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-21 14:58:15 -0700 |
| commit | 83d045d2d8881e4310f0f54376a5e04d395f3c7a (patch) | |
| tree | a2e88cd0c5d1aa629ac5702225c5ea48b807cb9f /lib/arel/nodes.rb | |
| parent | 856fd75c9b6defb7711f93e6ecda2932e98c4113 (diff) | |
| parent | 05887fc406820f2e8fecc5cedcc42b87cf9f0ab1 (diff) | |
| download | rails-83d045d2d8881e4310f0f54376a5e04d395f3c7a.tar.gz rails-83d045d2d8881e4310f0f54376a5e04d395f3c7a.tar.bz2 rails-83d045d2d8881e4310f0f54376a5e04d395f3c7a.zip | |
Merge branch 'master' of github.com:rails/arel
* 'master' of github.com:rails/arel:
Make as factory method convert alias name to SqlLiteral
Replace MathOperation with InfixOperation to support more operators
Diffstat (limited to 'lib/arel/nodes.rb')
| -rw-r--r-- | lib/arel/nodes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/nodes.rb b/lib/arel/nodes.rb index 4b97e28668..cf2aeb2ddc 100644 --- a/lib/arel/nodes.rb +++ b/lib/arel/nodes.rb @@ -18,7 +18,7 @@ require 'arel/nodes/join_source' require 'arel/nodes/ordering' require 'arel/nodes/delete_statement' require 'arel/nodes/table_alias' -require 'arel/nodes/math_operation' +require 'arel/nodes/infix_operation' # nary require 'arel/nodes/and' |