diff --git a/lib/rebel/sql.rb b/lib/rebel/sql.rb index 4f07869..587996b 100644 --- a/lib/rebel/sql.rb +++ b/lib/rebel/sql.rb @@ -296,6 +296,7 @@ module Rebel::SQL def and_clause(*clause) clause.map do |e| 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 String then e diff --git a/test/test_raw.rb b/test/test_raw.rb index fbc8552..a7d702b 100644 --- a/test/test_raw.rb +++ b/test/test_raw.rb @@ -54,6 +54,7 @@ class TestRaw < Minitest::Test end 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') end