parse FORCE INDEX (PRIMARY)

schlndh · Apr 6, 2024 · 9f036ad · 9f036ad
1 parent 889b40f
commit 9f036ad
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 3 deletions.
diff --git a/src/Parser/MariaDbParserState.php b/src/Parser/MariaDbParserState.php
@@ -2582,8 +2582,8 @@ private function parseIndexHints(): array
 			if ($indexHintType === IndexHintTypeEnum::USE && $this->acceptToken(')')) {
 				$indexHintColumns = [];
 			} else {
-				// TODO: implement USE INDEX (PRIMARY)
 				$columnIdentTokenTypes = $this->parser->getTokenTypesWhichCanBeUsedAsUnquotedFieldAlias();
+				$columnIdentTokenTypes[] = TokenTypeEnum::PRIMARY;
 				$indexHintColumns = [];
 
 				do {

diff --git a/tests/code/Parser/MariaDbParser/invalid/index_hints.test b/tests/code/Parser/MariaDbParser/invalid/index_hints.test
@@ -36,14 +36,14 @@ Expected '(', got END_OF_INPUT after: FROM parser_test_index t USE INDEX
 SELECT * FROM parser_test_index FORCE INDEX ()
 -----
 MariaStan\Parser\Exception\UnexpectedTokenException
-Expected one of IDENTIFIER, ACTION, BIT, CURRENT, CYCLE, DATE, DATETIME, DUPLICATE, END, ENUM, ESCAPE, FOLLOWING, GENERAL, IGNORE_SERVER_IDS, LOCKED, MASTER_HEARTBEAT_PERIOD, MODE, NO, NOWAIT, OPTION, POSITION, PRECEDING, ROLLUP, ROW, SHARE, SIGNED, SKIP, SLOW, TEXT, TIME, TIMESTAMP, TRUNCATE, UNBOUNDED, UNKNOWN, VALUE, WAIT, WINDOW, got ')' after: FROM parser_test_index FORCE INDEX (
+Expected one of IDENTIFIER, ACTION, BIT, CURRENT, CYCLE, DATE, DATETIME, DUPLICATE, END, ENUM, ESCAPE, FOLLOWING, GENERAL, IGNORE_SERVER_IDS, LOCKED, MASTER_HEARTBEAT_PERIOD, MODE, NO, NOWAIT, OPTION, POSITION, PRECEDING, ROLLUP, ROW, SHARE, SIGNED, SKIP, SLOW, TEXT, TIME, TIMESTAMP, TRUNCATE, UNBOUNDED, UNKNOWN, VALUE, WAIT, WINDOW, PRIMARY, got ')' after: FROM parser_test_index FORCE INDEX (
 #####
 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1
 -----
 SELECT * FROM parser_test_index IGNORE INDEX ()
 -----
 MariaStan\Parser\Exception\UnexpectedTokenException
-Expected one of IDENTIFIER, ACTION, BIT, CURRENT, CYCLE, DATE, DATETIME, DUPLICATE, END, ENUM, ESCAPE, FOLLOWING, GENERAL, IGNORE_SERVER_IDS, LOCKED, MASTER_HEARTBEAT_PERIOD, MODE, NO, NOWAIT, OPTION, POSITION, PRECEDING, ROLLUP, ROW, SHARE, SIGNED, SKIP, SLOW, TEXT, TIME, TIMESTAMP, TRUNCATE, UNBOUNDED, UNKNOWN, VALUE, WAIT, WINDOW, got ')' after: FROM parser_test_index IGNORE INDEX (
+Expected one of IDENTIFIER, ACTION, BIT, CURRENT, CYCLE, DATE, DATETIME, DUPLICATE, END, ENUM, ESCAPE, FOLLOWING, GENERAL, IGNORE_SERVER_IDS, LOCKED, MASTER_HEARTBEAT_PERIOD, MODE, NO, NOWAIT, OPTION, POSITION, PRECEDING, ROLLUP, ROW, SHARE, SIGNED, SKIP, SLOW, TEXT, TIME, TIMESTAMP, TRUNCATE, UNBOUNDED, UNKNOWN, VALUE, WAIT, WINDOW, PRIMARY, got ')' after: FROM parser_test_index IGNORE INDEX (
 #####
 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')' at line 1
 -----

diff --git a/tests/code/Parser/MariaDbParser/valid/index_hints.test b/tests/code/Parser/MariaDbParser/valid/index_hints.test
@@ -120,6 +120,67 @@ MariaStan\Ast\Query\SelectQuery\SimpleSelectQuery
 	[isSqlCalcFoundRows] => false
 )
 -----
+SELECT * FROM parser_test_index FORCE INDEX (PRIMARY)
+-----
+MariaStan\Ast\Query\SelectQuery\SimpleSelectQuery
+(
+	[select] => Array
+		(
+			[0] => MariaStan\Ast\SelectExpr\AllColumns
+				(
+				)
+		)
+	[from] => MariaStan\Ast\Query\TableReference\Table
+		(
+			[name] => parser_test_index
+			[indexHints] => Array
+				(
+					[0] => MariaStan\Ast\Query\TableReference\IndexHint
+						(
+							[type] => MariaStan\Ast\Query\TableReference\IndexHintTypeEnum::FORCE
+							[columnNames] => Array
+								(
+									[0] => PRIMARY
+								)
+							[purpose] => MariaStan\Ast\Query\TableReference\IndexHintPurposeEnum::JOIN
+						)
+				)
+		)
+	[isDistinct] => false
+	[isSqlCalcFoundRows] => false
+)
+-----
+SELECT * FROM parser_test_index FORCE INDEX (name, PRIMARY)
+-----
+MariaStan\Ast\Query\SelectQuery\SimpleSelectQuery
+(
+	[select] => Array
+		(
+			[0] => MariaStan\Ast\SelectExpr\AllColumns
+				(
+				)
+		)
+	[from] => MariaStan\Ast\Query\TableReference\Table
+		(
+			[name] => parser_test_index
+			[indexHints] => Array
+				(
+					[0] => MariaStan\Ast\Query\TableReference\IndexHint
+						(
+							[type] => MariaStan\Ast\Query\TableReference\IndexHintTypeEnum::FORCE
+							[columnNames] => Array
+								(
+									[0] => name
+									[1] => PRIMARY
+								)
+							[purpose] => MariaStan\Ast\Query\TableReference\IndexHintPurposeEnum::JOIN
+						)
+				)
+		)
+	[isDistinct] => false
+	[isSqlCalcFoundRows] => false
+)
+-----
 SELECT * FROM parser_test_index USE INDEX (id) USE INDEX (name)
 -----
 MariaStan\Ast\Query\SelectQuery\SimpleSelectQuery