sqb 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c682c36dc27d41519663b1caf06a97edd9cfdb6c
-  data.tar.gz: 92637092f8f29020c72d40b466b4acfbd43e9060
+  metadata.gz: 62ef6126a194c6379a78a024567b91a2278d57cf
+  data.tar.gz: 74173493a093a294043c3f672079d64a58caa810
 SHA512:
-  metadata.gz: cd376b13686ee0f7f27621c275cb52100bf9872de3df5cc9805e936f0c591f4ffea321e1076eb4a00b1fdb4a50949cb1c56fa1baa6e2db691f4716606c91f58e
-  data.tar.gz: f1e60e3a689895eb05c5305dc9fb803bb7d088281ce07ceef062222515e6e82151c04e19be92b6bb19ff269f4eff41484622214e1cad2f28d826406387832a8a
+  metadata.gz: a9493b63fe326d3375ef2f4399ff623083da10e062e8697cf498d7c221793efa2919f601af7ea9ebf39ed282b98b24c72a1f82104a19b4f727c271324a0052d2
+  data.tar.gz: 1113bf3ae5beb73686c636382578bb7acb503c50bb143273417a353c3de3928ee280d973b3002733c9c5200dd088dce335a0c2566154505618dd1b87add02ea8

data/lib/sqb/base.rb

@@ -7,6 +7,7 @@ module SQB
     include SQB::Escaping
 
     attr_reader :prepared_arguments
+    attr_reader :options
 
     def initialize(table_name, options = {}, &block)
       @table_name = table_name

data/lib/sqb/escaping.rb

@@ -33,8 +33,12 @@ module SQB
       elsif value.is_a?(SQB::SafeString)
         value.to_s
       else
-        @prepared_arguments << value.to_s
-        '?'
+        if @options[:escaper]
+          @options[:escaper].call(value.to_s)
+        else
+          @prepared_arguments << value.to_s
+          '?'
+        end
       end
     end
 

data/lib/sqb/filtering.rb

@@ -28,6 +28,10 @@ module SQB
     # Set that all conditions added in this block should be joined using OR
     # rather than AND.
     def or(&block)
+      if @where_within_or.is_a?(Array)
+        raise QueryError, "Cannot nest an or block within another or block"
+      end
+
       @where_within_or ||= []
       # Start by making an array within the OR block for this calling
       @where_within_or << []

data/lib/sqb/insert.rb

@@ -5,14 +5,15 @@ module SQB
 
     def to_sql
       [].tap do |query|
-        query << "INSERT INTO"
+        values_sql = values.map { |rec| "(" + rec.join(', ') + ")" }.join(', ')
+        query << "#{mysql_verb} INTO"
         query << escape_and_join(@options[:database_name], @table_name)
-        if @values.nil? || @values.empty?
+        if values_sql.empty?
           raise NoValuesError, "No values have been specified. Use `value` to add values to the query."
         end
         query << "(#{columns.join(', ')})"
         query << "VALUES"
-        query << "(#{values.join(', ')})"
+        query << values_sql
       end.join(' ')
     end
 
@@ -21,22 +22,52 @@ module SQB
     # @param key [String]
     # @param value [String, nil]
     def value(hash)
-      @values ||= {}
+      if @record.nil?
+        record = (@local_record ||= {})
+      else
+        record = @record
+      end
+
       hash.each do |key, value|
-        @values[key] = value
+        record[key] = value
       end
+
       self
     end
     alias_method :values, :value
 
+    def record(&block)
+      @record = {}
+      block.call
+      @records ||= []
+      @records << @record
+      @record = nil
+    end
+
     private
 
     def columns
-      @values.keys.map { |k| escape(k) }
+      columns_keys.map { |c| escape(c) }
+    end
+
+    def columns_keys
+      all_records.map(&:keys).flatten.uniq
     end
 
     def values
-      @values.values.map { |v| value_escape(v) }
+      all_records.map do |record|
+        columns_keys.map do |col|
+          value_escape(record[col])
+        end
+      end
+    end
+
+    def all_records
+      [@local_record, *@records || []].compact
+    end
+
+    def mysql_verb
+      "INSERT"
     end
 
   end

data/lib/sqb/query_string.rb

@@ -0,0 +1,64 @@
+module SQB
+  class QueryString
+
+    def initialize(&block)
+      @query = []
+      block.call(self) if block_given?
+    end
+
+    def to_s
+      @query.join(" ")
+    end
+
+    def add(*items)
+      if @group_joiner
+        @group_items ||= []
+        @group_items << items
+      else
+        items.flatten.each do |item|
+          add_to_query(resolve_for_query(item))
+        end
+      end
+    end
+
+    def group(joiner, &block)
+      @group_joiner = joiner
+      block.call
+    ensure
+      if @group_items
+        # If we have some group items after running our group,
+        # add them into the query now.
+        @group_items.each do |items|
+          raw_q = items.map { |i| resolve_for_query(i) }.join(' ')
+          raw_q << @group_joiner unless items === @group_items.last
+          add_to_query(raw_q)
+        end
+      end
+      @group_items = nil
+      @group_joiner = nil
+    end
+
+    def with_brackets(&block)
+      @open_bracket = true
+      block.call
+    ensure
+      @query.last << ")"
+      @open_bracket = nil
+      @close_bracket = nil
+    end
+
+    private
+
+    def add_to_query(item)
+      item = "(" + item if @open_bracket
+      @query << item.to_s
+    ensure
+      @open_bracket = nil
+    end
+
+    def resolve_for_query(item)
+      item
+    end
+
+  end
+end

data/lib/sqb/replace.rb

@@ -0,0 +1,13 @@
+require 'sqb/insert'
+
+module SQB
+  class Replace < Insert
+
+    private
+
+    def mysql_verb
+      "REPLACE"
+    end
+
+  end
+end

data/lib/sqb/version.rb

@@ -1,3 +1,3 @@
 module SQB
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/lib/sqb.rb

@@ -6,6 +6,7 @@ require 'sqb/select'
 require 'sqb/update'
 require 'sqb/delete'
 require 'sqb/insert'
+require 'sqb/replace'
 
 module SQB
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqb
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies: []
 description: A friendly SQL builder for MySQL.
 email:
@@ -32,6 +32,8 @@ files:
 - lib/sqb/offsetting.rb
 - lib/sqb/ordering.rb
 - lib/sqb/query.rb
+- lib/sqb/query_string.rb
+- lib/sqb/replace.rb
 - lib/sqb/safe_string.rb
 - lib/sqb/select.rb
 - lib/sqb/update.rb