Merge #416 - Fix error message "Lock" to "LOCK"

williamdes · williamdes · commit f485888331cb · 2023-02-26T22:46:21.000+01:00
Pull-request: #416 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/locale/sqlparser.pot b/locale/sqlparser.pot
@@ -143,7 +143,7 @@ msgid "Unexpected end of LOCK expression."
 msgstr ""
 
 #: src/Components/LockExpression.php:204
-msgid "Unexpected end of Lock expression."
+msgid "Unexpected end of LOCK expression."
 msgstr ""
 
 #: src/Components/OptionsArray.php:151
diff --git a/src/Components/LockExpression.php b/src/Components/LockExpression.php
@@ -198,7 +198,7 @@ private static function parseLockType(Parser $parser, TokensList $list)
 
         // Only  two possible end states
         if ($state !== 1 && $state !== 3) {
-            $parser->error('Unexpected end of Lock expression.', $prevToken);
+            $parser->error('Unexpected end of LOCK expression.', $prevToken);
         }
 
         return $lockType;
diff --git a/tests/data/parser/parseLockErr2.out b/tests/data/parser/parseLockErr2.out
@@ -515,7 +515,7 @@
                 0
             ],
             [
-                "Unexpected end of Lock expression.",
+                "Unexpected end of LOCK expression.",
                 null,
                 0
             ]
diff --git a/tests/data/parser/parseLockErr7.out b/tests/data/parser/parseLockErr7.out
@@ -522,7 +522,7 @@
                 0
             ],
             [
-                "Unexpected end of Lock expression.",
+                "Unexpected end of LOCK expression.",
                 null,
                 0
             ]
diff --git a/tests/data/parser/parseLockErr9.out b/tests/data/parser/parseLockErr9.out
@@ -533,7 +533,7 @@
                 0
             ],
             [
-                "Unexpected end of Lock expression.",
+                "Unexpected end of LOCK expression.",
                 {
                     "@type": "@12"
                 },

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private static function parseLockType(Parser $parser, TokensList $list)`
`198`	`198`
`199`	`199`	`// Only two possible end states`
`200`	`200`	`if ($state !== 1 && $state !== 3) {`
`201`		`- $parser->error('Unexpected end of Lock expression.', $prevToken);`
	`201`	`+ $parser->error('Unexpected end of LOCK expression.', $prevToken);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`return $lockType;`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@`
`515`	`515`	`0`
`516`	`516`	`],`
`517`	`517`	`[`
`518`		`- "Unexpected end of Lock expression.",`
	`518`	`+ "Unexpected end of LOCK expression.",`
`519`	`519`	`null,`
`520`	`520`	`0`
`521`	`521`	`]`
Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@`
`522`	`522`	`0`
`523`	`523`	`],`
`524`	`524`	`[`
`525`		`- "Unexpected end of Lock expression.",`
	`525`	`+ "Unexpected end of LOCK expression.",`
`526`	`526`	`null,`
`527`	`527`	`0`
`528`	`528`	`]`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@`
`533`	`533`	`0`
`534`	`534`	`],`
`535`	`535`	`[`
`536`		`- "Unexpected end of Lock expression.",`
	`536`	`+ "Unexpected end of LOCK expression.",`
`537`	`537`	`{`
`538`	`538`	`"@type": "@12"`
`539`	`539`	`},`