Merge branch '5.11.x'

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

CHANGELOG.md

@@ -6,6 +6,17 @@
 - Move `Misc::getAliases()` into `SelectStatement::getAliases()` (#454)
 - Drop `USE_UTF_STRINGS` constant (#471)
 
+## [5.10.1] - 2024-11-10
+
+### Fixed
+
+- Fix parsing of ALTER TABLE … RENAME KEY (#580)
+- Fix parsing table names that start with "e1" (#578)
+- Improve handling of negative and overflowed offsets on TokensList (#582)
+- Fix parsing of queries with 'AND' (#590)
+- Fix C style comments with two asterisks (#597)
+- Fix parsing of SRID in column definition (#595)
+
 ## [5.10.0] - 2024-08-29
 
 - Fix parsing of UPDATE ... SET (#577)
@@ -586,6 +597,7 @@ __Breaking changes:__
 
 * First release of this library.
 
+[5.10.1]: https://github.com/phpmyadmin/sql-parser/compare/5.10.0...5.10.1
 [5.10.0]: https://github.com/phpmyadmin/sql-parser/compare/5.9.1...5.10.0
 [5.9.1]: https://github.com/phpmyadmin/sql-parser/compare/5.9.0...5.9.1
 [5.9.0]: https://github.com/phpmyadmin/sql-parser/compare/5.8.2...5.9.0

src/Lexer.php

@@ -568,7 +568,7 @@ public function parseComment(): Token|null
                 // - "SELECT */* comment */ FROM ..."
                 // - "SELECT 2*/* comment */3 AS `six`;"
                 $next = $this->last + 1;
-                if (($next < $this->len) && $this->str[$next] === '*') {
+                if (($next < $this->len) && $this->str[$next] === '*' && $token === '*/') {
                     // Conflict in "*/*": first "*" was not for ending a comment.
                     // Stop here and let other parsing method define the true behavior of that first star.
                     $this->last = $iBak;

src/Parsers/CreateDefinitions.php

@@ -83,6 +83,7 @@ final class CreateDefinitions implements Parseable
         'ENFORCED' => 14,
         'NOT' => 15,
         'COMPRESSED' => 16,
+        'SRID' => [17, 'var'],
         // Common entries.
         //
         // NOTE: Some of the common options are not in the same order which

tests/Lexer/LexerTest.php

@@ -75,6 +75,7 @@ public static function lexProvider(): array
             ['lexer/lexOperator'],
             ['lexer/lexOperatorStarIsArithmetic'],
             ['lexer/lexOperatorStarIsWildcard'],
+            ['lexer/lexEmptyCStyleComment'],
             ['lexer/lexString'],
             ['lexer/lexStringErr1'],
             ['lexer/lexSymbol'],

tests/Parser/CreateStatementTest.php

@@ -59,6 +59,7 @@ public static function createProvider(): array
             ['parser/parseCreateTableAsSelect'],
             ['parser/parseCreateTableLike'],
             ['parser/parseCreateTableSpatial'],
+            ['parser/parseCreateTableSRID'],
             ['parser/parseCreateTableTimestampWithPrecision'],
             ['parser/parseCreateTableEnforcedCheck'],
             ['parser/parseCreateTableNotEnforcedCheck'],

tests/data/lexer/lexEmptyCStyleComment.in

@@ -0,0 +1,5 @@
+SELECT /**/ 1
+SELECT /*+*/ 1
+SELECT /***/ 1
+SELECT /** */ 1
+SELECT /* **/ 1