activetokyocabinet 0.1.8 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/active_tokyocabinet/sqlparser.tab.rb +153 -151
  2. data/lib/active_tokyocabinet/sqlparser.y +2 -2
  3. metadata +2 -2
data/lib/active_tokyocabinet/sqlparser.tab.rb CHANGED
@@ -33,7 +33,7 @@ def scan
33
33
  elsif (tok = @ss.scan /(?:INSERT|INTO|VALUES|SELECT|FROM|WHERE|AND|UPDATE|SET|DELETE|COUNT|ORDER|BY|LIMIT|OFFSET|AS)\b/i)
34
34
  yield tok.upcase.to_sym, tok
35
35
  elsif (tok = @ss.scan /(?:ASC|DESC|STRASC|STRDESC|NUMASC|NUMDESC)\b/i)
36
- yield :ORDER, tcordertype(tok)
36
+ yield :ORDER_SPEC, tcordertype(tok)
37
37
  elsif (tok = @ss.scan /NULL\b/i)
38
38
  yield :NULL, nil
39
39
  elsif (tok = @ss.scan /'(?:[^']|'')*'/) #'
@@ -123,95 +123,95 @@ private :tcordertype
123
123
  ##### State transition tables begin ###
124
124
 
125
125
  racc_action_table = [
126
- 74, 77, 96, 80, 63, 64, 26, 34, 34, 56,
127
- 10, 65, 10, 88, 65, 98, 83, 85, 87, 69,
128
- 71, 72, 75, 76, 78, 79, 81, 82, 84, 86,
129
- 68, 70, 60, 2, 10, 49, 65, 10, 8, 58,
130
- 59, 62, 119, 120, 47, 47, 125, 20, 38, 15,
131
- 10, 10, 10, 34, 1, 34, 88, 4, 10, 10,
132
- 90, 27, 118, 118, 10, 10, 118, 60, 42, 60,
133
- 90, 60, 92, 60, 58, 59, 58, 59, 58, 59,
134
- 58, 59, 60, 93, 60, 32, 60, 95, 60, 58,
135
- 59, 58, 59, 58, 59, 58, 59, 10, 28, 97,
126
+ 74, 78, 33, 81, 26, 58, 63, 64, 33, 33,
127
+ 56, 65, 60, 61, 65, 99, 42, 85, 87, 69,
128
+ 71, 73, 75, 77, 79, 80, 82, 83, 84, 86,
129
+ 68, 70, 72, 58, 2, 10, 49, 65, 10, 7,
130
+ 60, 61, 62, 119, 120, 47, 47, 125, 19, 37,
131
+ 15, 96, 10, 10, 10, 10, 1, 10, 33, 4,
132
+ 10, 10, 88, 28, 118, 118, 10, 10, 118, 58,
133
+ 88, 58, 90, 58, 90, 58, 60, 61, 60, 61,
134
+ 60, 61, 60, 61, 58, 92, 58, 93, 58, 32,
135
+ 95, 60, 61, 60, 61, 60, 61, 10, 28, 97,
136
136
  27, 43, 25, 103, 104, 10, 10, 107, 23, 10,
137
137
  111, 112, 114, 10, 112, 21, 14, 13, 12, 122,
138
138
  124, 10, 103 ]
139
139
 
140
140
  racc_action_check = [
141
- 51, 51, 66, 51, 47, 47, 17, 35, 36, 39,
142
- 42, 88, 27, 66, 65, 73, 51, 51, 51, 51,
141
+ 51, 51, 29, 51, 17, 107, 47, 47, 35, 36,
142
+ 38, 88, 107, 107, 65, 76, 29, 51, 51, 51,
143
143
  51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
144
- 51, 51, 73, 0, 88, 34, 49, 65, 0, 73,
145
- 73, 44, 109, 110, 34, 49, 117, 8, 28, 8,
146
- 26, 32, 25, 24, 0, 29, 52, 0, 34, 49,
147
- 54, 44, 109, 110, 28, 8, 117, 107, 29, 95,
148
- 55, 98, 56, 63, 107, 107, 95, 95, 98, 98,
149
- 63, 63, 43, 62, 111, 22, 80, 64, 118, 43,
150
- 43, 111, 111, 80, 80, 118, 118, 21, 20, 67,
144
+ 51, 51, 51, 76, 0, 88, 33, 49, 65, 0,
145
+ 76, 76, 44, 109, 110, 33, 49, 117, 7, 27,
146
+ 7, 66, 42, 28, 26, 32, 0, 25, 24, 0,
147
+ 33, 49, 66, 44, 109, 110, 27, 7, 117, 95,
148
+ 52, 99, 54, 63, 55, 111, 95, 95, 99, 99,
149
+ 63, 63, 111, 111, 43, 56, 81, 62, 118, 22,
150
+ 64, 43, 43, 81, 81, 118, 118, 21, 20, 67,
151
151
  19, 31, 16, 89, 90, 14, 92, 93, 13, 12,
152
152
  100, 102, 103, 104, 105, 11, 4, 3, 2, 112,
153
153
  115, 1, 91 ]
