Doctrine

Timestamp:

04/26/08 14:46:57 (14 months ago)

Author:

romanb

Message:

Fixed #982.

Location:

branches/0.11

Files:

• lib/Doctrine/Connection.php (modified) (3 diffs)
• lib/Doctrine/Connection/UnitOfWork.php (modified) (1 diff)
• lib/Doctrine/Relation/LocalKey.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Connection.php

@@ -973 +973 @@
                 $stmt = $this->prepare($query);
                 $stmt->execute($params);
+
                 return $stmt;
             } else {
@@ -1007 +1008 @@
             if ( ! empty($params)) {
                 $stmt = $this->prepare($query);
-                //var_dump($params);
-                //echo $query."<br/>";
                 $stmt->execute($params);
 
@@ -1016 +1015 @@
 
                 $this->getAttribute(Doctrine::ATTR_LISTENER)->preExec($event);
-
                 if ( ! $event->skipOperation) {
                     $count = $this->dbh->exec($query);

branches/0.11/lib/Doctrine/Connection/UnitOfWork.php

@@ -596 +596 @@
                 throw new Doctrine_Connection_Exception("Couldn't get last insert identifier.");
             }
-
             $record->assignIdentifier($id);
         } else {

branches/0.11/lib/Doctrine/Relation/LocalKey.php

@@ -47 +47 @@
         $id = $record->get($localFieldName);
 
-        if (empty($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
+        if (is_null($id) || ! $this->definition['table']->getAttribute(Doctrine::ATTR_LOAD_REFERENCES)) {
             $related = $this->getTable()->create();
         } else {

branches/0.11/tests/run.php

@@ -63 +63 @@
 $tickets->addTestCase(new Doctrine_Ticket_950_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_894_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_982_TestCase());
 $test->addTestCase($tickets);