From 3bb41b81f0cccc9950faf204c410923bbedb2cce Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Thu, 23 Nov 2017 10:39:59 +0100 Subject: [PATCH 1/6] Generate less whitespace --- lib/rebel/sql.rb | 74 +++++++++++++++++++++--------------------------- test/test_raw.rb | 26 ++++++++--------- 2 files changed, 46 insertions(+), 54 deletions(-) diff --git a/lib/rebel/sql.rb b/lib/rebel/sql.rb index b79d56d..8a91797 100644 --- a/lib/rebel/sql.rb +++ b/lib/rebel/sql.rb @@ -183,67 +183,59 @@ module Rebel end def create_table(table_name, desc) - raw <<-SQL - CREATE TABLE #{name(table_name)} ( - #{list(desc.map { |k, v| "#{name(k)} #{v}" })} - ) - SQL + raw %[CREATE TABLE #{name(table_name)} (#{list(desc.map { |k, v| "#{name(k)} #{v}" })})] end def drop_table(table_name) - raw <<-SQL - DROP TABLE #{name(table_name)} - SQL + raw "DROP TABLE #{name(table_name)}" end def select(*fields, distinct: nil, from: nil, where: nil, inner: nil, left: nil, right: nil, group: nil, order: nil, limit: nil, offset: nil) - raw <<-SQL - SELECT #{distinct ? "DISTINCT #{names(*distinct)}" : names(*fields)} - #{from?(from)} - #{inner?(inner)} - #{left?(left)} - #{right?(right)} - #{where?(where)} - #{group?(group)} - #{order?(order)} - #{limit?(limit, offset)} - SQL + raw [ + "SELECT #{distinct ? "DISTINCT #{names(*distinct)}" : names(*fields)}", + from?(from), + inner?(inner), + left?(left), + right?(right), + where?(where), + group?(group), + order?(order), + limit?(limit, offset), + ].compact.join(' ') end def insert_into(table_name, *rows) - raw <<-SQL - INSERT INTO #{name(table_name)} (#{names(*rows.first.keys)}) - VALUES #{list(rows.map { |r| "(#{values(*r.values)})" })} - SQL + raw [ + "INSERT INTO #{name(table_name)} (#{names(*rows.first.keys)})", + "VALUES #{list(rows.map { |r| "(#{values(*r.values)})" })}", + ].join(' ') end def update(table_name, set: nil, where: nil, inner: nil, left: nil, right: nil) raise ArgumentError if set.nil? - raw <<-SQL - UPDATE #{name(table_name)} - SET #{assign_clause(set)} - #{inner?(inner)} - #{left?(left)} - #{right?(right)} - #{where?(where)} - SQL + raw [ + "UPDATE #{name(table_name)}", + "SET #{assign_clause(set)}", + inner?(inner), + left?(left), + right?(right), + where?(where), + ].compact.join(' ') end def delete_from(table_name, where: nil, inner: nil, left: nil, right: nil) - raw <<-SQL - DELETE FROM #{name(table_name)} - #{inner?(inner)} - #{left?(left)} - #{right?(right)} - #{where?(where)} - SQL + raw [ + "DELETE FROM #{name(table_name)}", + inner?(inner), + left?(left), + right?(right), + where?(where), + ].join(' ') end def truncate(table_name) - raw <<-SQL - TRUNCATE #{name(table_name)} - SQL + raw "TRUNCATE #{name(table_name)}" end ## Functions diff --git a/test/test_raw.rb b/test/test_raw.rb index 185f84c..c5c246c 100644 --- a/test/test_raw.rb +++ b/test/test_raw.rb @@ -179,7 +179,7 @@ class TestRaw < Minitest::Test end def test_select - assert_sql('SELECT * FROM "foo"') { select(raw('*'), from: name(:foo)).gsub(/\s+/, ' ').strip } + assert_sql('SELECT * FROM "foo"') { select(raw('*'), from: name(:foo)) } end def test_select_without_from @@ -187,50 +187,50 @@ class TestRaw < Minitest::Test end def test_select_distinct - assert_sql('SELECT DISTINCT "bar" FROM "foo"') { select(distinct: :bar, from: :foo).gsub(/\s+/, ' ').strip } + assert_sql('SELECT DISTINCT "bar" FROM "foo"') { select(distinct: :bar, from: :foo) } end def test_select_distinct_multiple - assert_sql('SELECT DISTINCT "bar", "baz" FROM "foo"') { select(distinct: [:bar, :baz], from: :foo).gsub(/\s+/, ' ').strip } + assert_sql('SELECT DISTINCT "bar", "baz" FROM "foo"') { select(distinct: [:bar, :baz], from: :foo) } end def test_select_group_by - assert_sql('SELECT "bar" FROM "foo" GROUP BY "baz"') { select(:bar, from: :foo, group: by(:baz)).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" GROUP BY "baz"') { select(:bar, from: :foo, group: by(:baz)) } end def test_select_group_by_having - assert_sql('SELECT "bar" FROM "foo" GROUP BY "baz" HAVING COUNT("qux") > 5') { select(:bar, from: :foo, group: by(:baz).having(count(:qux).gt(5))).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" GROUP BY "baz" HAVING COUNT("qux") > 5') { select(:bar, from: :foo, group: by(:baz).having(count(:qux).gt(5))) } end def test_select_order_by - assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz"') { select(:bar, from: :foo, order: by(:baz)).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz"') { select(:bar, from: :foo, order: by(:baz)) } end def test_select_order_by_asc - assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" ASC') { select(:bar, from: :foo, order: by(:baz).asc).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" ASC') { select(:bar, from: :foo, order: by(:baz).asc) } end def test_select_order_by_desc - assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" DESC') { select(:bar, from: :foo, order: by(:baz).desc).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" DESC') { select(:bar, from: :foo, order: by(:baz).desc) } end def test_select_multiple_order_by - assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz", "qux"') { select(:bar, from: :foo, order: by(:baz, :qux)).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz", "qux"') { select(:bar, from: :foo, order: by(:baz, :qux)) } end def test_select_multiple_order_by_opposing - assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" ASC, "qux" DESC') { select(:bar, from: :foo, order: by(name(:baz).asc, name(:qux).desc)).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" ORDER BY "baz" ASC, "qux" DESC') { select(:bar, from: :foo, order: by(name(:baz).asc, name(:qux).desc)) } end def test_select_limit - assert_sql('SELECT "bar" FROM "foo" LIMIT 10') { select(:bar, from: :foo, limit: 10).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" LIMIT 10') { select(:bar, from: :foo, limit: 10) } end def test_select_offset - assert_sql('SELECT "bar" FROM "foo" LIMIT 10 OFFSET 20') { select(:bar, from: :foo, limit: 10, offset: 20).gsub(/\s+/, ' ').strip } + assert_sql('SELECT "bar" FROM "foo" LIMIT 10 OFFSET 20') { select(:bar, from: :foo, limit: 10, offset: 20) } end def test_nested_select - assert_sql('SELECT * FROM "foo" WHERE "bar" IN ( SELECT "bar" FROM "foo" )') { select(raw('*'), from: name(:foo), where: name(:bar).in(select(name(:bar), from: name(:foo)))).gsub(/\s+/, ' ').strip } + assert_sql('SELECT * FROM "foo" WHERE "bar" IN (SELECT "bar" FROM "foo")') { select(raw('*'), from: name(:foo), where: name(:bar).in(select(name(:bar), from: name(:foo)))) } end end From a0f115340756f93c17b726752b032cfe02076f91 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Thu, 23 Nov 2017 10:40:12 +0100 Subject: [PATCH 2/6] Adjust quote style --- test/test_raw.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test_raw.rb b/test/test_raw.rb index c5c246c..458a29a 100644 --- a/test/test_raw.rb +++ b/test/test_raw.rb @@ -155,15 +155,15 @@ class TestRaw < Minitest::Test end def test_boolean_literal - assert_sql("TRUE") { value(true) } - assert_mysql("TRUE") { value(true) } - assert_postgresql("TRUE") { value(true) } - assert_sqlite("1") { value(true) } + assert_sql('TRUE') { value(true) } + assert_mysql('TRUE') { value(true) } + assert_postgresql('TRUE') { value(true) } + assert_sqlite('1') { value(true) } - assert_sql("FALSE") { value(false) } - assert_mysql("FALSE") { value(false) } - assert_postgresql("FALSE") { value(false) } - assert_sqlite("0") { value(false) } + assert_sql('FALSE') { value(false) } + assert_mysql('FALSE') { value(false) } + assert_postgresql('FALSE') { value(false) } + assert_sqlite('0') { value(false) } end def test_value From 86ce2b65ff18c96ff1239a65e1702676b5d56b49 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Thu, 23 Nov 2017 16:33:01 +0100 Subject: [PATCH 3/6] Properly handle backslash escaping --- lib/rebel/sql.rb | 6 +++++- test/test_raw.rb | 30 ++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/lib/rebel/sql.rb b/lib/rebel/sql.rb index 8a91797..b5216e8 100644 --- a/lib/rebel/sql.rb +++ b/lib/rebel/sql.rb @@ -292,7 +292,10 @@ module Rebel end def escape_str(str) - str.gsub(@string_quote, @escaped_string_quote) + str.dup.tap do |s| + s.gsub!('\\') { @escaped_string_backslash } if @escaped_string_backslash + s.gsub!(@string_quote) { @escaped_string_quote } + end end def value(v) @@ -390,6 +393,7 @@ module Rebel @identifier_quote = options[:identifier_quote] || '"' @string_quote = options[:string_quote] || "'" @escaped_string_quote = options[:escaped_string_quote] || "''" + @escaped_string_backslash = options[:escaped_string_backslash] @true_literal = options[:true_literal] || 'TRUE' @false_literal = options[:false_literal] || 'FALSE' diff --git a/test/test_raw.rb b/test/test_raw.rb index 458a29a..e3cee69 100644 --- a/test/test_raw.rb +++ b/test/test_raw.rb @@ -8,7 +8,7 @@ class TestRaw < Minitest::Test end def assert_mysql(expected, &actual) - assert_equal(expected.to_s, Rebel::SQL(identifier_quote: '`', string_quote: '"', escaped_string_quote: '""', &actual).to_s) + assert_equal(expected.to_s, Rebel::SQL(identifier_quote: '`', escaped_string_quote: "\\'", escaped_string_backslash: '\\', &actual).to_s) end def assert_sqlite(expected, &actual) @@ -137,21 +137,31 @@ class TestRaw < Minitest::Test def test_string assert_sql("'FOO'") { value('FOO') } - assert_mysql('"FOO"') { value('FOO') } + assert_mysql("'FOO'") { value('FOO') } assert_postgresql("'FOO'") { value('FOO') } assert_sqlite("'FOO'") { value('FOO') } end def test_escaped_string - assert_sql("'FOO''BAR'") { value("FOO'BAR") } - assert_mysql('"FOO\'BAR"') { value("FOO'BAR") } - assert_postgresql("'FOO''BAR'") { value("FOO'BAR") } - assert_sqlite("'FOO''BAR'") { value("FOO'BAR") } + assert_sql (%q('FOO''BAR')) { value(%q(FOO'BAR)) } + assert_postgresql (%q('FOO''BAR')) { value(%q(FOO'BAR)) } + assert_sqlite (%q('FOO''BAR')) { value(%q(FOO'BAR)) } + assert_mysql (%q('FOO\'BAR')) { value(%q(FOO'BAR)) } - assert_sql("'FOO\"BAR'") { value('FOO"BAR') } - assert_mysql('"FOO""BAR"') { value('FOO"BAR') } - assert_postgresql("'FOO\"BAR'") { value('FOO"BAR') } - assert_sqlite("'FOO\"BAR'") { value('FOO"BAR') } + assert_sql (%q('FOO"BAR')) { value(%q(FOO"BAR)) } + assert_postgresql (%q('FOO"BAR')) { value(%q(FOO"BAR)) } + assert_sqlite (%q('FOO"BAR')) { value(%q(FOO"BAR)) } + assert_mysql (%q('FOO"BAR')) { value(%q(FOO"BAR)) } + + assert_sql (%q('FOO\BAR')) { value(%q(FOO\BAR)) } + assert_postgresql (%q('FOO\BAR')) { value(%q(FOO\BAR)) } + assert_sqlite (%q('FOO\BAR')) { value(%q(FOO\BAR)) } + assert_mysql (%q('FOO\\BAR')) { value(%q(FOO\BAR)) } + + assert_sql (%q('FOO\\''BAR')) { value(%q(FOO\'BAR)) } + assert_postgresql (%q('FOO\\''BAR')) { value(%q(FOO\'BAR)) } + assert_sqlite (%q('FOO\\''BAR')) { value(%q(FOO\'BAR)) } + assert_mysql (%q('FOO\\\'BAR')) { value(%q(FOO\'BAR)) } end def test_boolean_literal From 071932e4bea8fde6aaac130c36ca478174587b5b Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Thu, 23 Nov 2017 16:33:26 +0100 Subject: [PATCH 4/6] Release 0.7.1 --- rebel.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebel.gemspec b/rebel.gemspec index eb211cb..4b5e6a4 100644 --- a/rebel.gemspec +++ b/rebel.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'rebel' - s.version = '0.7.0' + s.version = '0.7.1' s.licenses = ['MIT'] s.summary = 'Fight against the Object tyranny' s.description = 'SQL-flavoured Ruby, or is it the other way around?' From 95ecac4946f5466c5402a3a03d4187448eaf97b2 Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Fri, 14 Sep 2018 09:52:55 +0200 Subject: [PATCH 5/6] Update gem homepage --- rebel.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebel.gemspec b/rebel.gemspec index 4b5e6a4..3642a4b 100644 --- a/rebel.gemspec +++ b/rebel.gemspec @@ -7,5 +7,5 @@ Gem::Specification.new do |s| s.authors = ['Loic Nageleisen'] s.email = 'loic.nageleisen@gmail.com' s.files = Dir['lib/**/*.rb'] - s.homepage = 'https://github.com/lloeki/rebel.git' + s.homepage = 'https://gitlab.com/lloeki/rebel.git' end From 0e82d96755ba2a201e9890b79a596716554a26ab Mon Sep 17 00:00:00 2001 From: Loic Nageleisen Date: Fri, 14 Sep 2018 09:53:26 +0200 Subject: [PATCH 6/6] Release 0.7.2 --- rebel.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebel.gemspec b/rebel.gemspec index 3642a4b..75a3680 100644 --- a/rebel.gemspec +++ b/rebel.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'rebel' - s.version = '0.7.1' + s.version = '0.7.2' s.licenses = ['MIT'] s.summary = 'Fight against the Object tyranny' s.description = 'SQL-flavoured Ruby, or is it the other way around?'