summaryrefslogtreecommitdiffstats
path: root/src/Components
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components')
-rw-r--r--src/Components/CaseExpression.php18
-rw-r--r--src/Components/CreateDefinition.php4
-rw-r--r--src/Components/Expression.php10
-rw-r--r--src/Components/IntoKeyword.php4
-rw-r--r--src/Components/JoinKeyword.php12
-rw-r--r--src/Components/Limit.php2
-rw-r--r--src/Components/OrderKeyword.php4
-rw-r--r--src/Components/PartitionDefinition.php2
-rw-r--r--src/Components/RenameOperation.php2
9 files changed, 28 insertions, 30 deletions
diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php
index 5a068ca..12b2440 100644
--- a/src/Components/CaseExpression.php
+++ b/src/Components/CaseExpression.php
@@ -105,7 +105,7 @@ class CaseExpression extends Component
if ($state === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'WHEN'
+ && $token->keyword === 'WHEN'
) {
++$list->idx; // Skip 'WHEN'
$new_condition = Condition::parse($parser, $list);
@@ -113,14 +113,13 @@ class CaseExpression extends Component
$state = 1;
$ret->conditions[] = $new_condition;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'ELSE'
+ && $token->keyword === 'ELSE'
) {
++$list->idx; // Skip 'ELSE'
$ret->else_result = Expression::parse($parser, $list);
$state = 0; // last clause of CASE expression
} elseif ($token->type === Token::TYPE_KEYWORD
- && ($token->value === 'END'
- || $token->value === 'end')
+ && $token->keyword === 'END'
) {
$state = 3; // end of CASE expression
++$list->idx;
@@ -136,21 +135,20 @@ class CaseExpression extends Component
} elseif ($state === 1) {
if ($type === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'WHEN'
+ && $token->keyword === 'WHEN'
) {
++$list->idx; // Skip 'WHEN'
$new_value = Expression::parse($parser, $list);
$state = 2;
$ret->compare_values[] = $new_value;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'ELSE'
+ && $token->keyword === 'ELSE'
) {
++$list->idx; // Skip 'ELSE'
$ret->else_result = Expression::parse($parser, $list);
$state = 0; // last clause of CASE expression
} elseif ($token->type === Token::TYPE_KEYWORD
- && ($token->value === 'END'
- || $token->value === 'end')
+ && $token->keyword === 'END'
) {
$state = 3; // end of CASE expression
++$list->idx;
@@ -161,7 +159,7 @@ class CaseExpression extends Component
}
} else {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'THEN'
+ && $token->keyword === 'THEN'
) {
++$list->idx; // Skip 'THEN'
$new_result = Expression::parse($parser, $list);
@@ -175,7 +173,7 @@ class CaseExpression extends Component
} elseif ($state === 2) {
if ($type === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'THEN'
+ && $token->keyword === 'THEN'
) {
++$list->idx; // Skip 'THEN'
$new_result = Expression::parse($parser, $list);
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 78a64a9..2bf6198 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -204,7 +204,7 @@ class CreateDefinition extends Component
break;
}
} elseif ($state === 1) {
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'CONSTRAINT')) {
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'CONSTRAINT') {
$expr->isConstraint = true;
} elseif (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_KEY)) {
$expr->key = Key::parse($parser, $list);
@@ -246,7 +246,7 @@ class CreateDefinition extends Component
$expr->options = OptionsArray::parse($parser, $list, static::$FIELD_OPTIONS);
$state = 4;
} elseif ($state === 4) {
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'REFERENCES')) {
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'REFERENCES') {
++$list->idx; // Skipping keyword 'REFERENCES'.
$expr->references = Reference::parse($parser, $list);
} else {
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index 6cc33f4..d3668d7 100644
--- a/src/Components/Expression.php
+++ b/src/Components/Expression.php
@@ -216,11 +216,11 @@ class Expression extends Component
if ($token->type === Token::TYPE_KEYWORD) {
if (($brackets > 0) && (empty($ret->subquery))
- && (!empty(Parser::$STATEMENT_PARSERS[$token->value]))
+ && (!empty(Parser::$STATEMENT_PARSERS[$token->keyword]))
) {
// A `(` was previously found and this keyword is the
// beginning of a statement, so this is a subquery.
- $ret->subquery = $token->value;
+ $ret->subquery = $token->keyword;
} elseif (($token->flags & Token::FLAG_KEYWORD_FUNCTION)
&& (empty($options['parseField'])
&& !$alias)
@@ -229,13 +229,13 @@ class Expression extends Component
} elseif (($token->flags & Token::FLAG_KEYWORD_RESERVED)
&& ($brackets === 0)
) {
- if (empty(self::$ALLOWED_KEYWORDS[$token->value])) {
+ if (empty(self::$ALLOWED_KEYWORDS[$token->keyword])) {
// A reserved keyword that is not allowed in the
// expression was found so the expression must have
// ended and a new clause is starting.
break;
}
- if ($token->value === 'AS') {
+ if ($token->keyword === 'AS') {
if (!empty($options['breakOnAlias'])) {
break;
}
@@ -248,7 +248,7 @@ class Expression extends Component
}
$alias = true;
continue;
- } elseif ($token->value === 'CASE') {
+ } elseif ($token->keyword === 'CASE') {
// For a use of CASE like
// 'SELECT a = CASE .... END, b=1, `id`, ... FROM ...'
$tempCaseExpr = CaseExpression::parse($parser, $list);
diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
index a8e80b4..a5c2d24 100644
--- a/src/Components/IntoKeyword.php
+++ b/src/Components/IntoKeyword.php
@@ -141,7 +141,7 @@ class IntoKeyword extends Component
}
if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) {
- if (($state === 0) && ($token->value === 'OUTFILE')) {
+ if (($state === 0) && ($token->keyword === 'OUTFILE')) {
$ret->type = 'OUTFILE';
$state = 2;
continue;
@@ -185,7 +185,7 @@ class IntoKeyword extends Component
$ret->parseFileOptions($parser, $list, $token->value);
$state = 4;
} elseif ($state == 4) {
- if ($token->type === Token::TYPE_KEYWORD && $token->value !== 'LINES') {
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword !== 'LINES') {
break;
}
diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php
index 1f41ef7..fdf0e5e 100644
--- a/src/Components/JoinKeyword.php
+++ b/src/Components/JoinKeyword.php
@@ -133,9 +133,9 @@ class JoinKeyword extends Component
if ($state === 0) {
if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->value]))
+ && (!empty(static::$JOINS[$token->keyword]))
) {
- $expr->type = static::$JOINS[$token->value];
+ $expr->type = static::$JOINS[$token->keyword];
$state = 1;
} else {
break;
@@ -145,17 +145,17 @@ class JoinKeyword extends Component
$state = 2;
} elseif ($state === 2) {
if ($token->type === Token::TYPE_KEYWORD) {
- if ($token->value === 'ON') {
+ if ($token->keyword === 'ON') {
$state = 3;
- } elseif ($token->value === 'USING') {
+ } elseif ($token->keyword === 'USING') {
$state = 4;
} else {
if (($token->type === Token::TYPE_KEYWORD)
- && (!empty(static::$JOINS[$token->value]))
+ && (!empty(static::$JOINS[$token->keyword]))
) {
$ret[] = $expr;
$expr = new self();
- $expr->type = static::$JOINS[$token->value];
+ $expr->type = static::$JOINS[$token->keyword];
$state = 1;
} else {
/* Next clause is starting */
diff --git a/src/Components/Limit.php b/src/Components/Limit.php
index d796c75..17423e2 100644
--- a/src/Components/Limit.php
+++ b/src/Components/Limit.php
@@ -81,7 +81,7 @@ class Limit extends Component
break;
}
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'OFFSET')) {
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'OFFSET') {
if ($offset) {
$parser->error('An offset was expected.', $token);
}
diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php
index b17b115..8e628f0 100644
--- a/src/Components/OrderKeyword.php
+++ b/src/Components/OrderKeyword.php
@@ -96,9 +96,9 @@ class OrderKeyword extends Component
$state = 1;
} elseif ($state === 1) {
if (($token->type === Token::TYPE_KEYWORD)
- && (($token->value === 'ASC') || ($token->value === 'DESC'))
+ && (($token->keyword === 'ASC') || ($token->keyword === 'DESC'))
) {
- $expr->type = $token->value;
+ $expr->type = $token->keyword;
} elseif (($token->type === Token::TYPE_OPERATOR)
&& ($token->value === ',')
) {
diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php
index d346bd1..3e3c1d8 100644
--- a/src/Components/PartitionDefinition.php
+++ b/src/Components/PartitionDefinition.php
@@ -137,7 +137,7 @@ class PartitionDefinition extends Component
}
if ($state === 0) {
- $ret->isSubpartition = ($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITION');
+ $ret->isSubpartition = ($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITION');
$state = 1;
} elseif ($state === 1) {
$ret->name = $token->value;
diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php
index 69e974e..8ec8647 100644
--- a/src/Components/RenameOperation.php
+++ b/src/Components/RenameOperation.php
@@ -100,7 +100,7 @@ class RenameOperation extends Component
}
$state = 1;
} elseif ($state === 1) {
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'TO')) {
+ if ($token->type === Token::TYPE_KEYWORD && $token->keyword === 'TO') {
$state = 2;
} else {
$parser->error(
generated by cgit v1.1 at 2025-05-17 15:14:03 +0000