Skip to content

Commit d6450f3

Browse files
committed
Improving unit tests, moving setter into constructor
1 parent 6ac705c commit d6450f3

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

src/Mouf/Database/MagicQuery.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ private function magicJoin(NodeInterface $select) {
153153
*/
154154
private function magicJoinOnOneQuery(MagicJoinSelect $magicJoinSelect) {
155155
$tableSearchNodeTraverser = new NodeTraverser();
156-
$detectTableVisitor = new DetectTablesVisitor();
157-
$detectTableVisitor->setDefaultTable($magicJoinSelect->getMainTable());
156+
$detectTableVisitor = new DetectTablesVisitor($magicJoinSelect->getMainTable());
158157
$tableSearchNodeTraverser->addVisitor($detectTableVisitor);
159158

160159
$select = $magicJoinSelect->getSelect();

src/SQLParser/Node/Traverser/DetectTablesVisitor.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ public function resetVisitor() {
2929
}
3030

3131
/**
32-
* Sets the default table that will be used if no table is specified.
33-
*
34-
* @param string $defaultTable
32+
* @param string $defaultTable Sets the default table that will be used if no table is specified in a colref.
3533
*/
36-
public function setDefaultTable($defaultTable)
34+
public function __construct($defaultTable)
3735
{
3836
$this->defaultTable = $defaultTable;
3937
}

tests/SQLParser/Node/Traverser/DetectTableVisitorTest.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class DetectTableVisitorTest extends \PHPUnit_Framework_TestCase
88
{
99
public function testStandardSelect()
1010
{
11-
$visitor = new DetectTablesVisitor();
11+
$visitor = new DetectTablesVisitor('users');
1212
$nodeTraverser = new NodeTraverser();
1313
$nodeTraverser->addVisitor($visitor);
1414

@@ -38,7 +38,7 @@ public function testStandardSelect()
3838

3939
public function testWrappedSelect()
4040
{
41-
$visitor = new DetectTablesVisitor();
41+
$visitor = new DetectTablesVisitor('users');
4242
$nodeTraverser = new NodeTraverser();
4343
$nodeTraverser->addVisitor($visitor);
4444

@@ -59,8 +59,7 @@ public function testWrappedSelect()
5959

6060
public function testMissingRefTable()
6161
{
62-
$visitor = new DetectTablesVisitor();
63-
$visitor->setDefaultTable('yop');
62+
$visitor = new DetectTablesVisitor('yop');
6463
$nodeTraverser = new NodeTraverser();
6564
$nodeTraverser->addVisitor($visitor);
6665

@@ -71,6 +70,6 @@ public function testMissingRefTable()
7170
$select = StatementFactory::toObject($parsed);
7271
$nodeTraverser->walk($select);
7372

74-
// TODO check that tata is scoped in yop
73+
$this->assertEquals("yop", $select->getWhere()->getLeftOperand()->getTable());
7574
}
7675
}

0 commit comments

Comments
 (0)