From 2f0a8ae8d4aed502a0b6c4780d4545c147bdcb47 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 21 Jul 2010 10:34:11 -0700 Subject: fixing incompatibilities with AR --- lib/arel/engines/sql/engine.rb | 3 +-- lib/arel/engines/sql/predicates.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/arel/engines/sql') 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 -- cgit v1.2.3