SQL: Add support for SYS GEOMETRY_COLUMNS

Adds support for SYS GEOMETRY_COLUMNS, which returns the same information as `SELECT * FROM GEOMETRY_COLUMNS` command in the standard implementation. Relates elastic#29872
imotov · May 9, 2018 · 0e8eea2 · 0e8eea2
1 parent 1157c11
commit 0e8eea2
Show file tree

Hide file tree

Showing 13 changed files with 1,573 additions and 1,260 deletions.
diff --git a/x-pack/plugin/sql/src/main/antlr/SqlBase.g4 b/x-pack/plugin/sql/src/main/antlr/SqlBase.g4
@@ -62,6 +62,9 @@ statement
     | SYS COLUMNS (CATALOG cluster=string)?
                   (TABLE LIKE? indexPattern=pattern)?
                   (LIKE? columnPattern=pattern)?                                                          #sysColumns
+    | SYS GEOMETRY_COLUMNS (CATALOG cluster=string)?
+                           (TABLE LIKE? indexPattern=pattern)?
+                           (LIKE? columnPattern=pattern)?                                                 #sysGeometryColumns
     | SYS TYPES                                                                                           #sysTypes
     | SYS TABLE TYPES                                                                                     #sysTableTypes  
     ;
@@ -310,6 +313,7 @@ FORMAT: 'FORMAT';
 FROM: 'FROM';
 FULL: 'FULL';
 FUNCTIONS: 'FUNCTIONS';
+GEOMETRY_COLUMNS: 'GEOMETRY_COLUMNS';
 GRAPHVIZ: 'GRAPHVIZ';
 GROUP: 'GROUP';
 HAVING: 'HAVING';

diff --git a/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens b/x-pack/plugin/sql/src/main/antlr/SqlBase.tokens
@@ -29,73 +29,74 @@ FORMAT=28
 FROM=29
 FULL=30
 FUNCTIONS=31
-GRAPHVIZ=32
-GROUP=33
-HAVING=34
-IN=35
-INNER=36
-IS=37
-JOIN=38
-LEFT=39
-LIKE=40
-LIMIT=41
-MAPPED=42
-MATCH=43
-NATURAL=44
-NOT=45
-NULL=46
-ON=47
-OPTIMIZED=48
-OR=49
-ORDER=50
-OUTER=51
-PARSED=52
-PHYSICAL=53
-PLAN=54
-RIGHT=55
-RLIKE=56
-QUERY=57
-SCHEMAS=58
-SELECT=59
-SHOW=60
-SYS=61
-TABLE=62
-TABLES=63
-TEXT=64
-TRUE=65
-TYPE=66
-TYPES=67
-USING=68
-VERIFY=69
-WHERE=70
-WITH=71
-EQ=72
-NEQ=73
-LT=74
-LTE=75
-GT=76
-GTE=77
-PLUS=78
-MINUS=79
-ASTERISK=80
-SLASH=81
-PERCENT=82
-CONCAT=83
-DOT=84
-PARAM=85
-STRING=86
-INTEGER_VALUE=87
-DECIMAL_VALUE=88
-IDENTIFIER=89
-DIGIT_IDENTIFIER=90
-TABLE_IDENTIFIER=91
-QUOTED_IDENTIFIER=92
-BACKQUOTED_IDENTIFIER=93
-SIMPLE_COMMENT=94
-BRACKETED_COMMENT=95
-WS=96
-UNRECOGNIZED=97
-DELIMITER=98
+GEOMETRY_COLUMNS=32
+GRAPHVIZ=33
+GROUP=34
+HAVING=35
+IN=36
+INNER=37
+IS=38
+JOIN=39
+LEFT=40
+LIKE=41
+LIMIT=42
+MAPPED=43
+MATCH=44
+NATURAL=45
+NOT=46
+NULL=47
+ON=48
+OPTIMIZED=49
+OR=50
+ORDER=51
+OUTER=52
+PARSED=53
+PHYSICAL=54
+PLAN=55
+RIGHT=56
+RLIKE=57
+QUERY=58
+SCHEMAS=59
+SELECT=60
+SHOW=61
+SYS=62
+TABLE=63
+TABLES=64
+TEXT=65
+TRUE=66
+TYPE=67
+TYPES=68
+USING=69
+VERIFY=70
+WHERE=71
+WITH=72
+EQ=73
+NEQ=74
+LT=75
+LTE=76
+GT=77
+GTE=78
+PLUS=79
+MINUS=80
+ASTERISK=81
+SLASH=82
+PERCENT=83
+CONCAT=84
+DOT=85
+PARAM=86
+STRING=87
+INTEGER_VALUE=88
+DECIMAL_VALUE=89
+IDENTIFIER=90
+DIGIT_IDENTIFIER=91
+TABLE_IDENTIFIER=92
+QUOTED_IDENTIFIER=93
+BACKQUOTED_IDENTIFIER=94
+SIMPLE_COMMENT=95
+BRACKETED_COMMENT=96
+WS=97
+UNRECOGNIZED=98
+DELIMITER=99
 '('=1
 ')'=2
 ','=3
