summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
-rw-r--r--src/Parser.php10
-rw-r--r--src/Statements/CreateStatement.php16
-rw-r--r--src/Statements/DeleteStatement.php24
-rw-r--r--src/Statements/InsertStatement.php18
-rw-r--r--src/Statements/RenameStatement.php2
-rw-r--r--src/Statements/ReplaceStatement.php10
-rw-r--r--src/Utils/Formatter.php10
-rw-r--r--src/Utils/Query.php14
17 files changed, 80 insertions, 82 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(
diff --git a/src/Parser.php b/src/Parser.php
index 28364ca..a69cc46 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -427,14 +427,14 @@ class Parser extends Core
continue;
}
- if (($token->value === 'UNION') || ($token->value === 'UNION ALL') || ($token->value === 'UNION DISTINCT')) {
- $unionType = $token->value;
+ if (($token->keyword === 'UNION') || ($token->keyword === 'UNION ALL') || ($token->keyword === 'UNION DISTINCT')) {
+ $unionType = $token->keyword;
continue;
}
// Checking if it is a known statement that can be parsed.
- if (empty(static::$STATEMENT_PARSERS[$token->value])) {
- if (!isset(static::$STATEMENT_PARSERS[$token->value])) {
+ if (empty(static::$STATEMENT_PARSERS[$token->keyword])) {
+ if (!isset(static::$STATEMENT_PARSERS[$token->keyword])) {
// A statement is considered recognized if the parser
// is aware that it is a statement, but it does not have
// a parser for it yet.
@@ -454,7 +454,7 @@ class Parser extends Core
*
* @var string
*/
- $class = static::$STATEMENT_PARSERS[$token->value];
+ $class = static::$STATEMENT_PARSERS[$token->keyword];
/**
* Processed statement.
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
index 93c2b6e..eee5c5b 100644
--- a/src/Statements/CreateStatement.php
+++ b/src/Statements/CreateStatement.php
@@ -398,12 +398,12 @@ class CreateStatement extends Statement
);
} elseif ($this->options->has('TABLE')
&& ($token->type == Token::TYPE_KEYWORD)
- && ($token->value == 'SELECT')
+ && ($token->keyword == 'SELECT')
) {
/* CREATE TABLE ... SELECT */
$this->select = new SelectStatement($parser, $list);
} elseif ($this->options->has('TABLE')
- && ($token->type == Token::TYPE_KEYWORD) && ($token->value == 'AS')
+ && ($token->type == Token::TYPE_KEYWORD) && ($token->keyword == 'AS')
&& ($list->tokens[$nextidx]->type == Token::TYPE_KEYWORD)
&& ($list->tokens[$nextidx]->value == 'SELECT')
) {
@@ -412,7 +412,7 @@ class CreateStatement extends Statement
$this->select = new SelectStatement($parser, $list);
} elseif ($this->options->has('TABLE')
&& $token->type == Token::TYPE_KEYWORD
- && $token->value == 'LIKE'
+ && $token->keyword == 'LIKE'
) {
/* CREATE TABLE `new_tbl` LIKE 'orig_tbl' */
$list->idx = $nextidx;
@@ -485,17 +485,17 @@ class CreateStatement extends Statement
continue;
}
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'PARTITION BY')) {
+ if (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITION BY')) {
$field = 'partitionBy';
$brackets = false;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITION BY')) {
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITION BY')) {
$field = 'subpartitionBy';
$brackets = false;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'PARTITIONS')) {
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITIONS')) {
$token = $list->getNextOfType(Token::TYPE_NUMBER);
--$list->idx; // `getNextOfType` also advances one position.
$this->partitionsNum = $token->value;
- } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'SUBPARTITIONS')) {
+ } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'SUBPARTITIONS')) {
$token = $list->getNextOfType(Token::TYPE_NUMBER);
--$list->idx; // `getNextOfType` also advances one position.
$this->subpartitionsNum = $token->value;
@@ -544,7 +544,7 @@ class CreateStatement extends Statement
$this->parameters = ParameterDefinition::parse($parser, $list);
if ($this->options->has('FUNCTION')) {
$token = $list->getNextOfType(Token::TYPE_KEYWORD);
- if ($token->value !== 'RETURNS') {
+ if ($token->keyword !== 'RETURNS') {
$parser->error(
'A "RETURNS" keyword was expected.',
$token
diff --git a/src/Statements/DeleteStatement.php b/src/Statements/DeleteStatement.php
index c90daf4..e069324 100644
--- a/src/Statements/DeleteStatement.php
+++ b/src/Statements/DeleteStatement.php
@@ -211,12 +211,12 @@ class DeleteStatement extends Statement
if ($state === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value !== 'FROM'
+ && $token->keyword !== 'FROM'
) {
$parser->error('Unexpected keyword.', $token);
break;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'FROM'
+ && $token->keyword === 'FROM'
) {
++$list->idx; // Skip 'FROM'
$this->from = ExpressionArray::parse($parser, $list);
@@ -227,12 +227,12 @@ class DeleteStatement extends Statement
}
} elseif ($state === 1) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value !== 'FROM'
+ && $token->keyword !== 'FROM'
) {
$parser->error('Unexpected keyword.', $token);
break;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'FROM'
+ && $token->keyword === 'FROM'
) {
++$list->idx; // Skip 'FROM'
$this->from = ExpressionArray::parse($parser, $list);
@@ -243,7 +243,7 @@ class DeleteStatement extends Statement
}
} elseif ($state === 2) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'USING'
+ && $token->keyword === 'USING'
) {
++$list->idx; // Skip 'USING'
$this->using = ExpressionArray::parse($parser, $list);
@@ -251,19 +251,19 @@ class DeleteStatement extends Statement
$multiTable = true;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'WHERE'
+ && $token->keyword === 'WHERE'
) {
++$list->idx; // Skip 'WHERE'
$this->where = Condition::parse($parser, $list);
$state = 4;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'ORDER BY'
+ && $token->keyword === 'ORDER BY'
) {
++$list->idx; // Skip 'ORDER BY'
$this->order = OrderKeyword::parse($parser, $list);
$state = 5;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'LIMIT'
+ && $token->keyword === 'LIMIT'
) {
++$list->idx; // Skip 'LIMIT'
$this->limit = Limit::parse($parser, $list);
@@ -274,7 +274,7 @@ class DeleteStatement extends Statement
}
} elseif ($state === 3) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'WHERE'
+ && $token->keyword === 'WHERE'
) {
++$list->idx; // Skip 'WHERE'
$this->where = Condition::parse($parser, $list);
@@ -298,13 +298,13 @@ class DeleteStatement extends Statement
}
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'ORDER BY'
+ && $token->keyword === 'ORDER BY'
) {
++$list->idx; // Skip 'ORDER BY'
$this->order = OrderKeyword::parse($parser, $list);
$state = 5;
} elseif ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'LIMIT'
+ && $token->keyword === 'LIMIT'
) {
++$list->idx; // Skip 'LIMIT'
$this->limit = Limit::parse($parser, $list);
@@ -315,7 +315,7 @@ class DeleteStatement extends Statement
}
} elseif ($state === 5) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value === 'LIMIT'
+ && $token->keyword === 'LIMIT'
) {
++$list->idx; // Skip 'LIMIT'
$this->limit = Limit::parse($parser, $list);
diff --git a/src/Statements/InsertStatement.php b/src/Statements/InsertStatement.php
index 66284df..5628103 100644
--- a/src/Statements/InsertStatement.php
+++ b/src/Statements/InsertStatement.php
@@ -184,7 +184,7 @@ class InsertStatement extends Statement
if ($state === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value !== 'INTO'
+ && $token->keyword !== 'INTO'
) {
$parser->error('Unexpected keyword.', $token);
break;
@@ -200,17 +200,17 @@ class InsertStatement extends Statement
$state = 1;
} elseif ($state === 1) {
if ($token->type === Token::TYPE_KEYWORD) {
- if ($token->value === 'VALUE'
- || $token->value === 'VALUES'
+ if ($token->keyword === 'VALUE'
+ || $token->keyword === 'VALUES'
) {
++$list->idx; // skip VALUES
$this->values = Array2d::parse($parser, $list);
- } elseif ($token->value === 'SET') {
+ } elseif ($token->keyword === 'SET') {
++$list->idx; // skip SET
$this->set = SetOperation::parse($parser, $list);
- } elseif ($token->value === 'SELECT') {
+ } elseif ($token->keyword === 'SELECT') {
$this->select = new SelectStatement($parser, $list);
} else {
$parser->error(
@@ -231,13 +231,13 @@ class InsertStatement extends Statement
} elseif ($state == 2) {
$lastCount = $miniState;
- if ($miniState === 1 && $token->value === 'ON') {
+ if ($miniState === 1 && $token->keyword === 'ON') {
++$miniState;
- } elseif ($miniState === 2 && $token->value === 'DUPLICATE') {
+ } elseif ($miniState === 2 && $token->keyword === 'DUPLICATE') {
++$miniState;
- } elseif ($miniState === 3 && $token->value === 'KEY') {
+ } elseif ($miniState === 3 && $token->keyword === 'KEY') {
++$miniState;
- } elseif ($miniState === 4 && $token->value === 'UPDATE') {
+ } elseif ($miniState === 4 && $token->keyword === 'UPDATE') {
++$miniState;
}
diff --git a/src/Statements/RenameStatement.php b/src/Statements/RenameStatement.php
index 7e47fbd..22c056e 100644
--- a/src/Statements/RenameStatement.php
+++ b/src/Statements/RenameStatement.php
@@ -42,7 +42,7 @@ class RenameStatement extends Statement
*/
public function before(Parser $parser, TokensList $list, Token $token)
{
- if (($token->type === Token::TYPE_KEYWORD) && ($token->value === 'RENAME')) {
+ if (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'RENAME')) {
// Checking if it is the beginning of the query.
$list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');
}
diff --git a/src/Statements/ReplaceStatement.php b/src/Statements/ReplaceStatement.php
index 4577b31..3fa675a 100644
--- a/src/Statements/ReplaceStatement.php
+++ b/src/Statements/ReplaceStatement.php
@@ -150,7 +150,7 @@ class ReplaceStatement extends Statement
if ($state === 0) {
if ($token->type === Token::TYPE_KEYWORD
- && $token->value !== 'INTO'
+ && $token->keyword !== 'INTO'
) {
$parser->error('Unexpected keyword.', $token);
break;
@@ -166,17 +166,17 @@ class ReplaceStatement extends Statement
$state = 1;
} elseif ($state === 1) {
if ($token->type === Token::TYPE_KEYWORD) {
- if ($token->value === 'VALUE'
- || $token->value === 'VALUES'
+ if ($token->keyword === 'VALUE'
+ || $token->keyword === 'VALUES'
) {
++$list->idx; // skip VALUES
$this->values = Array2d::parse($parser, $list);
- } elseif ($token->value === 'SET') {
+ } elseif ($token->keyword === 'SET') {
++$list->idx; // skip SET
$this->set = SetOperation::parse($parser, $list);
- } elseif ($token->value === 'SELECT') {
+ } elseif ($token->keyword === 'SELECT') {
$this->select = new SelectStatement($parser, $list);
} else {
$parser->error(
diff --git a/src/Utils/Formatter.php b/src/Utils/Formatter.php
index 4e0fd0e..eb511e6 100644
--- a/src/Utils/Formatter.php
+++ b/src/Utils/Formatter.php
@@ -387,11 +387,11 @@ class Formatter
}
// Indenting BEGIN ... END blocks.
- if ($prev->type === Token::TYPE_KEYWORD && $prev->value === 'BEGIN') {
+ if ($prev->type === Token::TYPE_KEYWORD && $prev->keyword === 'BEGIN') {
$lineEnded = true;
array_push($blocksIndentation, $indent);
++$indent;
- } elseif ($curr->type === Token::TYPE_KEYWORD && $curr->value === 'END') {
+ } elseif ($curr->type === Token::TYPE_KEYWORD && $curr->keyword === 'END') {
$lineEnded = true;
$indent = array_pop($blocksIndentation);
}
@@ -449,7 +449,7 @@ class Formatter
// Also, some tokens do not have spaces before or after them.
if (
// A space after delimiters that are longer than 2 characters.
- $prev->value === 'DELIMITER'
+ $prev->keyword === 'DELIMITER'
|| !(
($prev->type === Token::TYPE_OPERATOR && ($prev->value === '.' || $prev->value === '('))
// No space after . (
@@ -604,12 +604,12 @@ class Formatter
public static function isClause($token)
{
if (
- ($token->type === Token::TYPE_KEYWORD && isset(Parser::$STATEMENT_PARSERS[$token->value]))
+ ($token->type === Token::TYPE_KEYWORD && isset(Parser::$STATEMENT_PARSERS[$token->keyword]))
|| ($token->type === Token::TYPE_NONE && strtoupper($token->token) === 'DELIMITER')
) {
return 2;
} elseif (
- $token->type === Token::TYPE_KEYWORD && isset(Parser::$KEYWORD_PARSERS[$token->value])
+ $token->type === Token::TYPE_KEYWORD && isset(Parser::$KEYWORD_PARSERS[$token->keyword])
) {
return 1;
}
diff --git a/src/Utils/Query.php b/src/Utils/Query.php
index 32bc96d..6d1aa87 100644
--- a/src/Utils/Query.php
+++ b/src/Utils/Query.php
@@ -553,7 +553,7 @@ class Query
*
* @var string
*/
- $clauseType = $lexer->list->getNextOfType(Token::TYPE_KEYWORD)->value;
+ $clauseType = $lexer->list->getNextOfType(Token::TYPE_KEYWORD)->keyword;
/**
* The index of this clause.
@@ -605,10 +605,10 @@ class Query
if ($brackets == 0) {
// Checking if the section was changed.
if (($token->type === Token::TYPE_KEYWORD)
- && (isset($clauses[$token->value]))
- && ($clauses[$token->value] >= $currIdx)
+ && (isset($clauses[$token->keyword]))
+ && ($clauses[$token->keyword] >= $currIdx)
) {
- $currIdx = $clauses[$token->value];
+ $currIdx = $clauses[$token->keyword];
if (($skipFirst) && ($currIdx == $clauseIdx)) {
// This token is skipped (not added to the old
// clause) because it will be replaced.
@@ -821,11 +821,11 @@ class Query
if ($brackets == 0) {
if (($token->type === Token::TYPE_KEYWORD)
- && (isset($clauses[$token->value]))
- && ($clause === $token->value)
+ && (isset($clauses[$token->keyword]))
+ && ($clause === $token->keyword)
) {
return $i;
- } elseif ($token->value === 'UNION') {
+ } elseif ($token->keyword === 'UNION') {
return -1;
}
}
generated by cgit v1.1 at 2025-05-17 19:20:31 +0000