sqb 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3cf773939419d3f07b0b56d017ba8d044bd366922cecf7ef3aaa3f0dfe2fa852
-  data.tar.gz: 3ee2271dadb659cf8b6fedf8e223da6e888284c431d99a8ee4d8f44f2a9cf4b0
+SHA1:
+  metadata.gz: c682c36dc27d41519663b1caf06a97edd9cfdb6c
+  data.tar.gz: 92637092f8f29020c72d40b466b4acfbd43e9060
 SHA512:
-  metadata.gz: 9149a4d5724ad99d3b892e21044b21629a55e05f1e6c6b1fef477bb4524ae5afe2244663cfe192c8f514dc3453449b1a898dddc37d1bc19dd63fa95a626b9866
-  data.tar.gz: 4e3b753a1209acaf5101da975d3f8a969b7a1621524f8b561d5308be7d528dd409b2459978e63af0c728f4bc5b9a0b11be722447d48573fb2ff6183d95f5abe7
+  metadata.gz: cd376b13686ee0f7f27621c275cb52100bf9872de3df5cc9805e936f0c591f4ffea321e1076eb4a00b1fdb4a50949cb1c56fa1baa6e2db691f4716606c91f58e
+  data.tar.gz: f1e60e3a689895eb05c5305dc9fb803bb7d088281ce07ceef062222515e6e82151c04e19be92b6bb19ff269f4eff41484622214e1cad2f28d826406387832a8a

data/lib/sqb/error.rb

@@ -13,4 +13,7 @@ module SQB
 
   class NoValuesError < Error
   end
+
+  class QueryError < Error
+  end
 end

data/lib/sqb/escaping.rb

@@ -30,6 +30,8 @@ module SQB
         'NULL'
       elsif value.is_a?(Integer)
         value.to_i
+      elsif value.is_a?(SQB::SafeString)
+        value.to_s
       else
         @prepared_arguments << value.to_s
         '?'
@@ -38,7 +40,11 @@ module SQB
 
     def with_table_and_column(input, &block)
       if input.is_a?(Hash)
-        input.each { |table, column| block.call(table, column) }
+        if input.size == 1
+          block.call(input.first[0], input.first[1])
+        else
+          raise QueryError, "Column names provided as a hash must only contain a single item"
+        end
       else
         block.call(@table_name, input)
       end

data/lib/sqb/filtering.rb

@@ -1,3 +1,5 @@
+require 'sqb/where_dsl'
+
 module SQB
   module Filtering
 
@@ -5,12 +7,20 @@ module SQB
     #
     # @param hash [Hash]
     # @return [Query]
-    def where(hash)
-      if @where_within_or && @where_within_or.last
-        @where_within_or.last << hash
+    def where(hash = nil, &block)
+      if hash
+        if @where_within_or && @where_within_or.last
+          @where_within_or.last << hash
+        else
+          @where ||= []
+          @where << hash_to_sql(hash)
+        end
+      elsif block_given?
+        dsl = WhereDSL.new
+        block.call(dsl)
+        where(dsl.hash)
       else
-        @where ||= []
-        @where << hash_to_sql(hash, @table_name)
+        raise QueryError, "Must provide a hash or a block to `where`"
       end
       self
     end
@@ -31,7 +41,7 @@ module SQB
       # executed within the block.
       if w = @where_within_or.pop
         @where_within_or_sql << w.map do |w|
-          hash_to_sql(w, @table_name)
+          hash_to_sql(w)
         end.join(' OR ')
       end
 
@@ -47,71 +57,63 @@ module SQB
 
     private
 
-    def hash_to_sql(hash, table, joiner = ' AND ')
+    def hash_to_sql(hash, joiner = ' AND ')
       sql = hash.map do |key, value|
-        if key.is_a?(Hash)
-          table = key.first[0]
-          key = key.first[1]
-        end
-
-        key = escape_and_join(table, key)
-
-        if value.is_a?(Array)
-          escaped_values = value.map { |v| value_escape(v) }.join(', ')
-          if escaped_values.empty?
-            "1=0"
-          else
-            "#{key} IN (#{escaped_values})"
-          end
-        elsif value.is_a?(Hash)
-          sql = []
-          value.each do |operator, value|
-            case operator
-            when :not_equal
-              if value.nil?
-                sql << "#{key} IS NOT NULL"
-              else
-                sql << "#{key} != #{value_escape(value)}"
-              end
-            when :equal
-              if value.nil?
-                sql << "#{key} IS NULL"
-              else
-                sql << "#{key} = #{value_escape(value)}"
-              end
-            when :less_than
-              sql << "#{key} < #{value_escape(value)}"
-            when :greater_than
-              sql << "#{key} > #{value_escape(value)}"
-            when :less_than_or_equal_to
-              sql << "#{key} <= #{value_escape(value)}"
-            when :greater_than_or_equal_to
-              sql << "#{key} >= #{value_escape(value)}"
-            when :in, :not_in
-              escaped_values = value.map { |v| value_escape(v) }.join(', ')
-              if escaped_values.empty?
-                # If there are no values to search from, don't find anything
-                "1=0"
-              else
-                op = operator == :in ? "IN" : "NOT IN"
-                sql << "#{key} #{op} (#{escaped_values})"
-              end
-            when :like
-              sql << "#{key} LIKE #{value_escape(value)}"
-            when :not_like
-              sql << "#{key} NOT LIKE #{value_escape(value)}"
-            else
-              raise InvalidOperatorError, "Invalid operator '#{operator}'"
+        with_table_and_column(key) do |table, column|
+          key = escape_and_join(table, column)
+          if value.is_a?(Array)
+            condition(key, :in, value)
+          elsif value.is_a?(Hash)
+            sql = value.map do |operator, value|
+              condition(key, operator, value)
             end
