sqb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f58ba5485e199e6364aa99556e1a7b2ea8bb5520ff6f5059bff7dcc96df8c2
-  data.tar.gz: 8ae30d22f80255a79f13e0a372c65e62666202ec1c85f8a270a1bba75da96c99
+  metadata.gz: 2387d8f2e864013ed743ea61957668337b6845cf12ee726f21b6b8e5c780a27b
+  data.tar.gz: 346cf18dec4a83500e1b946e1ce0a8803343abb14de0be3b91d201672bd3bd2d
 SHA512:
-  metadata.gz: 2d4bfa140701dfa6de3528106148c238e9be0e025ed11a1c857b9c795e54734491a3d582f8aed3ab2b73c0aec14c00e4044aca92aa9b180d5f721388fd9bacb8
-  data.tar.gz: 13405cee8bf220248ae53c9d6eb8aac63d142cbb7a9b9f8f33cccbed95b89857d0f31312b858ed57aebc5eeca7b03bbeca3d75abc02a266430f3730503b8276b
+  metadata.gz: 992277c06cef720684186e15492b6f48cc93cd18286054966392a65af711e5eb05b3e19eb16f0d0f9c82d0d0a4ea336eda23b1091ffbd33178846966863a27b9
+  data.tar.gz: 4f961eebaf2c818a6b3601bed4dafe4f089ad2cdffd6149fdef8af4047e1ead9ff28680a89e338b4c10fdd9b4c91dff16c012666c2fa956d618f830095432c67

data/lib/sqb/error.rb

@@ -1,4 +1,13 @@
 module SQB
   class Error < StandardError
   end
+
+  class EscapeBlockMissingError < Error
+  end
+
+  class InvalidOrderDirectionError < Error
+  end
+
+  class InvalidOperatorError < Error
+  end
 end

data/lib/sqb/query.rb

@@ -3,9 +3,11 @@ require 'sqb/error'
 module SQB
   class Query
 
+    attr_reader :prepared_arguments
+
     VALID_ORDERS = ['ASC', 'DESC']
 
-    def initialize(table_name, &escape_block)
+    def initialize(table_name, options = {}, &escape_block)
       @table_name = table_name
       @columns = []
       @joins = []
@@ -17,7 +19,14 @@ module SQB
       @offset = nil
       @distinct = false
       @where_within_or = []
-      @escape_block = escape_block
+      @options = options
+      @prepared_arguments = []
+
+      if @options[:prepared] == false && escape_block.nil?
+        raise EscapeBlockMissingError, "An escape block must be provided if prepared statements are disabled."
+      else
+        @escape_block = escape_block
+      end
     end
 
     # Generate the full SQL query for this query.
@@ -133,6 +142,7 @@ module SQB
         @where << "(#{@where_within_or_sql.flatten.join(' OR ')})"
         @where_within_or_sql = nil
       end
+      self
     end
 
     # Limit the number of records return
@@ -162,7 +172,7 @@ module SQB
       direction = direction ? direction.to_s.upcase : 'ASC'
 
       unless VALID_ORDERS.include?(direction)
-        raise Error, "Invalid order direction #{direction}"
+        raise InvalidOrderDirectionError, "Invalid order direction #{direction}"
       end
 
       with_table_and_column(column) do |table, column|
@@ -290,7 +300,7 @@ module SQB
               op = operator == :in ? "IN" : "NOT IN"
               sql << "#{key} #{op} (#{escaped_values})"
             else
-              raise Error, "Invalid operator '#{operator}'"
+              raise InvalidOperatorError, "Invalid operator '#{operator}'"
             end
           end
           sql.empty? ? "1=0" : sql.join(joiner)
@@ -313,19 +323,20 @@ module SQB
 
     def value_escape(value)
       if value == true
-        '1'
+        1
       elsif value == false
-        '0'
+        0
       elsif value.nil?
         'NULL'
       elsif value.is_a?(Integer)
         value.to_i
       else
-        if value.to_s.length == 0
-          'NULL'
-        else
+        if @options[:prepared] == false
           escaped_value = @escape_block ? @escape_block.call(value.to_s) : value.to_s
           "'" + escaped_value + "'"
+        else
+          @prepared_arguments << value.to_s
+          '?'
         end
       end
     end

data/lib/sqb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke