diff options
| author | Dan Ungureanu <udan1107@gmail.com> | 2016-02-21 18:40:46 +0200 |
|---|---|---|
| committer | Dan Ungureanu <udan1107@gmail.com> | 2016-02-21 18:40:46 +0200 |
| commit | d5b38952c4d0c235fd95d40251baad4c66ab7195 (patch) | |
| tree | 54701237b466525e758ed506d24cb84bcb6dbb34 | |
| parent | d716a47aaa73081d4801aa1ae3b8a3af8ed09064 (diff) | |
| download | sql-parser-d5b38952c4d0c235fd95d40251baad4c66ab7195.zip sql-parser-d5b38952c4d0c235fd95d40251baad4c66ab7195.tar.gz sql-parser-d5b38952c4d0c235fd95d40251baad4c66ab7195.tar.bz2 | |
Expression: Improved error messages related to aliases.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
| -rw-r--r-- | src/Components/Expression.php | 4 | ||||
| -rw-r--r-- | tests/Components/ExpressionTest.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Components/Expression.php b/src/Components/Expression.php index f6d3895..0b9f215 100644 --- a/src/Components/Expression.php +++ b/src/Components/Expression.php @@ -243,9 +243,9 @@ class Expression extends Component if (!empty($options['breakOnAlias'])) { break; } - if (!empty($ret->alias)) { + if ($alias) { $parser->error( - __('An alias was previously found.'), + __('An alias was expected.'), $token ); break; diff --git a/tests/Components/ExpressionTest.php b/tests/Components/ExpressionTest.php index d29214c..9bacf9b 100644 --- a/tests/Components/ExpressionTest.php +++ b/tests/Components/ExpressionTest.php @@ -46,8 +46,8 @@ class ExpressionTest extends TestCase 'Unexpected dot.', ), array( - 'id AS id2 AS id3', - 'An alias was previously found.', + 'id AS AS id2', + 'An alias was expected.', ), array( 'id`id2`\'id3\'', |