154
154
 
155
155
  racc_action_pointer = [
156
- 31, 94, 115, 117, 108, nil, nil, nil, 38, nil,
157
- nil, 91, 82, 108, 78, nil, 94, -2, nil, 75,
158
- 94, 70, 81, nil, 41, 25, 23, -15, 37, 43,
159
- nil, 87, 24, nil, 31, -5, -4, nil, nil, 4,
160
- nil, nil, -17, 61, 36, nil, nil, -10, nil, 32,
161
- nil, -14, 40, nil, 42, 52, 62, nil, nil, nil,
162
- nil, nil, 77, 52, 83, 10, -3, 94, nil, nil,
163
- nil, nil, nil, 11, nil, nil, nil, nil, nil, nil,
164
- 65, nil, nil, nil, nil, nil, nil, nil, 7, 83,
165
- 85, 102, 79, 103, nil, 48, nil, nil, 50, nil,
166
- 94, nil, 89, 91, 86, 92, nil, 46, nil, 37,
167
- 38, 63, 98, nil, nil, 102, nil, 41, 67, nil,
156
+ 32, 93, 115, 117, 108, nil, nil, 39, nil, nil,
157
+ nil, 90, 81, 108, 77, nil, 94, -4, nil, 96,
158
+ 72, 69, 85, nil, 46, 29, 26, 38, 25, -10,
159
+ nil, 87, 27, 32, nil, -4, -3, nil, 5, nil,
160
+ nil, nil, 24, 62, 37, nil, nil, -8, nil, 33,
161
+ nil, -14, 54, nil, 54, 56, 75, nil, nil, nil,
162
+ nil, nil, 81, 51, 86, 10, 46, 94, nil, nil,
163
+ nil, nil, nil, nil, nil, nil, 11, nil, nil, nil,
164
+ nil, 64, nil, nil, nil, nil, nil, nil, 7, 82,
165
+ 85, 101, 78, 103, nil, 47, nil, nil, nil, 49,
166
+ 94, nil, 88, 90, 85, 91, nil, -17, nil, 38,
167
+ 39, 53, 97, nil, nil, 100, nil, 42, 66, nil,
168
168
  nil, nil, nil, nil, nil, nil, nil ]
169
169
 
170
170
  racc_action_default = [
171
- -68, -68, -68, -68, -68, -1, -2, -3, -68, -4,
172
- -42, -68, -68, -68, -68, -12, -68, -68, -43, -13,
173
- -68, -68, -68, 127, -14, -68, -68, -68, -68, -14,
174
- -38, -68, -68, -41, -68, -14, -14, -44, -10, -68,
175
- -11, -37, -68, -68, -68, -21, -23, -68, -27, -68,
176
- -15, -68, -16, -17, -29, -29, -8, -39, -45, -47,
177
- -46, -40, -68, -68, -68, -68, -68, -68, -65, -53,
178
- -66, -54, -56, -68, -67, -57, -58, -55, -59, -60,
179
- -68, -61, -62, -50, -63, -51, -64, -52, -68, -33,
180
- -68, -33, -68, -68, -19, -68, -24, -18, -68, -25,
171
+ -68, -68, -68, -68, -68, -1, -2, -68, -3, -4,
172
+ -42, -68, -68, -68, -68, -12, -68, -68, -43, -68,
173
+ -13, -68, -68, 127, -14, -68, -68, -68, -68, -14,
174
+ -38, -68, -68, -68, -41, -14, -14, -10, -68, -11,
175
+ -44, -37, -68, -68, -68, -21, -23, -68, -27, -68,
176
+ -15, -68, -16, -17, -29, -29, -8, -39, -46, -40,
177
+ -45, -47, -68, -68, -68, -68, -68, -68, -64, -52,
178
+ -65, -53, -66, -54, -67, -56, -68, -57, -55, -58,
179
+ -59, -68, -60, -61, -62, -50, -63, -51, -68, -33,
180
+ -68, -33, -68, -68, -19, -68, -24, -18, -25, -68,
181
181
  -68, -22, -35, -68, -68, -35, -9, -68, -48, -68,
182
182
  -68, -68, -68, -6, -34, -31, -7, -68, -68, -20,
183
183
  -26, -28, -36, -30, -32, -5, -49 ]
