summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Ungureanu <udan1107@gmail.com>2015-12-18 00:11:46 +0200
committerDan Ungureanu <udan1107@gmail.com>2015-12-18 00:24:12 +0200
commita1485ddeaea9f9ca6bfdb932c19db31f35541288 (patch)
treee62e89d64eedeb80fac3dfb8c486b4759419fd3e /src
parent8bbff36381ce22c4fd4cb90d56b517d5c1451a77 (diff)
downloadsql-parser-a1485ddeaea9f9ca6bfdb932c19db31f35541288.zip
sql-parser-a1485ddeaea9f9ca6bfdb932c19db31f35541288.tar.gz
sql-parser-a1485ddeaea9f9ca6bfdb932c19db31f35541288.tar.bz2
Updated PHPUnit to 5.1 and fixed some of the tests.
Diffstat (limited to 'src')
-rw-r--r--src/Components/SetOperation.php13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php
index d695fce..427f48d 100644
--- a/src/Components/SetOperation.php
+++ b/src/Components/SetOperation.php
@@ -85,10 +85,8 @@ class SetOperation extends Component
}
// No keyword is expected.
- if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED)) {
- if ($state == 0) {
- break;
- }
+ if (($token->type === Token::TYPE_KEYWORD) && ($token->flags & Token::FLAG_KEYWORD_RESERVED) && ($state == 0)) {
+ break;
}
if ($state === 0) {
@@ -117,13 +115,6 @@ class SetOperation extends Component
}
}
- // Last iteration was not saved.
- if (!empty($expr->column)) {
- $expr->column = trim($expr->column);
- $expr->value = trim($expr->value);
- $ret[] = $expr;
- }
-
--$list->idx;
return $ret;
}