Skip to content

Commit 8d86e0c

Browse files
authored
Merge pull request #32 from thecodingmachine/bugfix/empty_parenthesis
Fixing bug with magic parameters and expression with parenthesis
2 parents 195a1bf + 7eaaf25 commit 8d86e0c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/SQLParser/Node/Expression.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
182182
{
183183
$sql = NodeFactory::toSql($this->subTree, $dbConnection, $parameters, ' ', false, $indent, $conditionsMode);
184184

185+
if ($sql === null) {
186+
return null;
187+
}
188+
185189
if ($this->alias) {
186190
$sql .= ' AS '.$this->alias;
187191
}
@@ -192,6 +196,7 @@ public function toSql(array $parameters = array(), Connection $dbConnection = nu
192196
$sql = '('.$sql.')';
193197
}
194198

199+
195200
return $sql;
196201
}
197202

tests/Mouf/Database/MagicQueryTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ public function testStandardSelect()
123123

124124
$sql = 'SELECT * FROM users GROUP BY id, login';
125125
$this->assertEquals('SELECT * FROM users GROUP BY id, login', self::simplifySql($magicQuery->build($sql)));
126+
127+
$sql = 'SELECT * FROM users WHERE (login LIKE :login)';
128+
$this->assertEquals('SELECT * FROM users', self::simplifySql($magicQuery->build($sql)));
126129
}
127130

128131
/**

0 commit comments

Comments
 (0)