kaqing 2.0.61__py3-none-any.whl → 2.0.63__py3-none-any.whl
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.
- adam/sql/sql_completer.py +101 -203
- adam/version.py +1 -1
- {kaqing-2.0.61.dist-info → kaqing-2.0.63.dist-info}/METADATA +1 -1
- {kaqing-2.0.61.dist-info → kaqing-2.0.63.dist-info}/RECORD +7 -7
- {kaqing-2.0.61.dist-info → kaqing-2.0.63.dist-info}/WHEEL +0 -0
- {kaqing-2.0.61.dist-info → kaqing-2.0.63.dist-info}/entry_points.txt +0 -0
- {kaqing-2.0.61.dist-info → kaqing-2.0.63.dist-info}/top_level.txt +0 -0
adam/sql/sql_completer.py
CHANGED
|
@@ -151,7 +151,7 @@ class SqlCompleter(Completer):
|
|
|
151
151
|
state = f'{self.dml}_'
|
|
152
152
|
text = f'{self.dml} {text}'
|
|
153
153
|
|
|
154
|
-
completer = None
|
|
154
|
+
completer: Completer = None
|
|
155
155
|
stmts = sqlparse.parse(text)
|
|
156
156
|
if not stmts:
|
|
157
157
|
completer = TermCompleter(['select', 'insert', 'delete', 'update'])
|
|
@@ -160,136 +160,27 @@ class SqlCompleter(Completer):
|
|
|
160
160
|
state = self.traverse_tokens(text, statement.tokens)
|
|
161
161
|
if self.debug:
|
|
162
162
|
print('\n =>', state)
|
|
163
|
+
|
|
163
164
|
if state == '':
|
|
164
165
|
completer = TermCompleter(['select', 'insert', 'delete', 'update'])
|
|
165
166
|
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
completer = TermCompleter(['x', 'y', 'z'])
|
|
184
|
-
elif state == "select_from_x_as_x_comma_":
|
|
185
|
-
completer = TermCompleter(self.tables())
|
|
186
|
-
elif state == "select_where_":
|
|
187
|
-
completer = columns
|
|
188
|
-
elif state in ["select_where_a", "select_where_a_"]:
|
|
189
|
-
completer = TermCompleter(['=', '<', '<=', '>', '>=', '<>', 'like', 'not', 'in'])
|
|
190
|
-
elif state == "select_where_a_not_":
|
|
191
|
-
completer = TermCompleter(['like', 'in'])
|
|
192
|
-
elif state == "select_where_a_in":
|
|
193
|
-
completer = TermCompleter(['('])
|
|
194
|
-
elif state == "select_where_a_in_lp_":
|
|
195
|
-
completer = TermCompleter(["'", ')'])
|
|
196
|
-
elif state == "select_where_a_in_lp_a_comma_":
|
|
197
|
-
completer = TermCompleter(["'"])
|
|
198
|
-
elif state == "select_where_a_op":
|
|
199
|
-
completer = TermCompleter(["'"])
|
|
200
|
-
elif state == "select_where_sc_":
|
|
201
|
-
completer = TermCompleter(['and', 'or', 'group', 'limit'])
|
|
202
|
-
elif state == "select_where_sc_limit_":
|
|
203
|
-
completer = TermCompleter(['1'])
|
|
204
|
-
elif state == "select_group_":
|
|
205
|
-
completer = TermCompleter(['by'])
|
|
206
|
-
elif state == "select_group_by_":
|
|
207
|
-
completer = columns
|
|
208
|
-
elif state == "select_group_by_a_comma_":
|
|
209
|
-
completer = columns
|
|
210
|
-
elif state == "select_group_by_a_":
|
|
211
|
-
completer = TermCompleter(['limit'])
|
|
212
|
-
elif state == "select_group_by_a_limit_":
|
|
213
|
-
completer = TermCompleter(['1'])
|
|
214
|
-
elif state == "select_from_x_inner_":
|
|
215
|
-
completer = TermCompleter(['join'])
|
|
216
|
-
elif state in ["select_join_", "select_from_x_left_join_"]:
|
|
217
|
-
completer = TermCompleter(self.tables())
|
|
218
|
-
elif state == "select_x_join_y,":
|
|
219
|
-
completer = TermCompleter(self.tables())
|
|
220
|
-
elif state == "select_x_join_y_":
|
|
221
|
-
completer = TermCompleter(['on'])
|
|
222
|
-
elif state == "select_x_join_y_on_":
|
|
223
|
-
completer = columns
|
|
224
|
-
elif state == "select_x_join_y_on_a":
|
|
225
|
-
completer = TermCompleter(['='])
|
|
226
|
-
elif state == "select_x_join_y_on_a_op":
|
|
227
|
-
completer = columns
|
|
228
|
-
elif state == "select_x_join_y_on_a_op_b_":
|
|
229
|
-
completer = TermCompleter(['where', 'group', 'limit'])
|
|
230
|
-
elif state == "select_from_x_left_":
|
|
231
|
-
completer = TermCompleter(['outer', 'join'])
|
|
232
|
-
elif state == "select_from_x_left_outer_":
|
|
233
|
-
completer = TermCompleter(['join'])
|
|
234
|
-
elif state == "select_from_x_right_":
|
|
235
|
-
completer = TermCompleter(['outer', 'join'])
|
|
236
|
-
elif state == "select_from_x_right_outer_":
|
|
237
|
-
completer = TermCompleter(['join'])
|
|
238
|
-
elif state == "select_from_x_full_":
|
|
239
|
-
completer = TermCompleter(['outer'])
|
|
240
|
-
elif state == "select_from_x_full_outer_":
|
|
241
|
-
completer = TermCompleter(['join'])
|
|
242
|
-
|
|
243
|
-
elif state == "insert_":
|
|
244
|
-
completer = TermCompleter(['into'])
|
|
245
|
-
elif state == "insert_into_":
|
|
246
|
-
completer = TermCompleter(self.tables())
|
|
247
|
-
elif state == "insert_into_x_":
|
|
248
|
-
completer = TermCompleter(['values(', 'select'])
|
|
249
|
-
elif state == "insert_into_x_lp_":
|
|
250
|
-
completer = columns
|
|
251
|
-
elif state == "insert_into_x_lp_a_comma_":
|
|
252
|
-
completer = columns
|
|
253
|
-
elif state == "insert_into_x_lp_a_rp__":
|
|
254
|
-
completer = TermCompleter(['values(', 'select'])
|
|
255
|
-
elif state == "insert_values":
|
|
256
|
-
completer = TermCompleter(['('])
|
|
257
|
-
elif state == "insert_values_lp_":
|
|
258
|
-
completer = TermCompleter(["'"])
|
|
259
|
-
|
|
260
|
-
elif state == "update_":
|
|
261
|
-
completer = TermCompleter(self.tables())
|
|
262
|
-
elif state == "update_x_":
|
|
263
|
-
completer = TermCompleter(['set'])
|
|
264
|
-
elif state in ["update_set_", "update_set_sc_comma_"]:
|
|
265
|
-
completer = columns
|
|
266
|
-
elif state == "update_set_a":
|
|
267
|
-
completer = TermCompleter(['='])
|
|
268
|
-
elif state == "update_set_a_op":
|
|
269
|
-
completer = TermCompleter(["'"])
|
|
270
|
-
elif state == "update_set_sc_":
|
|
271
|
-
completer = TermCompleter(['where'])
|
|
272
|
-
elif state == "update_where_":
|
|
273
|
-
completer = columns
|
|
274
|
-
elif state == "update_where_a":
|
|
275
|
-
completer = TermCompleter(['='])
|
|
276
|
-
elif state == "update_where_sc_":
|
|
277
|
-
completer = TermCompleter(['and', 'or'])
|
|
278
|
-
|
|
279
|
-
elif state == "delete_":
|
|
280
|
-
completer = TermCompleter(['from'])
|
|
281
|
-
elif state == "delete_from_":
|
|
282
|
-
completer = TermCompleter(self.tables())
|
|
283
|
-
elif state == "delete_from_x_":
|
|
284
|
-
completer = TermCompleter(['where'])
|
|
285
|
-
elif state == "delete_where_":
|
|
286
|
-
completer = columns
|
|
287
|
-
elif state == "delete_where_a":
|
|
288
|
-
completer = TermCompleter(['='])
|
|
289
|
-
elif state == "delete_where_a_op":
|
|
290
|
-
completer = TermCompleter(["'"])
|
|
291
|
-
elif state == "delete_where_sc_":
|
|
292
|
-
completer = TermCompleter(['and', 'or'])
|
|
167
|
+
completers: dict[str, str] = self.machine[1]
|
|
168
|
+
if state in completers:
|
|
169
|
+
terms = []
|
|
170
|
+
|
|
171
|
+
words = completers[state]
|
|
172
|
+
for word in words.strip(' ').split(','):
|
|
173
|
+
if word == 'tables':
|
|
174
|
+
terms.extend(self.tables())
|
|
175
|
+
elif word == 'single':
|
|
176
|
+
terms.append("'")
|
|
177
|
+
elif word == 'comma':
|
|
178
|
+
terms.append(",")
|
|
179
|
+
else:
|
|
180
|
+
terms.append(word)
|
|
181
|
+
|
|
182
|
+
if terms:
|
|
183
|
+
completer = TermCompleter(terms)
|
|
293
184
|
|
|
294
185
|
if completer:
|
|
295
186
|
for c in completer.get_completions(document, complete_event):
|
|
@@ -298,15 +189,15 @@ class SqlCompleter(Completer):
|
|
|
298
189
|
def automata(self):
|
|
299
190
|
y = [
|
|
300
191
|
' > select > select',
|
|
301
|
-
'select_ > name|* > select_a',
|
|
192
|
+
'select_ > name|* > select_a ^ *',
|
|
302
193
|
'select_a > , > select_a_comma_',
|
|
303
|
-
'select_a_comma_ > name|* > select_a',
|
|
304
|
-
'select_a_ > from > select_from',
|
|
305
|
-
'select_from_ > name > select_from_x',
|
|
194
|
+
'select_a_comma_ > name|* > select_a ^ *',
|
|
195
|
+
'select_a_ > from > select_from ^ from',
|
|
196
|
+
'select_from_ > name > select_from_x ^ tables',
|
|
306
197
|
'select_from_x > , > select_from_x_comma_',
|
|
307
|
-
'select_from_x_comma_ > name > select_from_x',
|
|
308
|
-
'select_from_x_',
|
|
309
|
-
'select_from_x_as_x_ > , > select_from_x_comma_',
|
|
198
|
+
'select_from_x_comma_ > name > select_from_x ^ tables',
|
|
199
|
+
'select_from_x_ ^ as,where,inner join,left outer join,right outer join,full outer join,group by,limit',
|
|
200
|
+
'select_from_x_as_x_ > , > select_from_x_comma_ ^ where,inner join,left outer join,right outer join,full outer join,group by,limit',
|
|
310
201
|
'- > as > select_from_x_as',
|
|
311
202
|
'- > where > select_where',
|
|
312
203
|
'- > limit > select_where_sc_limit',
|
|
@@ -322,104 +213,100 @@ class SqlCompleter(Completer):
|
|
|
322
213
|
'- > right outer join > select_join',
|
|
323
214
|
'- > full > select_from_x_full',
|
|
324
215
|
'- > full outer join > select_join',
|
|
325
|
-
'select_from_x_as_ > name > select_from_x_as_x',
|
|
216
|
+
'select_from_x_as_ > name > select_from_x_as_x ^ x,y,z',
|
|
326
217
|
'select_from_x_as_x > , > select_from_x_as_x_comma_',
|
|
327
|
-
'select_from_x_as_x_comma_ > name >
|
|
328
|
-
'select_where_ > name > select_where_a',
|
|
329
|
-
'select_where_a > comparison > select_where_a_op',
|
|
330
|
-
'select_where_a_ > comparison > select_where_a_op',
|
|
218
|
+
'select_from_x_as_x_comma_ > name > select_from_x ^ tables',
|
|
219
|
+
'select_where_ > name > select_where_a ^ id,x.,y.,z.',
|
|
220
|
+
'select_where_a > comparison > select_where_a_op ^ =,<,<=,>,>=,<>,like,not,in',
|
|
221
|
+
'select_where_a_ > comparison > select_where_a_op ^ =,<,<=,>,>=,<>,like,not,in',
|
|
331
222
|
'- > not > select_where_a_not',
|
|
332
223
|
'- > in > select_where_a_in',
|
|
333
|
-
'select_where_a_not_ > comparison > select_where_a_not_op',
|
|
224
|
+
'select_where_a_not_ > comparison > select_where_a_not_op ^ like,in',
|
|
334
225
|
'- > in > select_where_a_in',
|
|
335
|
-
'select_where_a_in > ( > select_where_a_in_lp_',
|
|
336
|
-
'select_where_a_in_lp_ > name|single|num > select_where_a_in_lp_a',
|
|
337
|
-
'select_where_a_in_lp_a > , > select_where_a_in_lp_a_comma_',
|
|
226
|
+
'select_where_a_in > ( > select_where_a_in_lp_ ^ (',
|
|
227
|
+
'select_where_a_in_lp_ > name|single|num > select_where_a_in_lp_a ^ single',
|
|
228
|
+
'select_where_a_in_lp_a > , > select_where_a_in_lp_a_comma_ ^ comma,)',
|
|
338
229
|
'- > ) > select_where_sc',
|
|
339
|
-
'select_where_a_in_lp_a_comma_ > name|single|num > select_where_a_in_lp_a',
|
|
340
|
-
'select_where_a_not_op > name|single|num > select_where_sc',
|
|
341
|
-
'select_where_a_op > name|single|num > select_where_sc',
|
|
342
|
-
'select_where_sc_ > and|or > select_where',
|
|
230
|
+
'select_where_a_in_lp_a_comma_ > name|single|num > select_where_a_in_lp_a ^ single',
|
|
231
|
+
'select_where_a_not_op > name|single|num > select_where_sc ^ single',
|
|
232
|
+
'select_where_a_op > name|single|num > select_where_sc ^ single',
|
|
233
|
+
'select_where_sc_ > and|or > select_where ^ and,or,group by,limit',
|
|
343
234
|
'- > group > select_group',
|
|
344
235
|
'- > group by > select_group_by',
|
|
345
236
|
'- > limit > select_where_sc_limit',
|
|
346
|
-
'select_group_ > by > select_group_by',
|
|
347
|
-
'select_group_by_ > name > select_group_by_a',
|
|
237
|
+
'select_group_ > by > select_group_by ^ by',
|
|
238
|
+
'select_group_by_ > name > select_group_by_a ^ id,x.,y.,z.',
|
|
348
239
|
'select_group_by_a > , > select_group_by_a_comma_',
|
|
349
|
-
'select_group_by_a_comma_ > name > select_group_by_a',
|
|
350
|
-
'select_group_by_a_ > limit > select_where_sc_limit',
|
|
351
|
-
'
|
|
240
|
+
'select_group_by_a_comma_ > name > select_group_by_a ^ id,x.,y.,z.',
|
|
241
|
+
'select_group_by_a_ > limit > select_where_sc_limit ^ limit',
|
|
242
|
+
'select_where_sc_limit_ > num > select_where_sc_limit_num ^ 1',
|
|
352
243
|
'select_where_x_inner_ > join > select_join',
|
|
353
|
-
'select_join_ > name > select_x_join_y',
|
|
354
|
-
'select_from_x_left_ > join > select_join',
|
|
244
|
+
'select_join_ > name > select_x_join_y ^ tables',
|
|
245
|
+
'select_from_x_left_ > join > select_join ^ outer join',
|
|
355
246
|
'- > outer > select_from_x_left_outer',
|
|
356
|
-
'select_from_x_left_outer_ > join > select_join',
|
|
357
|
-
'
|
|
358
|
-
'select_from_x_right_ > join > select_join',
|
|
247
|
+
'select_from_x_left_outer_ > join > select_join ^ join',
|
|
248
|
+
'select_from_x_right_ > join > select_join ^ outer join',
|
|
359
249
|
'- > outer > select_from_x_right_outer',
|
|
360
|
-
'select_from_x_right_outer_ > join > select_join',
|
|
361
|
-
'select_from_x_full_ > join > select_join',
|
|
250
|
+
'select_from_x_right_outer_ > join > select_join ^ join',
|
|
251
|
+
'select_from_x_full_ > join > select_join ^ outer join',
|
|
362
252
|
'- > outer > select_from_x_full_outer',
|
|
363
|
-
'select_from_x_full_outer_ > join > select_join',
|
|
364
|
-
'
|
|
365
|
-
'
|
|
366
|
-
'
|
|
367
|
-
'
|
|
368
|
-
'
|
|
369
|
-
'
|
|
370
|
-
'
|
|
371
|
-
'
|
|
372
|
-
'- > where > select_where',
|
|
373
|
-
'- > group > select_group',
|
|
374
|
-
'- > group by > select_group_by',
|
|
375
|
-
'- > limit > select_where_sc_limit',
|
|
253
|
+
'select_from_x_full_outer_ > join > select_join ^ join',
|
|
254
|
+
'select_x_join_y_ > as > select_x_join_y_as ^ as,on',
|
|
255
|
+
'- > on > select_x_join_y_on ^ as,on',
|
|
256
|
+
'select_x_join_y_as_ > name > select_x_join_y_as_y ^ x,y,z',
|
|
257
|
+
'select_x_join_y_as_y_ > on > select_x_join_y_on ^ on',
|
|
258
|
+
'select_x_join_y_on_ > name > select_x_join_y_on_a ^ id,x.,y.,z.',
|
|
259
|
+
'select_x_join_y_on_a > comparison > select_x_join_y_on_a_op ^ =',
|
|
260
|
+
'select_x_join_y_on_a_op > name > select_x_join_y_on_a_op_b ^ id,x.,y.,z.',
|
|
261
|
+
'select_x_join_y_on_a_op_b > _ > select_from_x_as_x_',
|
|
376
262
|
|
|
377
263
|
|
|
378
264
|
' > insert > insert',
|
|
379
|
-
'insert_ > into > insert_into',
|
|
380
|
-
'insert_into_ > name > insert_into_x',
|
|
265
|
+
'insert_ > into > insert_into ^ into',
|
|
266
|
+
'insert_into_ > name > insert_into_x ^ tables',
|
|
381
267
|
'insert_into_x > ( > insert_into_x_lp_',
|
|
382
|
-
'insert_into_x_ > ( > insert_into_x_lp_',
|
|
268
|
+
'insert_into_x_ > ( > insert_into_x_lp_ ^ (,values(',
|
|
383
269
|
'- > values > insert_values',
|
|
384
|
-
'insert_into_x_lp_ > name > insert_into_x_lp_a',
|
|
270
|
+
'insert_into_x_lp_ > name > insert_into_x_lp_a ^ id',
|
|
385
271
|
'insert_into_x_lp_a > , > insert_into_x_lp_a_comma_',
|
|
386
272
|
'- > ) > insert_into_x_lp_a_rp_',
|
|
387
|
-
'insert_into_x_lp_a_comma_ > name > insert_into_x_lp_a',
|
|
388
|
-
'insert_into_x_lp_a_rp__ > values > insert_values',
|
|
273
|
+
'insert_into_x_lp_a_comma_ > name > insert_into_x_lp_a ^ id',
|
|
274
|
+
'insert_into_x_lp_a_rp__ > values > insert_values ^ values(,select',
|
|
389
275
|
'- > select > select',
|
|
390
276
|
'insert_values > ( > insert_values_lp_',
|
|
391
|
-
'insert_values_lp_ > name|single|num > insert_values_lp_v',
|
|
277
|
+
'insert_values_lp_ > name|single|num > insert_values_lp_v ^ single',
|
|
392
278
|
'insert_values_lp_v > , > insert_values_lp_v_comma_',
|
|
393
279
|
'insert_values_lp_v_comma_ > name|single|num > insert_values_lp_v',
|
|
394
280
|
|
|
395
281
|
|
|
396
282
|
' > update > update',
|
|
397
|
-
'update_ > name > update_x',
|
|
398
|
-
'update_x_ > set > update_set',
|
|
399
|
-
'update_set_ > name > update_set_a',
|
|
283
|
+
'update_ > name > update_x ^ tables',
|
|
284
|
+
'update_x_ > set > update_set ^ set',
|
|
285
|
+
'update_set_ > name > update_set_a ^ id',
|
|
400
286
|
'update_set_a > comparison > update_set_a_op',
|
|
401
|
-
'update_set_a_op > name|single|num > update_set_sc',
|
|
287
|
+
'update_set_a_op > name|single|num > update_set_sc ^ single',
|
|
402
288
|
'update_set_sc > , > update_set_sc_comma_',
|
|
403
|
-
'update_set_sc_comma_ > name > update_set_a',
|
|
404
|
-
'update_set_sc_ > , > update_set_sc_comma_',
|
|
289
|
+
'update_set_sc_comma_ > name > update_set_a ^ id',
|
|
290
|
+
'update_set_sc_ > , > update_set_sc_comma_ ^ where',
|
|
405
291
|
'- > where > update_where',
|
|
406
|
-
'update_where_ > name > update_where_a',
|
|
292
|
+
'update_where_ > name > update_where_a ^ id',
|
|
407
293
|
'update_where_a > comparison > update_where_a_op',
|
|
408
|
-
'
|
|
409
|
-
'
|
|
294
|
+
'update_where_a_ > comparison > update_where_a_op ^ =,<,<=,>,>=,<>,like,not,in',
|
|
295
|
+
'update_where_a_op > name|single|num > update_where_sc ^ single',
|
|
296
|
+
'update_where_sc_ > and|or > update_where ^ and,or',
|
|
410
297
|
|
|
411
298
|
|
|
412
299
|
' > delete > delete',
|
|
413
|
-
'delete_ > from > delete_from',
|
|
414
|
-
'delete_from_ > name > delete_from_x',
|
|
415
|
-
'delete_from_x_ > where > delete_where',
|
|
416
|
-
'delete_where_ > name > delete_where_a',
|
|
417
|
-
'delete_where_a > comparison > delete_where_a_op',
|
|
418
|
-
'delete_where_a_op > name|single|num > delete_where_sc',
|
|
419
|
-
'delete_where_sc_ > and|or > delete_where',
|
|
300
|
+
'delete_ > from > delete_from ^ from',
|
|
301
|
+
'delete_from_ > name > delete_from_x ^ tables',
|
|
302
|
+
'delete_from_x_ > where > delete_where ^ where',
|
|
303
|
+
'delete_where_ > name > delete_where_a ^ id',
|
|
304
|
+
'delete_where_a > comparison > delete_where_a_op ^ =,<,<=,>,>=,<>,like,not,in',
|
|
305
|
+
'delete_where_a_op > name|single|num > delete_where_sc ^ single',
|
|
306
|
+
'delete_where_sc_ > and|or > delete_where ^ and,or',
|
|
420
307
|
]
|
|
421
308
|
|
|
422
|
-
def
|
|
309
|
+
def add_whitespace_transition(from_s: str):
|
|
423
310
|
# add whitespace transition if a state with trailing whitespace is found from from states, for example, select > _ > select_
|
|
424
311
|
if from_s.endswith('_') and not from_s.endswith('_comma_') and not from_s.endswith('_lp_') and not from_s.endswith('_rp_'):
|
|
425
312
|
if self.debug:
|
|
@@ -427,14 +314,22 @@ class SqlCompleter(Completer):
|
|
|
427
314
|
machine[f'{from_s[:-1]} > _'] = from_s
|
|
428
315
|
|
|
429
316
|
machine: dict[str, str] = {}
|
|
317
|
+
completers: dict[str, str] = {}
|
|
430
318
|
|
|
431
319
|
from_ss_to_add = []
|
|
432
320
|
from_ss = ['']
|
|
433
321
|
token = None
|
|
434
322
|
tokens = []
|
|
435
323
|
to_s = None
|
|
324
|
+
words: str = None
|
|
436
325
|
for l in y:
|
|
437
|
-
|
|
326
|
+
t_and_w = l.split('^')
|
|
327
|
+
if len(t_and_w) > 1:
|
|
328
|
+
words = t_and_w[1]
|
|
329
|
+
else:
|
|
330
|
+
words = None
|
|
331
|
+
|
|
332
|
+
tks = t_and_w[0].strip(' ').split('>')
|
|
438
333
|
if l.startswith('-'):
|
|
439
334
|
token = tks[1].strip(' ')
|
|
440
335
|
if len(tks) > 2:
|
|
@@ -449,18 +344,21 @@ class SqlCompleter(Completer):
|
|
|
449
344
|
print(f'{from_s} > {t} = {to_s}')
|
|
450
345
|
machine[f'{from_s} > {t}'] = to_s
|
|
451
346
|
else:
|
|
347
|
+
if words:
|
|
348
|
+
completers[tks[0].strip(' ')] = words
|
|
349
|
+
|
|
452
350
|
if len(tks) == 1:
|
|
453
351
|
from_s = tks[0].strip(' ')
|
|
454
|
-
|
|
352
|
+
add_whitespace_transition(from_s)
|
|
455
353
|
from_ss_to_add.append(f'{from_s}')
|
|
456
354
|
continue
|
|
457
355
|
|
|
458
356
|
from_ss = []
|
|
459
357
|
from_ss.extend(from_ss_to_add)
|
|
460
358
|
from_ss_to_add = []
|
|
461
|
-
from_ss.append(
|
|
359
|
+
from_ss.append(tks[0].strip(' '))
|
|
462
360
|
for from_s in from_ss:
|
|
463
|
-
|
|
361
|
+
add_whitespace_transition(from_s)
|
|
464
362
|
token = tks[1].strip(' ')
|
|
465
363
|
tokens = [token]
|
|
466
364
|
if len(tks) > 2:
|
|
@@ -474,7 +372,7 @@ class SqlCompleter(Completer):
|
|
|
474
372
|
print(f'{from_s} > {t} = {to_s}')
|
|
475
373
|
machine[f'{from_s} > {t}'] = to_s
|
|
476
374
|
|
|
477
|
-
return machine
|
|
375
|
+
return (machine, completers)
|
|
478
376
|
|
|
479
377
|
def traverse_tokens(self, text: str, tokens: list[Token], state: str = '', indent=0):
|
|
480
378
|
keywords = [
|
|
@@ -532,7 +430,7 @@ class SqlCompleter(Completer):
|
|
|
532
430
|
it = 'comparison'
|
|
533
431
|
|
|
534
432
|
try:
|
|
535
|
-
state = self.machine[f'{state} > {it}']
|
|
433
|
+
state = self.machine[0][f'{state} > {it}']
|
|
536
434
|
except:
|
|
537
435
|
pass
|
|
538
436
|
|
adam/version.py
CHANGED
|
@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=WA90Rl27Juctzr3U3kfCDk5N-oYMKlfWbZeafUgk7k0,4723
|
|
|
14
14
|
adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
|
|
15
15
|
adam/repl_state.py,sha256=nZO5CucSIGz68f4JreadGphRzMXPUzkTn-4XcoJJOug,8643
|
|
16
16
|
adam/utils.py,sha256=2DoWsrcaioFFH0-RjT30qelVRPUJqCGTfz_ucfE7F8g,7406
|
|
17
|
-
adam/version.py,sha256=
|
|
17
|
+
adam/version.py,sha256=lLq6AQ663qjkDqWP3JM2c-hyH20y0t4X1nu0WQgGaEM,139
|
|
18
18
|
adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
19
19
|
adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
|
|
20
20
|
adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
|
|
@@ -164,7 +164,7 @@ adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,31
|
|
|
164
164
|
adam/k8s_utils/statefulsets.py,sha256=5g7KxGRHgEewT8rnZneDTaJDylUf-dHH2edWJEoorr8,4667
|
|
165
165
|
adam/k8s_utils/volumes.py,sha256=RIBmlOSWM3V3QVXLCFT0owVOyh4rGG1ETp521a-6ndo,1137
|
|
166
166
|
adam/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
167
|
-
adam/sql/sql_completer.py,sha256=
|
|
167
|
+
adam/sql/sql_completer.py,sha256=Ay33ICCyXtuarIsPDKNHM0hx-VpnUQmVWyVzGh5p2jQ,23433
|
|
168
168
|
adam/sql/term_completer.py,sha256=17fuRyW2Uk-CoKySAh0S_UEzRQu9a-NxWII8jQnpAPU,2550
|
|
169
169
|
adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
170
170
|
adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
|
|
@@ -176,8 +176,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
|
|
|
176
176
|
adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
|
|
177
177
|
adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
|
|
178
178
|
adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
|
|
179
|
-
kaqing-2.0.
|
|
180
|
-
kaqing-2.0.
|
|
181
|
-
kaqing-2.0.
|
|
182
|
-
kaqing-2.0.
|
|
183
|
-
kaqing-2.0.
|
|
179
|
+
kaqing-2.0.63.dist-info/METADATA,sha256=qEAEc0sWd4IJqvGZ-qZV6RDG8zGGI7X5n9pks9lKNe4,132
|
|
180
|
+
kaqing-2.0.63.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
|
|
181
|
+
kaqing-2.0.63.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
|
|
182
|
+
kaqing-2.0.63.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
|
|
183
|
+
kaqing-2.0.63.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|