Merge pull request #9 from moufmouf/nomoremissingrefexception

Now, MagicQuery will assume that we are asking for the main table if no table name is passed.

Author: moufmouf

src/Mouf/Database/MagicQuery.php

@@ -153,7 +153,7 @@ private function magicJoin(NodeInterface $select) {
      */
     private function magicJoinOnOneQuery(MagicJoinSelect $magicJoinSelect) {
         $tableSearchNodeTraverser = new NodeTraverser();
-        $detectTableVisitor = new DetectTablesVisitor();
+        $detectTableVisitor = new DetectTablesVisitor($magicJoinSelect->getMainTable());
         $tableSearchNodeTraverser->addVisitor($detectTableVisitor);
 
         $select = $magicJoinSelect->getSelect();

src/SQLParser/Node/Traverser/DetectTablesVisitor.php

@@ -8,7 +8,7 @@
 
 /**
  * This visitor is in charge of detecting references to tables in columns.
- * It will throw an exception if a column does not specify a table name.
+ * Also, it will modify all references to tables that have no table specified by adding the $defaultTable
  */
 class DetectTablesVisitor implements VisitorInterface
 {
@@ -17,6 +17,8 @@ class DetectTablesVisitor implements VisitorInterface
 
     private $tables = array();
 
+    private $defaultTable;
+
     /**
      * Removes all detected magic join selects.
      * Useful for reusing the visitor instance on another node traversal.
@@ -26,6 +28,16 @@ public function resetVisitor() {
         $this->isSelectVisited = false;
     }
 
+    /**
+     * @param string $defaultTable Sets the default table that will be used if no table is specified in a colref.
+     */
+    public function __construct($defaultTable)
+    {
+        $this->defaultTable = $defaultTable;
+    }
+
+
+
     /**
      * Return the list of tables referenced in the Select.
      * @return string[] The key and the value are the table name.
@@ -54,9 +66,7 @@ public function enterNode(NodeInterface $node)
             }
         } elseif ($node instanceof ColRef) {
             if (empty($node->getTable())) {
-                $e = new MissingTableRefException("All column references should be in the form 'table.column'. Table part is missing for column '".$node->getColumn()."'");
-                $e->setMissingTableColRef($node);
-                throw $e;
+                $node->setTable($this->defaultTable);
             }
             $this->tables[$node->getTable()] = $node->getTable();
         }

src/SQLParser/Node/Traverser/MissingTableRefException.php

@@ -8,7 +8,7 @@ class DetectTableVisitorTest extends \PHPUnit_Framework_TestCase
 {
     public function testStandardSelect()
     {
-        $visitor = new DetectTablesVisitor();
+        $visitor = new DetectTablesVisitor('users');
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor($visitor);
 
@@ -38,7 +38,7 @@ public function testStandardSelect()
 
     public function testWrappedSelect()
     {
-        $visitor = new DetectTablesVisitor();
+        $visitor = new DetectTablesVisitor('users');
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor($visitor);
 
@@ -56,12 +56,10 @@ public function testWrappedSelect()
         $visitor->resetVisitor();
     }
 
-    /**
-     * @expectedException \SQLParser\Node\Traverser\MissingTableRefException
-     */
-    public function testMissingTableException()
+
+    public function testMissingRefTable()
     {
-        $visitor = new DetectTablesVisitor();
+        $visitor = new DetectTablesVisitor('yop');
         $nodeTraverser = new NodeTraverser();
         $nodeTraverser->addVisitor($visitor);
 
@@ -71,5 +69,7 @@ public function testMissingTableException()
         $parsed = $parser->parse($sql);
         $select = StatementFactory::toObject($parsed);
         $nodeTraverser->walk($select);
+
+        $this->assertEquals("yop", $select->getWhere()->getLeftOperand()->getTable());
     }
 }