184
184
 
185
185
  racc_goto_table = [
186
- 11, 53, 61, 109, 19, 52, 110, 18, 30, 113,
187
- 9, 22, 116, 24, 7, 117, 67, 102, 17, 105,
188
- 31, 39, 94, 50, 35, 36, 37, 40, 44, 57,
189
- 16, 18, 99, 33, 89, 91, 6, 5, 41, 100,
190
- 101, 31, 73, 123, 54, 55, 29, 3, nil, nil,
186
+ 11, 59, 30, 20, 34, 113, 18, 52, 116, 41,
187
+ 102, 22, 105, 24, 53, 54, 55, 89, 91, 9,
188
+ 31, 94, 8, 57, 35, 36, 39, 40, 44, 17,
189
+ 67, 18, 109, 38, 98, 50, 110, 16, 6, 100,
190
+ 5, 31, 101, 76, 117, 123, 29, 3, nil, nil,
191
191
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
192
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
193
- 121, nil, nil, nil, nil, nil, nil, 126, nil, nil,
192
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 121,
193
+ nil, nil, nil, nil, nil, nil, 126, nil, nil, nil,
194
194
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
195
195
  nil, 106, nil, nil, nil, nil, nil, nil, nil, nil,
196
196
  nil, nil, nil, 115 ]
197
197
 
198
198
  racc_goto_check = [
199
- 6, 18, 19, 8, 7, 17, 8, 6, 26, 13,
200
- 5, 6, 13, 6, 4, 8, 18, 12, 14, 12,
201
- 6, 15, 19, 16, 6, 6, 6, 6, 7, 26,
202
- 9, 6, 19, 10, 11, 11, 3, 2, 10, 19,
203
- 20, 6, 22, 24, 10, 10, 25, 1, nil, nil,
204
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
199
+ 6, 19, 26, 7, 10, 13, 6, 17, 13, 10,
200
+ 12, 6, 12, 6, 18, 10, 10, 11, 11, 5,
201
+ 6, 19, 4, 26, 6, 6, 6, 6, 7, 14,
202
+ 18, 6, 8, 15, 19, 16, 8, 9, 3, 19,
203
+ 2, 6, 20, 22, 8, 24, 25, 1, nil, nil,
205
204
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
206
- 19, nil, nil, nil, nil, nil, nil, 19, nil, nil,
205
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 19,
206
+ nil, nil, nil, nil, nil, nil, 19, nil, nil, nil,
207
207
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
208
208
  nil, 6, nil, nil, nil, nil, nil, nil, nil, nil,
209
209
  nil, nil, nil, 6 ]
210
210
 
211
211
  racc_goto_pointer = [
212
- nil, 47, 37, 36, 14, 10, -1, -4, -92, 22,
213
- 9, -20, -72, -93, 10, -7, -11, -29, -33, -41,
214
- -48, nil, -9, nil, -72, 25, -13 ]
212
+ nil, 47, 40, 38, 22, 19, -1, -4, -63, 30,
213
+ -20, -37, -79, -97, 22, 6, 2, -26, -19, -42,
214
+ -46, nil, -8, nil, -70, 25, -19 ]
215
215
 
