sqb 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2387d8f2e864013ed743ea61957668337b6845cf12ee726f21b6b8e5c780a27b
-  data.tar.gz: 346cf18dec4a83500e1b946e1ce0a8803343abb14de0be3b91d201672bd3bd2d
+  metadata.gz: 36cfacce28d143bb31c2b714cc2b4a99744a7dfd117832e0952979767bfcd7af
+  data.tar.gz: 72efb2953532af5f444b55833e3342138bfe68a94560567658e81981d38db043
 SHA512:
-  metadata.gz: 992277c06cef720684186e15492b6f48cc93cd18286054966392a65af711e5eb05b3e19eb16f0d0f9c82d0d0a4ea336eda23b1091ffbd33178846966863a27b9
-  data.tar.gz: 4f961eebaf2c818a6b3601bed4dafe4f089ad2cdffd6149fdef8af4047e1ead9ff28680a89e338b4c10fdd9b4c91dff16c012666c2fa956d618f830095432c67
+  metadata.gz: 9bad00a3fad97d424d51d7a150ca64055885fdd730d8c925712895176ac6fa61e575433f3bc18b90f165d5a2fa2bda5b32c5e07ba463d0460d39578c9cdcaa76
+  data.tar.gz: 0b927ede58eaa630e8a665a1d5ee9e564eaaebfd96d8ed29a66a0b0606aab22fe000f75142428386084d512d6238f3450a1642ebf13bdce57bade20a449023a6

data/lib/sqb.rb

@@ -1,2 +1,9 @@
 require 'sqb/query'
 require 'sqb/version'
+require 'sqb/safe_string'
+
+module SQB
+  def self.safe(string)
+    SafeString.new(string)
+  end
+end

data/lib/sqb/query.rb

@@ -37,12 +37,12 @@ module SQB
         query << "SELECT"
         query << "DISTINCT" if @distinct
         if @columns.empty?
-          query << column_tuple(@table_name, '*')
+          query << escape_and_join(@table_name, '*')
         else
           query << @columns.join(', ')
         end
         query << "FROM"
-        query << escape(@table_name)
+        query << escape_and_join(@options[:database_name], @table_name)
 
         unless @joins.empty?
           query << @joins.join(' ')
@@ -85,7 +85,7 @@ module SQB
           if options[:function]
             query << "#{escape_function(options[:function])}("
           end
-          query << column_tuple(table, column)
+          query << escape_and_join(table, column)
           if options[:function]
             query << ")"
           end
@@ -176,7 +176,7 @@ module SQB
       end
 
       with_table_and_column(column) do |table, column|
-        @orders << [column_tuple(table, column), direction].join(' ')
+        @orders << [escape_and_join(table, column), direction].join(' ')
       end
 
       self
@@ -199,7 +199,7 @@ module SQB
     # @return [Query]
     def group_by(column)
       with_table_and_column(column) do |table, column|
-        @groups << column_tuple(table, column)
+        @groups << escape_and_join(table, column)
       end
       self
     end
@@ -223,13 +223,13 @@ module SQB
 
       @joins << [].tap do |query|
         query << "INNER JOIN"
-        query << escape(table_name)
+        query << escape_and_join(@options[:database_name], table_name)
         query << "AS"
         query << escape(join_name)
         query << "ON"
-        query << column_tuple(@table_name, 'id')
+        query << escape_and_join(@table_name, 'id')
         query << "="
-        query << column_tuple(join_name, foreign_key)
+        query << escape_and_join(join_name, foreign_key)
       end.join(' ')
 
       if options[:where]
@@ -266,7 +266,7 @@ module SQB
           key = key.first[1]
         end
 
-        key = column_tuple(table, key)
+        key = escape_and_join(table, key)
 
         if value.is_a?(Array)
           escaped_values = value.map { |v| value_escape(v) }.join(', ')
@@ -299,6 +299,10 @@ module SQB
               escaped_values = value.map { |v| value_escape(v) }.join(', ')
               op = operator == :in ? "IN" : "NOT IN"
               sql << "#{key} #{op} (#{escaped_values})"
+            when :like
+              sql << "#{key} LIKE #{value_escape(value)}"
+            when :not_like
+              sql << "#{key} NOT LIKE #{value_escape(value)}"
             else
               raise InvalidOperatorError, "Invalid operator '#{operator}'"
             end
@@ -314,11 +318,19 @@ module SQB
     end
 
     def escape(name)
-      "`#{name.to_s.gsub('`', '``')}`"
+      if name.is_a?(SafeString)
+        name
+      else
+        "`#{name.to_s.gsub('`', '``')}`"
+      end
     end
 
     def escape_function(name)
-      name.to_s.gsub(/[^a-z0-9\_]/i, '').upcase
+      if name.is_a?(SafeString)
+        name
+      else
+        name.to_s.gsub(/[^a-z0-9\_]/i, '').upcase
+      end
     end
 
     def value_escape(value)
@@ -345,12 +357,18 @@ module SQB
       if input.is_a?(Hash)
         input.each { |table, column| block.call(table, column) }
       else
-        block.call(@table_name, input.to_sym)
+        block.call(@table_name, input)
       end
     end
 
-    def column_tuple(table, column)
-      [escape(table), escape(column)].join('.')
+    def escape_and_join(*parts)
+      if parts.last.is_a?(SafeString)
+        # If a safe string is provided as a column name, we'll
+        # always use this even if a table name is provided too.
+        parts.last
+      else
+        parts.compact.map { |part| escape(part) }.join('.')
+      end
     end
 
   end

data/lib/sqb/safe_string.rb

@@ -0,0 +1,5 @@
+module SQB
+  class SafeString < String
+
+  end
+end

data/lib/sqb/version.rb

@@ -1,3 +1,3 @@
 module SQB
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqb
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies: []
 description: A friendly SQL builder for MySQL.
 email:
@@ -20,6 +20,7 @@ files:
 - lib/sqb.rb
 - lib/sqb/error.rb
 - lib/sqb/query.rb
+- lib/sqb/safe_string.rb
 - lib/sqb/version.rb
 homepage: https://github.com/adamcooke/sqb
 licenses: