dynamic_query 0.1.4 → 0.2.0

data/lib/dynamic_query/version.rb

@@ -2,8 +2,8 @@ class DynamicQuery
   
   module Version
     MAJOR = 0
-    MINOR = 1
-    PATCH = 4
+    MINOR = 2
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/dynamic_query.rb

@@ -86,26 +86,43 @@ module DynamicQuery
     def statement(query)
       query ||= { 'or_1' => { 'and_1' => { :column => '', :operator => '', :value1 => '', :value2 => '' } } }
       or_stat = []
-      query.select { |k, _| k =~ /^or_\d+$/ }.each do |or_key, or_val|
-        and_stat = []
+      query.select { |k, v| k =~ /^or_\d+$/ && v.kind_of?(Hash) }.each do |or_key, or_val|
+        and_stat = [[]]
         or_val.each do |and_key, and_val|
-          case and_val[:operator]
-          when '=', '>', '>=', '<', '<=', '!=', 'LIKE', 'NOT LIKE'
-            and_stat << "#{and_val[:column]} #{and_val[:operator]} '#{and_val[:value1]}'" unless and_val[:value1].blank?
-          when 'IN', 'NOT IN'
-            and_stat << "#{and_val[:column]} #{and_val[:operator]} (#{and_val[:value1].split(/,/).select { |word| !word.strip.empty? }.map { |word| "'" + word.strip + "'" }.join(',')})" unless and_val[:value1].delete(',').blank?
-          when 'BETWEEN', 'NOT BETWEEN'
-            and_stat << "#{and_val[:column]} #{and_val[:operator]} '#{and_val[:value1]}' AND '#{and_val[:value2]}'" unless and_val[:value1].blank? || and_val[:value2].blank?
-          when 'IS NULL', 'IS NOT NULL'
-            and_stat << "#{and_val[:column]} #{and_val[:operator]}"
+          if and_val.kind_of?(Hash) && @columns.include?(and_val[:column])
+            case and_val[:operator]
+            when '=', '>', '>=', '<', '<=', '!=', 'LIKE', 'NOT LIKE'
+              unless and_val[:value1].blank?
+                and_stat[0] << "#{and_val[:column]} #{and_val[:operator]} ?"
+                and_stat << and_val[:value1]
+              end
+            when 'IN', 'NOT IN'
+              unless and_val[:value1].delete(',').blank?
+                and_stat[0] << "#{and_val[:column]} #{and_val[:operator]} (?)"
+                and_stat << and_val[:value1].split(/,/).delete_if { |word| word.blank? }.map { |word| word.strip }
+              end
+            when 'BETWEEN', 'NOT BETWEEN'
+              unless and_val[:value1].blank? || and_val[:value2].blank?
+                and_stat[0] << "#{and_val[:column]} #{and_val[:operator]} ? AND ?"
+                and_stat << and_val[:value1] << and_val[:value2]
+              end
+            when 'IS NULL', 'IS NOT NULL'
+              and_stat[0] << "#{and_val[:column]} #{and_val[:operator]}"
+            end
           end
         end
+              
+        and_stat[0] = and_stat[0].join(' AND ')
+        or_stat << and_stat unless and_stat[0].empty?
+      end
         
-        and_stat_str = and_stat.join(' AND ')
-        or_stat << "(#{and_stat_str})" unless and_stat_str.empty?
+      or_stat.each { |and_stat| and_stat[0] = "(#{and_stat[0]})" }
+      stat = []; params = []
+      or_stat.each do |and_stat|
+        stat << and_stat.shift
+        params = params + and_stat
       end
-      
-      or_stat = or_stat.join(' OR ')
+      params.unshift(stat.join(' OR '))
     end
     
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_query
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3050679975131115800
+      hash: 2346444755047590570
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,5 +155,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: dynamic_query-0.1.4
+summary: dynamic_query-0.2.0
 test_files: []