216
216
  racc_goto_default = [
217
217
  nil, nil, nil, nil, nil, nil, 51, nil, nil, nil,
@@ -220,73 +220,73 @@ racc_goto_default = [
220
220
 
221
221
  racc_reduce_table = [
222
222
  0, 0, :racc_error,
223
- 1, 47, :_reduce_none,
224
- 1, 47, :_reduce_none,
225
- 1, 47, :_reduce_none,
226
- 1, 47, :_reduce_none,
227
- 10, 48, :_reduce_5,
228
- 8, 49, :_reduce_6,
229
- 8, 49, :_reduce_7,
230
- 4, 60, :_reduce_8,
231
- 6, 60, :_reduce_9,
232
- 1, 61, :_reduce_none,
233
- 1, 61, :_reduce_none,
234
- 1, 55, :_reduce_12,
235
- 1, 55, :_reduce_none,
236
- 0, 56, :_reduce_14,
237
- 2, 56, :_reduce_15,
238
- 2, 56, :_reduce_16,
223
+ 1, 48, :_reduce_none,
224
+ 1, 48, :_reduce_none,
225
+ 1, 48, :_reduce_none,
226
+ 1, 48, :_reduce_none,
227
+ 10, 49, :_reduce_5,
228
+ 8, 50, :_reduce_6,
229
+ 8, 50, :_reduce_7,
230
+ 4, 61, :_reduce_8,
231
+ 6, 61, :_reduce_9,
239
232
  1, 62, :_reduce_none,
240
- 3, 62, :_reduce_18,
241
- 3, 64, :_reduce_19,
242
- 5, 64, :_reduce_20,
243
- 1, 63, :_reduce_21,
244
- 3, 63, :_reduce_22,
245
- 1, 66, :_reduce_none,
246
- 3, 66, :_reduce_24,
247
- 3, 67, :_reduce_25,
248
- 5, 67, :_reduce_26,
233
+ 1, 62, :_reduce_none,
234
+ 1, 56, :_reduce_12,
235
+ 1, 56, :_reduce_none,
236
+ 0, 57, :_reduce_14,
237
+ 2, 57, :_reduce_15,
238
+ 2, 57, :_reduce_16,
239
+ 1, 63, :_reduce_none,
240
+ 3, 63, :_reduce_18,
241
+ 3, 65, :_reduce_19,
242
+ 5, 65, :_reduce_20,
243
+ 1, 64, :_reduce_21,
244
+ 3, 64, :_reduce_22,
249
245
  1, 67, :_reduce_none,
250
- 5, 69, :_reduce_28,
251
- 0, 57, :_reduce_29,
252
- 4, 57, :_reduce_30,
253
- 0, 70, :_reduce_31,
254
- 1, 70, :_reduce_none,
255
- 0, 58, :_reduce_33,
256
- 2, 58, :_reduce_34,
257
- 0, 59, :_reduce_35,
258
- 2, 59, :_reduce_36,
259
- 5, 50, :_reduce_37,
260
- 1, 71, :_reduce_none,
261
- 3, 71, :_reduce_39,
262
- 3, 72, :_reduce_40,
263
- 4, 51, :_reduce_41,
264
- 1, 52, :_reduce_none,
265
- 1, 53, :_reduce_43,
266
- 3, 53, :_reduce_44,
267
- 1, 65, :_reduce_none,
268
- 1, 65, :_reduce_none,
269
- 1, 65, :_reduce_none,
270
- 1, 54, :_reduce_48,
271
- 3, 54, :_reduce_49,
272
- 1, 68, :_reduce_none,
273
- 1, 68, :_reduce_none,
274
- 1, 68, :_reduce_none,
275
- 1, 68, :_reduce_none,
276
- 1, 68, :_reduce_none,
277
- 1, 68, :_reduce_none,
278
- 1, 68, :_reduce_none,
279
- 1, 68, :_reduce_none,
246
+ 3, 67, :_reduce_24,
247
+ 3, 68, :_reduce_25,
248
+ 5, 68, :_reduce_26,
280
249
  1, 68, :_reduce_none,
281
- 1, 68, :_reduce_none,
282
- 1, 68, :_reduce_none,
283
- 1, 68, :_reduce_none,
284
- 1, 68, :_reduce_none,
285
- 1, 68, :_reduce_none,
286
- 1, 68, :_reduce_none,
287
- 1, 68, :_reduce_none,
288
- 1, 68, :_reduce_none,
289
- 1, 68, :_reduce_none ]
250
+ 5, 70, :_reduce_28,
251
+ 0, 58, :_reduce_29,
252
+ 4, 58, :_reduce_30,
253
+ 0, 71, :_reduce_31,
254
+ 1, 71, :_reduce_none,
255
+ 0, 59, :_reduce_33,
256
+ 2, 59, :_reduce_34,
257
+ 0, 60, :_reduce_35,
258
+ 2, 60, :_reduce_36,
259
+ 5, 51, :_reduce_37,
260
+ 1, 72, :_reduce_none,
261
+ 3, 72, :_reduce_39,
262
+ 3, 73, :_reduce_40,
263
+ 4, 52, :_reduce_41,
264
+ 1, 53, :_reduce_none,
265
+ 1, 54, :_reduce_43,
266
+ 3, 54, :_reduce_44,
267
+ 1, 66, :_reduce_none,
268
+ 1, 66, :_reduce_none,
269
+ 1, 66, :_reduce_none,
270
+ 1, 55, :_reduce_48,
271
+ 3, 55, :_reduce_49,
272
+ 1, 69, :_reduce_none,
273
+ 1, 69, :_reduce_none,
274
+ 1, 69, :_reduce_none,
275
+ 1, 69, :_reduce_none,
276
+ 1, 69, :_reduce_none,
277
+ 1, 69, :_reduce_none,
278
+ 1, 69, :_reduce_none,
279
+ 1, 69, :_reduce_none,
280
+ 1, 69, :_reduce_none,
281
+ 1, 69, :_reduce_none,
282
+ 1, 69, :_reduce_none,
283
+ 1, 69, :_reduce_none,
284
+ 1, 69, :_reduce_none,
285
+ 1, 69, :_reduce_none,
286
+ 1, 69, :_reduce_none,
287
+ 1, 69, :_reduce_none,
288
+ 1, 69, :_reduce_none,
289
+ 1, 69, :_reduce_none ]
290
290
 
291
291
  racc_reduce_n = 68
292
292
 
@@ -313,34 +313,35 @@ racc_token_table = {
313
313
  :BETWEEN => 17,
314
314
  :ORDER => 18,
315
315
  :BY => 19,
316
- :LIMIT => 20,
317
- :NUMBER => 21,
318
- :OFFSET => 22,
319
- :UPDATE => 23,
320
- :SET => 24,
321
- "," => 25,
322
- :DELETE => 26,
323
- :IDENTIFIER => 27,
324
- :STRING => 28,
325
- :NULL => 29,
326
- :BW => 30,
327
- :EW => 31,
328
- :INCALL => 32,
329
- :INCANY => 33,
330
- :INC => 34,
331
- :ANYONE => 35,
332
- :REGEXP => 36,
333
- :BT => 37,
334
- :FTS => 38,
335
- :FTSAND => 39,
336
- :FTSOR => 40,
337
- :FTSEX => 41,
338
- ">=" => 42,
339
- "<=" => 43,
340
- ">" => 44,
341
- "<" => 45 }
342
-
343
- racc_nt_base = 46
316
+ :ORDER_SPEC => 20,
317
+ :LIMIT => 21,
318
+ :NUMBER => 22,
319
+ :OFFSET => 23,
320
+ :UPDATE => 24,
321
+ :SET => 25,
322
+ "," => 26,
323
+ :DELETE => 27,
324
+ :IDENTIFIER => 28,
325
+ :STRING => 29,
326
+ :NULL => 30,
327
+ :BW => 31,
328
+ :EW => 32,
329
+ :INCALL => 33,
330
+ :INCANY => 34,
331
+ :INC => 35,
332
+ :ANYONE => 36,
333
+ :REGEXP => 37,
334
+ :BT => 38,
335
+ :FTS => 39,
336
+ :FTSAND => 40,
337
+ :FTSOR => 41,
338
+ :FTSEX => 42,
339
+ ">=" => 43,
340
+ "<=" => 44,
341
+ ">" => 45,
342
+ "<" => 46 }
343
+
344
+ racc_nt_base = 47
344
345
 