+            sql.empty? ? "1=0" : sql.join(joiner)
+          else
+            condition(key, :equal, value)
           end
-          sql.empty? ? "1=0" : sql.join(joiner)
-        elsif value == nil
+        end
+      end.join(joiner)
+      "(#{sql})"
+    end
+
+    def condition(key, operator, value)
+      case operator
+      when :equal
+        if value.nil?
           "#{key} IS NULL"
         else
           "#{key} = #{value_escape(value)}"
         end
-      end.join(joiner)
-      "(#{sql})"
+      when :not_equal
+        if value.nil?
+          "#{key} IS NOT NULL"
+        else
+          "#{key} != #{value_escape(value)}"
+        end
+      when :less_than, :lt
+        "#{key} < #{value_escape(value)}"
+      when :greater_than, :gt
+        "#{key} > #{value_escape(value)}"
+      when :less_than_or_equal_to, :lte
+        "#{key} <= #{value_escape(value)}"
+      when :greater_than_or_equal_to, :gte
+        "#{key} >= #{value_escape(value)}"
+      when :in, :not_in
+        escaped_values = value.map { |v| value_escape(v) }.join(', ')
+        if escaped_values.empty?
+          # If there are no values to search from, don't find anything
+          "1=0"
+        else
+          op = operator == :in ? "IN" : "NOT IN"
+          "#{key} #{op} (#{escaped_values})"
+        end
+      when :like
+        "#{key} LIKE #{value_escape(value)}"
+      when :not_like
+        "#{key} NOT LIKE #{value_escape(value)}"
+      else
+        raise InvalidOperatorError, "Invalid operator '#{operator}'"
+      end
     end
 
   end

data/lib/sqb/update.rb

@@ -15,7 +15,7 @@ module SQB
         query << "SET"
         if @sets && !@sets.empty?
           query << @sets.map do |key, value|
-            "#{escape_and_join(@table_name, key)} = #{value_escape(value)}"
+            "#{escape_and_join(@table_name, key)} = #{value}"
           end.join(', ')
         else
           raise NoValuesError, "No values have been updated. Use `set` to set the values to update."
@@ -41,9 +41,13 @@ module SQB
     # @param key [String]
     # @param value [String, nil]
     def set(hash)
+      if @where
+        raise QueryError, "Filtering has already been provided. Must filter after setting values."
+      end
+
       @sets ||= {}
       hash.each do |key, value|
-        @sets[key] = value
+        @sets[key] = value_escape(value)
       end
       self
     end

data/lib/sqb/version.rb

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

data/lib/sqb/where_dsl.rb

@@ -0,0 +1,85 @@
+module SQB
+  class WhereDSL
+
+    attr_reader :hash
+
+    def initialize
+      @hash = {}
+    end
+
+    def method_missing(name, value = nil)
+      if name =~ /(.*)\=\z/
+        attribute_name = $1
+        @hash[attribute_name.to_sym] ||= {}
+        @hash[attribute_name.to_sym][:equal] = value
+      else
+        @hash[name.to_sym] ||= {}
+        attribute = PositiveAttribute.new(name.to_sym, @hash)
+      end
+    end
+
+    class Attribute
+
+      def initialize(attribute_name, hash)
+        @attribute_name = attribute_name
+        @hash = hash
+      end
+
+    end
+
+    class PositiveAttribute < Attribute
+      def =~(value)
+        @hash[@attribute_name][:like] = value
+      end
+      alias_method :like, :=~
+
+      def <(value)
+        @hash[@attribute_name][:less_than] = value
+      end
+      alias_method :less_than, :<
+
+      def <=(value)
+        @hash[@attribute_name][:less_than_or_equal_to] = value
+      end
+      alias_method :less_than_or_equal_to, :<=
+
+      def >(value)
+        @hash[@attribute_name][:greater_than] = value
+      end
+      alias_method :greater_than, :>
+
+      def >=(value)
+        @hash[@attribute_name][:greater_than_or_equal_to] = value
+      end
+      alias_method :greater_than_or_equal_to, :>=
+
+      def includes(*values)
+        @hash[@attribute_name][:in] = values
+      end
+      alias_method :in, :includes
+
+      def not
+        NegativeAttribute.new(@attribute_name, @hash)
+      end
+      alias_method :does_not, :not
+
+      def not=(value)
+        @hash[@attribute_name][:not_equal] = value
+      end
+
+    end
+
+    class NegativeAttribute < Attribute
+      def =~(value)
+        @hash[@attribute_name][:not_like] = value
+      end
+      alias_method :like, :=~
+
+      def includes(*values)
+        @hash[@attribute_name][:not_in] = values
+      end
+      alias_method :in, :includes
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies: []
 description: A friendly SQL builder for MySQL.
 email:
@@ -36,6 +36,7 @@ files:
 - lib/sqb/select.rb
 - lib/sqb/update.rb
 - lib/sqb/version.rb
+- lib/sqb/where_dsl.rb
 homepage: https://github.com/adamcooke/sqb
 licenses:
 - MIT
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: This gem provides a friendly DSL for constructing MySQL queries.