Merge pull request #602 from MArcJ/fix-errorreporting

Fixed #601.
propelorm · Feb 14, 2013 · 661f895 · 661f895
2 parents dd9d189 + 01ea918
commit 661f895
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/runtime/lib/util/BasePeer.php b/runtime/lib/util/BasePeer.php
@@ -334,8 +334,8 @@ public static function doUpdate(Criteria $selectCriteria, Criteria $updateValues
 
         // Get list of required tables, containing all columns
         $tablesColumns = $selectCriteria->getTablesColumns();
-        if (empty($tablesColumns)) {
-            $tablesColumns = array($selectCriteria->getPrimaryTableName() => array());
+        if (empty($tablesColumns) && ($table = $selectCriteria->getPrimaryTableName())) {
+            $tablesColumns = array($table => array());
         }
 
         // we also need the columns for the update SQL

diff --git a/test/testsuite/generator/behavior/sortable/SortableBehaviorTest.php b/test/testsuite/generator/behavior/sortable/SortableBehaviorTest.php
@@ -47,13 +47,11 @@ public function setUp()
     /**
      * See: https://github.com/propelorm/Propel/issues/515
      *
-     * @expectedException PropelException
-     * @expectedExceptionMessage Unable to execute UPDATE statement [UPDATE  SET ] [wrapped: Undefined index: ]
      */
     public function testShiftRank()
     {
         $peer = new \Test\SortableTest1Peer();
-        $peer->shiftRank(1);
+        $peer->shiftRank(1); //should not throw any exception
     }
 
     public function testParameters()

diff --git a/test/testsuite/generator/reverse/pgsql/PgsqlSchemaParserTest.php b/test/testsuite/generator/reverse/pgsql/PgsqlSchemaParserTest.php
@@ -48,7 +48,9 @@ protected function setUp()
 
     protected function tearDown()
     {
-        $this->con->rollback();
+        if ($this->con) {
+            $this->con->rollback();
+        }
 
         parent::tearDown();
         Propel::init(dirname(__FILE__) . '/../../../../fixtures/bookstore/build/conf/bookstore-conf.php');