tsukasaoishi-miyazakiresistance 0.0.9 → 0.0.10

data/lib/miyazaki_resistance/base.rb

@@ -194,6 +194,7 @@ module MiyazakiResistance
 
     def self.make_conditions(query, conditions)
       if conditions
+        add_cond_list = []
         cond = conditions.first
         param = conditions[1..-1]
 
@@ -215,7 +216,7 @@ module MiyazakiResistance
             ope = OPERATIONS[item][work]
             if not_flag
               raise QueryError unless NOT_OPERATIONS.include?(item)
-              ope = ~ope
+              ope = TokyoTyrant::RDBQRY::QCNEGATE | ope
               not_flag = false
             end
           elsif %w|NOT not|.include?(item)
@@ -231,11 +232,12 @@ module MiyazakiResistance
           end
 
           if col && type && ope && exp
-            query.addcond(col, ope, exp)
+            add_cond_list << [col, ope, exp]
             col, ope, exp, type = nil, nil, nil, nil
             not_flag = false
           end
         end
+        add_cond_list.reverse.each{|acl| query.addcond(*acl)}
       end
       query
     end

data/lib/miyazakiresistance.rb

@@ -13,7 +13,7 @@ require 'miyazaki_resistance/base'
 require 'miyazaki_resistance/error'
 
 module MiyazakiResistance
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end
 
 MiyazakiResistance::Base.class_eval do
@@ -22,8 +22,8 @@ MiyazakiResistance::Base.class_eval do
 
   OPERATIONS = {
     "=" => {:string => TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNUMEQ},
-    "!=" => {:string => ~TokyoTyrant::RDBQRY::QCSTREQ, :integer => ~TokyoTyrant::RDBQRY::QCNUMEQ},
-    "<>" => {:string => ~TokyoTyrant::RDBQRY::QCSTREQ, :integer => ~TokyoTyrant::RDBQRY::QCNUMEQ},
+    "!=" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCNUMEQ},
+    "<>" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCNUMEQ},
     "include" => {:string => TokyoTyrant::RDBQRY::QCSTRINC},
     "begin" => {:string => TokyoTyrant::RDBQRY::QCSTRBW},
     "end" => {:string => TokyoTyrant::RDBQRY::QCSTREW},
@@ -31,7 +31,7 @@ MiyazakiResistance::Base.class_eval do
     "anyinclude" => {:string => TokyoTyrant::RDBQRY::QCSTROR},
     "in" => {:string => TokyoTyrant::RDBQRY::QCSTROREQ, :integer => TokyoTyrant::RDBQRY::QCNUMOREQ},
     "=~" => {:string => TokyoTyrant::RDBQRY::QCSTRRX},
-    "!~" => {:string => ~TokyoTyrant::RDBQRY::QCSTRRX},
+    "!~" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTRRX},
     ">" => {:integer => TokyoTyrant::RDBQRY::QCNUMGT},
     ">=" => {:integer => TokyoTyrant::RDBQRY::QCNUMGE},
     "<" => {:integer => TokyoTyrant::RDBQRY::QCNUMLT},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tsukasaoishi-miyazakiresistance
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Tsukasa OISHI
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency