lloeki/rebel
1
0
Fork 0
mirror of https://github.com/lloeki/rebel.git synced 2025-12-06 01:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

wrap AND first member w/ parens

Browse source
This commit is contained in:
Loic Nageleisen 2017-03-03 16:13:06 +01:00
parent ee34b9c600
commit 075957be04
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/rebel/sql.rb
View file

@ -65,6 +65,10 @@ module Rebel::SQL
Raw.new("(#{self})")
end
def parens?
wants_parens? ? parens : self
end
def as(n)
Raw.new(self + " AS #{Rebel::SQL.name(n)}")
end
@ -82,7 +86,7 @@ module Rebel::SQL
end
def and(*clause)
Raw.new("#{self} AND #{Rebel::SQL.and_clause(*clause)}")
Raw.new("#{self.parens?} AND #{Rebel::SQL.and_clause(*clause)}")
end
def or(*clause)
@ -313,7 +317,7 @@ module Rebel::SQL
case e
when Hash then and_clause(*e.to_a)
when Array then clause_term(e[0], e[1])
when Raw then e.wants_parens? && clause.count > 1 ? "(#{e})" : e
when Raw then e.parens?
when String then e
else raise NotImplementedError, e.class
end

10
test/test_raw.rb
View file

@ -15,6 +15,14 @@ class TestRaw < Minitest::Test
assert_str_equal(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2)), '"foo" = 1 OR "bar" = 2')
end
def test_and_or
assert_str_equal(Rebel::SQL.name(:foo).eq(0).and(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2))), '"foo" = 0 AND ("foo" = 1 OR "bar" = 2)')
end
def test_or_and_or
assert_str_equal(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2)).and(Rebel::SQL.name(:foo).eq(3).or(Rebel::SQL.name(:bar).eq(4))), '("foo" = 1 OR "bar" = 2) AND ("foo" = 3 OR "bar" = 4)')
end
def test_is
assert_str_equal(Rebel::SQL.name(:foo).is(nil), '"foo" IS NULL')
assert_str_equal(Rebel::SQL.name(:foo).is(42), '"foo" = 42')
@ -62,7 +70,7 @@ class TestRaw < Minitest::Test
def test_where
assert_str_equal(Rebel::SQL.where?(foo: 1, bar: 2, baz: 3), 'WHERE "foo" = 1 AND "bar" = 2 AND "baz" = 3')
assert_str_equal(Rebel::SQL.where?(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2)), Rebel::SQL.name(:baz).eq(3)), 'WHERE ("foo" = 1 OR "bar" = 2) AND "baz" = 3')
assert_str_equal(Rebel::SQL.where?(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2))), 'WHERE "foo" = 1 OR "bar" = 2')
assert_str_equal(Rebel::SQL.where?(Rebel::SQL.name(:foo).eq(1).or(Rebel::SQL.name(:bar).eq(2))), 'WHERE ("foo" = 1 OR "bar" = 2)')
end
def test_join