sql_helper 0.1.0 → 0.1.1

data/lib/sql_helper.rb

@@ -221,7 +221,7 @@ module SQLHelper
           end
         when Hash
           cond.each do |col, cnd|
-            ret = eval_hash_cond col, cnd, prepared
+            ret = eval_cond col, cnd, prepared
             sqls << ret[0]
             params += ret[1..-1] || []
           end
@@ -238,7 +238,7 @@ module SQLHelper
       end
     end
 
-    def eval_hash_cond col, cnd, prepared
+    def eval_cond col, cnd, prepared
       case cnd
       when Numeric, String
         prepared ? ["#{col} = ?", cnd] : [[col, quote(cnd)].join(' = ')]
@@ -256,7 +256,7 @@ module SQLHelper
         sqls   = []
         params = []
         cnd.each do |v|
-          ret = eval_hash_cond col, v, prepared
+          ret = eval_cond col, v, prepared
           sqls << ret[0]
           params += ret[1..-1]
         end
@@ -277,15 +277,20 @@ module SQLHelper
                 ["#{col} <> ?", val] :
                 ["#{col} <> #{quote val}"]
             else
-              ary = eval_hash_cond col, val, prepared
-              ary[0].prepend 'not '
+              ary = eval_cond col, val, prepared
+              ary[0] =
+                if ary[0] =~ /^\(.*\)$/
+                  "not #{ary[0]}"
+                else
+                  "not (#{ary[0]})"
+                end
               ary
             end
           when :or
             sqls   = []
             params = []
             val.each do |v|
-              ret = eval_hash_cond col, v, prepared
+              ret = eval_cond col, v, prepared
               sqls << ret[0]
               params += ret[1..-1]
             end

data/lib/sql_helper/version.rb

@@ -1,3 +1,3 @@
 module SQLHelper
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/test_sql_helper.rb

@@ -30,7 +30,9 @@ class TestSQLHelper < MiniTest::Unit::TestCase
         :r => { :or   => [{ :like => ['ABC%', 'DEF%'] }, { :not => { :like => 'XYZ%' } }] },
         :s => { :not  => 100 },
         :t => { :not  => 'str' },
-        :u => ('aa'..'zz')
+        :u => ('aa'..'zz'),
+        :v => { :not => { :gt => 100, :lt => 200 } },
+        :w => { :not => { :sql => 'sysdate' } }
       },
       [],
       [nil],
@@ -39,7 +41,7 @@ class TestSQLHelper < MiniTest::Unit::TestCase
       '  '
     ]
 
-    @wherep = ["where (z <> 100) and (y = ? or y = ? or y = ? or z = 'xxx') and a = ? and b between ? and ? and c >= ? and c < ? and (d = ? or d = ?) and e = sysdate and f is not null and g > ? and h < ? and i like ? and not j like ? and k <= sysdate and l >= ? and l <= ? and not (m = ? or m >= ? and m <= ?) and n is null and not o between ? and ? and (p > ? or p < ?) and (q like ? or q like ?) and ((r like ? or r like ?) or not r like ?) and s <> ? and t <> ? and u between ? and ?",
+    @wherep = ["where (z <> 100) and (y = ? or y = ? or y = ? or z = 'xxx') and a = ? and b between ? and ? and c >= ? and c < ? and (d = ? or d = ?) and e = sysdate and f is not null and g > ? and h < ? and i like ? and not (j like ?) and k <= sysdate and l >= ? and l <= ? and not (m = ? or m >= ? and m <= ?) and n is null and not (o between ? and ?) and (p > ? or p < ?) and (q like ? or q like ?) and ((r like ? or r like ?) or not (r like ?)) and s <> ? and t <> ? and u between ? and ? and not (v > ? and v < ?) and not (w = sysdate)",
       200, "Macy's???", BigDecimal("3.141592"),
       "hello 'world'???",
       1, 10,
@@ -57,7 +59,8 @@ class TestSQLHelper < MiniTest::Unit::TestCase
       'ABC%', 'DEF%', 'XYZ%',
       100,
       'str',
-      'aa', 'zz'
+      'aa', 'zz',
+      100, 200
     ]
 
     params = @wherep[1..-1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1991983397644293356
+      hash: 1884977039615962457
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1991983397644293356
+      hash: 1884977039615962457
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25