Skip to content

Commit 7ae28f9

Browse files
committed
fix bug introduced in 415d775
1 parent 04ace24 commit 7ae28f9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ protected function parseEquiJoin()
259259
protected function parseSameNodeJoinCondition()
260260
{
261261
$this->scanner->expectTokens(array('ISSAMENODE', '('));
262-
$selector1 = $this->parseSelector();
262+
$selector1 = $this->fetchTokenWithoutBrackets();
263263
$this->scanner->expectToken(',');
264-
$selector2 = $this->parseSelector();
264+
$selector2 = $this->fetchTokenWithoutBrackets();
265265

266266
$token = $this->scanner->lookupNextToken();
267267
if ($this->scanner->tokenIs($token, ',')) {
@@ -285,9 +285,9 @@ protected function parseSameNodeJoinCondition()
285285
protected function parseChildNodeJoinCondition()
286286
{
287287
$this->scanner->expectTokens(array('ISCHILDNODE', '('));
288-
$child = $this->parseSelector();
288+
$child = $this->fetchTokenWithoutBrackets();
289289
$this->scanner->expectToken(',');
290-
$parent = $this->parseSelector();
290+
$parent = $this->fetchTokenWithoutBrackets();
291291
$this->scanner->expectToken(')');
292292

293293
return $this->factory->childNodeJoinCondition($child, $parent);
@@ -302,9 +302,9 @@ protected function parseChildNodeJoinCondition()
302302
protected function parseDescendantNodeJoinCondition()
303303
{
304304
$this->scanner->expectTokens(array('ISDESCENDANTNODE', '('));
305-
$child = $this->parseSelector();
305+
$child = $this->fetchTokenWithoutBrackets();
306306
$this->scanner->expectToken(',');
307-
$parent = $this->parseSelector();
307+
$parent = $this->fetchTokenWithoutBrackets();
308308
$this->scanner->expectToken(')');
309309

310310
return $this->factory->descendantNodeJoinCondition($child, $parent);

0 commit comments

Comments
 (0)