Commit 5dd3bbb
committed
Refactor multi-dot notation handling to be done in parser
Address PR feedback: Handle multi-dot notation directly in the parser
grammar rather than in post-processing Java code.
Changes:
- ANTLR: Simplified to use getText() directly from parser, removed
extractTableName() method that was walking the parse tree
- JavaCC: Modified tableIdentifier rule to parse all dot-separated
identifiers and split database/table within the grammar action
- Both parsers now handle the logic in the grammar/parser itself1 parent 1f9c61f commit 5dd3bbb
File tree
2 files changed
+35
-39
lines changed- jdbc-v2/src/main
- javacc
- java/com/clickhouse/jdbc/internal
2 files changed
+35
-39
lines changedLines changed: 21 additions & 35 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
251 | 270 | | |
252 | 271 | | |
253 | 272 | | |
| |||
265 | 284 | | |
266 | 285 | | |
267 | 286 | | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | | - | |
293 | | - | |
294 | | - | |
295 | | - | |
296 | | - | |
297 | | - | |
298 | | - | |
299 | | - | |
300 | | - | |
301 | 287 | | |
302 | 288 | | |
303 | 289 | | |
304 | | - | |
| 290 | + | |
305 | 291 | | |
306 | 292 | | |
307 | 293 | | |
308 | 294 | | |
309 | 295 | | |
310 | 296 | | |
311 | 297 | | |
312 | | - | |
| 298 | + | |
313 | 299 | | |
314 | 300 | | |
315 | 301 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
903 | 903 | | |
904 | 904 | | |
905 | 905 | | |
906 | | - | |
| 906 | + | |
907 | 907 | | |
908 | | - | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
909 | 912 | | |
910 | 913 | | |
911 | 914 | | |
912 | 915 | | |
913 | 916 | | |
914 | 917 | | |
915 | 918 | | |
916 | | - | |
917 | | - | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
918 | 928 | | |
919 | 929 | | |
920 | 930 | | |
| |||
0 commit comments