diff options
Diffstat (limited to 'lib/arel/engines')
-rw-r--r-- | lib/arel/engines/memory/predicates.rb | 16 | ||||
-rw-r--r-- | lib/arel/engines/sql/attributes.rb | 2 | ||||
-rw-r--r-- | lib/arel/engines/sql/core_extensions/array.rb | 2 | ||||
-rw-r--r-- | lib/arel/engines/sql/core_extensions/nil_class.rb | 2 | ||||
-rw-r--r-- | lib/arel/engines/sql/core_extensions/object.rb | 2 | ||||
-rw-r--r-- | lib/arel/engines/sql/core_extensions/range.rb | 2 | ||||
-rw-r--r-- | lib/arel/engines/sql/predicates.rb | 18 | ||||
-rw-r--r-- | lib/arel/engines/sql/primitives.rb | 4 | ||||
-rw-r--r-- | lib/arel/engines/sql/relations/relation.rb | 2 |
9 files changed, 25 insertions, 25 deletions
diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb index 8b3e5843cc..cca6739424 100644 --- a/lib/arel/engines/memory/predicates.rb +++ b/lib/arel/engines/memory/predicates.rb @@ -5,19 +5,19 @@ module Arel operand1.eval(row).send(operator, operand2.eval(row)) end end - + class Unary < Predicate def eval(row) operand.eval(row).send(operator) end end - + class Not < Unary def eval(row) !operand.eval(row) end end - + class Polyadic < Predicate def eval(row) predicates.send(compounder) do |operation| @@ -25,15 +25,15 @@ module Arel end end end - + class Any < Polyadic def compounder; :any? end end - + class All < Polyadic def compounder; :all? end end - + class CompoundPredicate < Binary def eval(row) eval "operand1.eval(row) #{operator} operand2.eval(row)" @@ -77,7 +77,7 @@ module Arel class Match < Binary def operator; :=~ end end - + class NotMatch < Binary def eval(row) operand1.eval(row) !~ operand2.eval(row) @@ -89,7 +89,7 @@ module Arel operand2.eval(row).include?(operand1.eval(row)) end end - + class NotIn < Binary def eval(row) !(operand2.eval(row).include?(operand1.eval(row))) diff --git a/lib/arel/engines/sql/attributes.rb b/lib/arel/engines/sql/attributes.rb index 2d315d53fc..50cc802162 100644 --- a/lib/arel/engines/sql/attributes.rb +++ b/lib/arel/engines/sql/attributes.rb @@ -37,4 +37,4 @@ module Arel end end end -end
\ No newline at end of file +end diff --git a/lib/arel/engines/sql/core_extensions/array.rb b/lib/arel/engines/sql/core_extensions/array.rb index 412479dc83..05a1bb774c 100644 --- a/lib/arel/engines/sql/core_extensions/array.rb +++ b/lib/arel/engines/sql/core_extensions/array.rb @@ -12,7 +12,7 @@ module Arel def inclusion_predicate_sql "IN" end - + def exclusion_predicate_sql "NOT IN" end diff --git a/lib/arel/engines/sql/core_extensions/nil_class.rb b/lib/arel/engines/sql/core_extensions/nil_class.rb index ab990d6211..9f060ff36e 100644 --- a/lib/arel/engines/sql/core_extensions/nil_class.rb +++ b/lib/arel/engines/sql/core_extensions/nil_class.rb @@ -4,7 +4,7 @@ module Arel def equality_predicate_sql 'IS' end - + def inequality_predicate_sql 'IS NOT' end diff --git a/lib/arel/engines/sql/core_extensions/object.rb b/lib/arel/engines/sql/core_extensions/object.rb index 01c3c5479d..d2fda0fe5f 100644 --- a/lib/arel/engines/sql/core_extensions/object.rb +++ b/lib/arel/engines/sql/core_extensions/object.rb @@ -8,7 +8,7 @@ module Arel def equality_predicate_sql '=' end - + def inequality_predicate_sql '!=' end diff --git a/lib/arel/engines/sql/core_extensions/range.rb b/lib/arel/engines/sql/core_extensions/range.rb index b5b1534e48..c711ffdde6 100644 --- a/lib/arel/engines/sql/core_extensions/range.rb +++ b/lib/arel/engines/sql/core_extensions/range.rb @@ -8,7 +8,7 @@ module Arel def inclusion_predicate_sql "BETWEEN" end - + def exclusion_predicate_sql "NOT BETWEEN" end diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb index 59b0ab0929..93d2a2f619 100644 --- a/lib/arel/engines/sql/predicates.rb +++ b/lib/arel/engines/sql/predicates.rb @@ -5,13 +5,13 @@ module Arel "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}" end end - + class Unary < Predicate def to_sql(formatter = nil) "#{predicate_sql} (#{operand.to_sql(formatter)})" end end - + class Not < Unary def predicate_sql; "NOT" end end @@ -29,19 +29,19 @@ module Arel class And < CompoundPredicate def predicate_sql; "AND" end end - + class Polyadic < Predicate def to_sql(formatter = nil) - "(" + + "(" + predicates.map {|p| p.to_sql(formatter)}.join(" #{predicate_sql} ") + ")" end end - + class Any < Polyadic def predicate_sql; "OR" end end - + class All < Polyadic def predicate_sql; "AND" end end @@ -77,7 +77,7 @@ module Arel class Match < Binary def predicate_sql; 'LIKE' end end - + class NotMatch < Binary def predicate_sql; 'NOT LIKE' end end @@ -92,10 +92,10 @@ module Arel super end end - + def predicate_sql; operand2.inclusion_predicate_sql end end - + class NotIn < Binary def predicate_sql; operand2.exclusion_predicate_sql end end diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb index 15a27b2256..1b215d2b54 100644 --- a/lib/arel/engines/sql/primitives.rb +++ b/lib/arel/engines/sql/primitives.rb @@ -29,7 +29,7 @@ module Arel def inclusion_predicate_sql value.inclusion_predicate_sql end - + def exclusion_predicate_sql value.exclusion_predicate_sql end @@ -37,7 +37,7 @@ module Arel def equality_predicate_sql value.equality_predicate_sql end - + def inequality_predicate_sql value.inequality_predicate_sql end diff --git a/lib/arel/engines/sql/relations/relation.rb b/lib/arel/engines/sql/relations/relation.rb index fc353fe0c8..2136f85e5a 100644 --- a/lib/arel/engines/sql/relations/relation.rb +++ b/lib/arel/engines/sql/relations/relation.rb @@ -21,7 +21,7 @@ module Arel def inclusion_predicate_sql "IN" end - + def exclusion_predicate_sql "NOT IN" end |