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

Add support for DISTINCT

Browse source
This commit is contained in:
Loic Nageleisen 2017-11-21 11:17:29 +01:00
parent a3712ceefd
commit adfa38baea
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/rebel/sql.rb
View file

@ -13,8 +13,9 @@ module Rebel::SQL
exec(Rebel::SQL.drop_table(table_name)) exec(Rebel::SQL.drop_table(table_name))
end end
def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil) def select(*fields, distinct: distinct, from: nil, where: nil, inner: nil, left: nil, right: nil)
exec(Rebel::SQL.select(*fields, exec(Rebel::SQL.select(*fields,
distinct: distinct,
from: from, from: from,
where: where, where: where,
inner: inner, inner: inner,
@ -178,9 +179,9 @@ module Rebel::SQL
SQL SQL
end end
def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil) def select(*fields, distinct: nil, from: nil, where: nil, inner: nil, left: nil, right: nil)
raw <<-SQL raw <<-SQL
SELECT #{names(*fields)} SELECT #{distinct ? "DISTINCT #{names(*distinct)}" : names(*fields)}
#{from?(from)} #{from?(from)}
#{inner?(inner)} #{inner?(inner)}
#{left?(left)} #{left?(left)}

8
test/test_raw.rb
View file

@ -109,6 +109,14 @@ class TestRaw < Minitest::Test
assert_str_equal(Rebel::SQL.select(Rebel::SQL.raw('1')).strip, 'SELECT 1') assert_str_equal(Rebel::SQL.select(Rebel::SQL.raw('1')).strip, 'SELECT 1')
end end
def test_select_distinct
assert_str_equal(Rebel::SQL.select(distinct: :bar, from: :foo).gsub(/\s+/, ' ').strip, 'SELECT DISTINCT "bar" FROM "foo"')
end
def test_select_distinct_multiple
assert_str_equal(Rebel::SQL.select(distinct: [:bar, :baz], from: :foo).gsub(/\s+/, ' ').strip, 'SELECT DISTINCT "bar", "baz" FROM "foo"')
end
def test_nested_select def test_nested_select
assert_str_equal(Rebel::SQL.select(Rebel::SQL.raw('*'), from: Rebel::SQL.name(:foo), where: Rebel::SQL.name(:bar).in(Rebel::SQL.select(Rebel::SQL.name(:bar), from: Rebel::SQL.name(:foo)))).gsub(/\s+/, ' ').strip, 'SELECT * FROM "foo" WHERE "bar" IN ( SELECT "bar" FROM "foo" )') assert_str_equal(Rebel::SQL.select(Rebel::SQL.raw('*'), from: Rebel::SQL.name(:foo), where: Rebel::SQL.name(:bar).in(Rebel::SQL.select(Rebel::SQL.name(:bar), from: Rebel::SQL.name(:foo)))).gsub(/\s+/, ' ').strip, 'SELECT * FROM "foo" WHERE "bar" IN ( SELECT "bar" FROM "foo" )')
end end