diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-21 10:34:11 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-21 10:34:11 -0700 |
| commit | 2f0a8ae8d4aed502a0b6c4780d4545c147bdcb47 (patch) | |
| tree | 601c2aef98a6fedd5b8a6322685bc300c50c42b9 /lib/arel/engines/sql | |
| parent | 862067cf14213ee9df0784250301a1987b3822db (diff) | |
| download | rails-2f0a8ae8d4aed502a0b6c4780d4545c147bdcb47.tar.gz rails-2f0a8ae8d4aed502a0b6c4780d4545c147bdcb47.tar.bz2 rails-2f0a8ae8d4aed502a0b6c4780d4545c147bdcb47.zip | |
fixing incompatibilities with AR
Diffstat (limited to 'lib/arel/engines/sql')
| -rw-r--r-- | lib/arel/engines/sql/engine.rb | 3 | ||||
| -rw-r--r-- | lib/arel/engines/sql/predicates.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb index 07940c6ef1..a314a972c0 100644 --- a/lib/arel/engines/sql/engine.rb +++ b/lib/arel/engines/sql/engine.rb @@ -4,11 +4,10 @@ module Arel def initialize(ar = nil) @ar = ar - @connection = nil end def connection - @connection ||= @ar && @ar.connection + @ar ? @ar.connection : nil end def adapter_name diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb index 21d8f840c9..74a36d77c9 100644 --- a/lib/arel/engines/sql/predicates.rb +++ b/lib/arel/engines/sql/predicates.rb @@ -1,6 +1,6 @@ module Arel module Predicates - class Binary < Predicate + class Binary < Unary def to_sql(formatter = nil) "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}" end |