rebel 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16218bb6a1d9a787e819c1443820e5b43ea0add
-  data.tar.gz: 69b62d3801ac06156ad5ac356234550a7541fc3a
+  metadata.gz: 32fd955629a7dbd8738111e47395bbe7cd007792
+  data.tar.gz: a1c33efb78711424dfcef3b13c2bf0e775138cdb
 SHA512:
-  metadata.gz: 66f5c629576b76c444e65132f910185b36f1386b251a9dfbd832dd5e78cc5c67318252175c4535bcc9c5da659ad79df0e1b25499c2fa300f103583b419a4865e
-  data.tar.gz: 9311d2677d3c2129b3bb2555b81e0d32359b8ffe42988165d1828a47be954c837fc515ab38a231d079213618f10d39911b2ec4934a22e01589a6f9db774b10be
+  metadata.gz: db54aa215e1d4c7e748d1ed04b898129304c8b668966fd32bd31f09374368782f1fbe9ffd249ce9deabe15ee079bcbc54badd3daddb19e410019301ef48a32e9
+  data.tar.gz: 3d230eac6c296658d998b627910b69039e735abb9ca2da56cc665ec98e6e9a61f6f8e73a9b50cb031138c1e2d85235faa89462c25d30568dd3e18b2bc400ea93

data/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
@@ -300,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)
@@ -398,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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebel
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Loic Nageleisen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies: []
 description: SQL-flavoured Ruby, or is it the other way around?
 email: loic.nageleisen@gmail.com