Fix tests

maghead · Apr 17, 2016 · 8ca4ea8 · 8ca4ea8
1 parent b77bd66
commit 8ca4ea8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/LazyRecord/BaseCollection.php b/src/LazyRecord/BaseCollection.php
@@ -303,15 +303,6 @@ public function fetch()
         $this->_lastSql = $sql = $this->getCurrentReadQuery()->toSql($driver, $arguments);
         $this->_vars = $vars = $arguments->toArray();
         $this->handle = $conn->prepareAndExecute($sql, $vars);
-        /*
-        } catch (Exception $e) {
-            return Result::failure('Collection fetch failed: ' . $e->getMessage() , array( 
-                'vars' => $vars,
-                'sql' => $sql,
-                'exception' => $e,
-            ));
-        }
-         */
         return Result::success('Updated', array( 'sql' => $sql ));
     }
 

diff --git a/tests/AuthorBooks/Tests/AuthorCollectionTest.php b/tests/AuthorBooks/Tests/AuthorCollectionTest.php
@@ -241,10 +241,10 @@ public function testCollection()
     public function testJoin()
     {
         $authors = new AuthorCollection;
-        $authors->join(new \AuthorBooks\Model\Address);
+        $authors->join(new \AuthorBooks\Model\Address, 'LEFT', 'a');
         $authors->fetch();
         $sql = $authors->toSQL();
-        like( '/addresses.address\s+AS\s+addresses_address/', $sql );
+        like('/LEFT JOIN addresses AS a ON \(m.id = a.author_id\)/', $sql);
     }
 
     public function testJoinWithAliasAndRelationId() {