Fix #641 - Add VECTOR data type and VECTOR INDEX support by predictor2718 · Pull Request #651 · phpmyadmin/sql-parser · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions phpstan-baseline.neon
3 changes: 3 additions & 0 deletions src/Contexts/ContextMariaDb110700.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ class ContextMariaDb110700 extends Context
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHILE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -671,6 +672,8 @@ class ContextMariaDb110700 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
3 changes: 3 additions & 0 deletions src/Contexts/ContextMariaDb110800.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ class ContextMariaDb110800 extends Context
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHILE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -671,6 +672,8 @@ class ContextMariaDb110800 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
3 changes: 3 additions & 0 deletions src/Contexts/ContextMariaDb120000.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ class ContextMariaDb120000 extends Context
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHILE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -671,6 +672,8 @@ class ContextMariaDb120000 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
3 changes: 3 additions & 0 deletions src/Contexts/ContextMariaDb120100.php
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ class ContextMariaDb120100 extends Context
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHILE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -671,6 +672,8 @@ class ContextMariaDb120100 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
4 changes: 3 additions & 1 deletion src/Contexts/ContextMySql90000.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class ContextMySql90000 extends Context
'USING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -657,6 +657,8 @@ class ContextMySql90000 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
4 changes: 3 additions & 1 deletion src/Contexts/ContextMySql90100.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class ContextMySql90100 extends Context
'USING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -657,6 +657,8 @@ class ContextMySql90100 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
4 changes: 3 additions & 1 deletion src/Contexts/ContextMySql90200.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class ContextMySql90200 extends Context
'USING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -657,6 +657,8 @@ class ContextMySql90200 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
4 changes: 3 additions & 1 deletion src/Contexts/ContextMySql90300.php
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class ContextMySql90300 extends Context
'USING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARCHARACTER' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VARYING' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'VECTOR' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_DATA_TYPE,
'VIRTUAL' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHEN' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
'WHERE' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED,
Expand Down Expand Up @@ -657,6 +657,8 @@ class ContextMySql90300 extends Context
'PRIMARY KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'SPATIAL KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'VECTOR KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE INDEX' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'UNIQUE KEY' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_RESERVED | Token::FLAG_KEYWORD_COMPOSED | Token::FLAG_KEYWORD_KEY,
'ABS' => Token::FLAG_KEYWORD | Token::FLAG_KEYWORD_FUNCTION,
Expand Down
20 changes: 20 additions & 0 deletions tests/Builder/CreateStatementTest.php