tsukasaoishi-miyazakiresistance 0.0.9 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/miyazaki_resistance/base.rb +4 -2
- data/lib/miyazakiresistance.rb +4 -4
- metadata +2 -2
@@ -194,6 +194,7 @@ module MiyazakiResistance
|
|
194
194
|
|
195
195
|
def self.make_conditions(query, conditions)
|
196
196
|
if conditions
|
197
|
+
add_cond_list = []
|
197
198
|
cond = conditions.first
|
198
199
|
param = conditions[1..-1]
|
199
200
|
|
@@ -215,7 +216,7 @@ module MiyazakiResistance
|
|
215
216
|
ope = OPERATIONS[item][work]
|
216
217
|
if not_flag
|
217
218
|
raise QueryError unless NOT_OPERATIONS.include?(item)
|
218
|
-
ope =
|
219
|
+
ope = TokyoTyrant::RDBQRY::QCNEGATE | ope
|
219
220
|
not_flag = false
|
220
221
|
end
|
221
222
|
elsif %w|NOT not|.include?(item)
|
@@ -231,11 +232,12 @@ module MiyazakiResistance
|
|
231
232
|
end
|
232
233
|
|
233
234
|
if col && type && ope && exp
|
234
|
-
|
235
|
+
add_cond_list << [col, ope, exp]
|
235
236
|
col, ope, exp, type = nil, nil, nil, nil
|
236
237
|
not_flag = false
|
237
238
|
end
|
238
239
|
end
|
240
|
+
add_cond_list.reverse.each{|acl| query.addcond(*acl)}
|
239
241
|
end
|
240
242
|
query
|
241
243
|
end
|
data/lib/miyazakiresistance.rb
CHANGED
@@ -13,7 +13,7 @@ require 'miyazaki_resistance/base'
|
|
13
13
|
require 'miyazaki_resistance/error'
|
14
14
|
|
15
15
|
module MiyazakiResistance
|
16
|
-
VERSION = '0.0.
|
16
|
+
VERSION = '0.0.10'
|
17
17
|
end
|
18
18
|
|
19
19
|
MiyazakiResistance::Base.class_eval do
|
@@ -22,8 +22,8 @@ MiyazakiResistance::Base.class_eval do
|
|
22
22
|
|
23
23
|
OPERATIONS = {
|
24
24
|
"=" => {:string => TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNUMEQ},
|
25
|
-
"!=" => {:string =>
|
26
|
-
"<>" => {:string =>
|
25
|
+
"!=" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCNUMEQ},
|
26
|
+
"<>" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTREQ, :integer => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCNUMEQ},
|
27
27
|
"include" => {:string => TokyoTyrant::RDBQRY::QCSTRINC},
|
28
28
|
"begin" => {:string => TokyoTyrant::RDBQRY::QCSTRBW},
|
29
29
|
"end" => {:string => TokyoTyrant::RDBQRY::QCSTREW},
|
@@ -31,7 +31,7 @@ MiyazakiResistance::Base.class_eval do
|
|
31
31
|
"anyinclude" => {:string => TokyoTyrant::RDBQRY::QCSTROR},
|
32
32
|
"in" => {:string => TokyoTyrant::RDBQRY::QCSTROREQ, :integer => TokyoTyrant::RDBQRY::QCNUMOREQ},
|
33
33
|
"=~" => {:string => TokyoTyrant::RDBQRY::QCSTRRX},
|
34
|
-
"!~" => {:string =>
|
34
|
+
"!~" => {:string => TokyoTyrant::RDBQRY::QCNEGATE | TokyoTyrant::RDBQRY::QCSTRRX},
|
35
35
|
">" => {:integer => TokyoTyrant::RDBQRY::QCNUMGT},
|
36
36
|
">=" => {:integer => TokyoTyrant::RDBQRY::QCNUMGE},
|
37
37
|
"<" => {:integer => TokyoTyrant::RDBQRY::QCNUMLT},
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tsukasaoishi-miyazakiresistance
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tsukasa OISHI
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-04-
|
12
|
+
date: 2009-04-16 00:00:00 -07:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|