@@ -127,56 +128,57 @@ DELIMITER=98
 'FROM'=29
 'FULL'=30
 'FUNCTIONS'=31
-'GRAPHVIZ'=32
-'GROUP'=33
-'HAVING'=34
-'IN'=35
-'INNER'=36
-'IS'=37
-'JOIN'=38
-'LEFT'=39
-'LIKE'=40
-'LIMIT'=41
-'MAPPED'=42
-'MATCH'=43
-'NATURAL'=44
-'NOT'=45
-'NULL'=46
-'ON'=47
-'OPTIMIZED'=48
-'OR'=49
-'ORDER'=50
-'OUTER'=51
-'PARSED'=52
-'PHYSICAL'=53
-'PLAN'=54
-'RIGHT'=55
-'RLIKE'=56
-'QUERY'=57
-'SCHEMAS'=58
-'SELECT'=59
-'SHOW'=60
-'SYS'=61
-'TABLE'=62
-'TABLES'=63
-'TEXT'=64
-'TRUE'=65
-'TYPE'=66
-'TYPES'=67
-'USING'=68
-'VERIFY'=69
-'WHERE'=70
-'WITH'=71
-'='=72
-'<'=74
-'<='=75
-'>'=76
-'>='=77
-'+'=78
-'-'=79
-'*'=80
-'/'=81
-'%'=82
-'||'=83
-'.'=84
-'?'=85
+'GEOMETRY_COLUMNS'=32
+'GRAPHVIZ'=33
+'GROUP'=34
+'HAVING'=35
+'IN'=36
+'INNER'=37
+'IS'=38
+'JOIN'=39
+'LEFT'=40
+'LIKE'=41
+'LIMIT'=42
+'MAPPED'=43
+'MATCH'=44
+'NATURAL'=45
+'NOT'=46
+'NULL'=47
+'ON'=48
+'OPTIMIZED'=49
+'OR'=50
+'ORDER'=51
+'OUTER'=52
+'PARSED'=53
+'PHYSICAL'=54
+'PLAN'=55
+'RIGHT'=56
+'RLIKE'=57
+'QUERY'=58
+'SCHEMAS'=59
+'SELECT'=60
+'SHOW'=61
+'SYS'=62
+'TABLE'=63
+'TABLES'=64
+'TEXT'=65
+'TRUE'=66
+'TYPE'=67
+'TYPES'=68
+'USING'=69
+'VERIFY'=70
+'WHERE'=71
+'WITH'=72
+'='=73
+'<'=75
+'<='=76
+'>'=77
+'>='=78
+'+'=79
+'-'=80
+'*'=81
+'/'=82
+'%'=83
+'||'=84
+'.'=85
+'?'=86