345
346
  racc_use_result_var = false
346
347
 
@@ -381,6 +382,7 @@ Racc_token_to_s_table = [
381
382
  "BETWEEN",
382
383
  "ORDER",
383
384
  "BY",
385
+ "ORDER_SPEC",
384
386
  "LIMIT",
385
387
  "NUMBER",
386
388
  "OFFSET",
data/lib/active_tokyocabinet/sqlparser.y CHANGED
@@ -109,7 +109,7 @@ rule
109
109
  {
110
110
  :QOSTRASC
111
111
  }
112
- | ORDER
112
+ | ORDER_SPEC
113
113
 
114
114
  limit_clause :
115
115
  {
@@ -221,7 +221,7 @@ def scan
221
221
  elsif (tok = @ss.scan /(?:INSERT|INTO|VALUES|SELECT|FROM|WHERE|AND|UPDATE|SET|DELETE|COUNT|ORDER|BY|LIMIT|OFFSET|AS)\b/i)
222
222
  yield tok.upcase.to_sym, tok
223
223
  elsif (tok = @ss.scan /(?:ASC|DESC|STRASC|STRDESC|NUMASC|NUMDESC)\b/i)
224
- yield :ORDER, tcordertype(tok)
224
+ yield :ORDER_SPEC, tcordertype(tok)
225
225
  elsif (tok = @ss.scan /NULL\b/i)
226
226
  yield :NULL, nil
227
227
  elsif (tok = @ss.scan /'(?:[^']|'')*'/) #'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activetokyocabinet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - winebarrel
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2010-01-17 00:00:00 +09:00
12
+ date: 2010-01-19 00:00:00 +09:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency