Changeset 491

Timestamp:

15.11.2006 19:27:13 (4 years ago)

Author:

hans

Message:

• ticket:280 - Added object pool registration in the save() method
• Updated tests for instance pool to reflect new behavior
• Added tests for inheritance

Location:

branches/1.3/generator

Files:

• classes/propel/engine/builder/om/php5/PHP5BasicObjectBuilder.php (modified) (1 diff)
• classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php (modified) (2 diffs)
• classes/propel/engine/builder/om/php5/PHP5ComplexObjectBuilder.php (modified) (1 diff)
• projects/bookstore/schema.xml (modified) (5 diffs)
• test/classes/bookstore/BookstoreDataPopulator.php (modified) (5 diffs)
• test/classes/propel/GeneratedPeerTest.php (modified) (1 diff)

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5BasicObjectBuilder.php

@@ -981 +981 @@
                                         \$affectedRows += ".$this->getPeerClassname()."::doUpdate(\$this, \$con);
                         }
-                                \$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                        \$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                        ".$this->getPeerClassname()."::addInstanceToPool(\$this);
                 } // if \$this->isModified()
 

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5BasicPeerBuilder.php

@@ -619 +619 @@
         public static function addInstanceToPool(".$this->getObjectClassname()." \$obj)
         {
-                // print \"+Adding (by rel) \" . get_class(\$obj) . \" \" . var_export(\$obj->getPrimaryKey(),true) . \" to instance pool.\\n\";
+                // print \"+Adding (by addInstanceToPool()) \" . get_class(\$obj) . \" \" . var_export(\$obj->getPrimaryKey(),true) . \" to instance pool.\\n\";
         ";
                 $pk = $this->getTable()->getPrimaryKey();
-                if ($pk > 0) {
+                if (count($pk) > 1) {
                         $script .= "
                 \$key = serialize(\$obj->getPrimaryKey());";
@@ -740 +740 @@
         {
                 if (isset(self::\$instances[\$key])) {
-                        //print \"  <--Found ".$this->getObjectClassname()." \" . self::\$instances[\$key] . \" in instance pool.\\n\";
+                        //print \"  <-Found ".$this->getObjectClassname()." \" . self::\$instances[\$key] . \" in instance pool.\\n\";
                         return self::\$instances[\$key];
                 } else {

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5ComplexObjectBuilder.php

@@ -1023 +1023 @@
                         \$affectedRows = \$this->doSave(\$con);
                         \$con->commit();
+                        ".$this->getPeerClassname()."::addInstanceToPool(\$this);
                         return \$affectedRows;
                 } catch (PropelException \$e) {

branches/1.3/generator/projects/bookstore/schema.xml

@@ -22 +22 @@
       phpName="ISBN"
       description="ISBN Number"/>
+    <column
+      name="price"
+      required="false"
+      type="FLOAT"
+      description="Price of the book."/>
     <column
       name="publisher_id"
@@ -257 +262 @@
   </table>
 
-  <!-- test self-referencing foreign keys -->
+  <!-- test self-referencing foreign keys and inheritance-->
   <table name="bookstore_employee" description="Hierarchical table to represent employees of a bookstore.">
     <column
@@ -265 +270 @@
           autoIncrement="true"
           description="Employee ID number"/>
+        <column name="class_key" type="INTEGER" required="true" default="0" inheritance="single">
+                <inheritance key="0" class="BookstoreEmployee"/>
+                <inheritance key="1" class="BookstoreManager" extends="BookstoreEmployee"/>
+                <inheritance key="2" class="BookstoreCashier" extends="BookstoreEmployee"/>
+        </column>
         <column
           name="name"
@@ -284 +294 @@
   </table>
 
-  <!-- test one-to-one server -->
+  <!-- Test one-to-one relationship -->
   <table name="bookstore_employee_account" description="A table that represents a bookstore employees login credentials.">
         <column
@@ -304 +314 @@
         </foreign-key>
   </table>
-
+  
 </database>

branches/1.3/generator/test/classes/bookstore/BookstoreDataPopulator.php

@@ -28 +28 @@
 require_once 'bookstore/BookListRel.php';
 require_once 'bookstore/BookstoreEmployee.php';
+require_once 'bookstore/BookstoreManager.php';
+require_once 'bookstore/BookstoreCashier.php';
 require_once 'bookstore/BookstoreEmployeeAccount.php';
 
@@ -122 +124 @@
                 $phoenix->setAuthor($rowling);
                 $phoenix->setPublisher($scholastic);
+                $phoenix->setPrice(10.99);
                 $phoenix->save();
                 $phoenix_id = $phoenix->getId();
@@ -131 +134 @@
                 $qs->setISBN("0380977427");
                 $qs->setTitle("Quicksilver");
+                $qs->setPrice(11.99);
                 $qs->setAuthor($stephenson);
                 $qs->setPublisher($morrow);
@@ -140 +144 @@
                 $dj->setISBN("0140422161");
                 $dj->setTitle("Don Juan");
+                $dj->setPrice(12.99);
                 $dj->setAuthor($byron);
                 $dj->setPublisher($penguin);
@@ -149 +154 @@
                 $td->setISBN("067972575X");
                 $td->setTitle("The Tin Drum");
+                $td->setPrice(13.99);
                 $td->setAuthor($grass);
                 $td->setPublisher($vintage);

branches/1.3/generator/test/classes/propel/GeneratedPeerTest.php

@@ -342 +342 @@
                         }
                 }
-
+                
+                
+                // 5) test creating a new object, saving it, and then retrieving that object (should all be same instance)
+                $b = new BookstoreEmployee();
+                $b->setName("Testing");
+                $b->setJobTitle("Testing");
+                $b->save();
+                
+                $empId = $b->getId();
+                
+                $this->assertSame($b, BookstoreEmployeePeer::retrieveByPK($empId), "Expected newly saved object to be same instance as pooled.");
+
+        }
+        
+        /**
+         * Test inheritance features.
+         */
+        public function testInheritance()
+        {
+                $manager = new BookstoreManager();
+                $manager->setName("Manager 1");
+                $manager->setJobTitle("Warehouse Manager");
+                $manager->save();
+                $managerId = $manager->getId();
+                
+                $employee = new BookstoreEmployee();
+                $employee->setName("Employee 1");
+                $employee->setJobTitle("Janitor");
+                $employee->setSupervisorId($managerId);
+                $employee->save();
+                $empId = $employee->getId();
+                
+                $cashier = new BookstoreCashier();
+                $cashier->setName("Cashier 1");
+                $cashier->setJobTitle("Cashier");
+                $cashier->save();
+                $cashierId = $cashier->getId();
+                
+                // 1) test the pooled instances'
+                $c = new Criteria();
+                $c->add(BookstoreEmployeePeer::ID, array($managerId, $empId, $cashierId), Criteria::IN);
+                $c->addAscendingOrderByColumn(BookstoreEmployeePeer::ID);
+                
+                $objects = BookstoreEmployeePeer::doSelect($c);
+                
+                $this->assertEquals(3, count($objects), "Expected 3 objects to be returned.");
+                
+                list($o1, $o2, $o3) = $objects;
+                        
+                $this->assertSame($o1, $manager);
+                $this->assertSame($o2, $employee);
+                $this->assertSame($o3, $cashier);
+                
+                // 2) test a forced reload from database
+                BookstoreEmployeePeer::clearInstancePool();
+                
+                list($o1,$o2,$o3) = BookstoreEmployeePeer::doSelect($c);
+                
+                $this->assertTrue($o1 instanceof BookstoreManager, "Expected BookstoreManager object, got " . get_class($o1));
+                $this->assertTrue($o2 instanceof BookstoreEmployee, "Expected BookstoreEmployee object, got " . get_class($o2));
+                $this->assertTrue($o3 instanceof BookstoreCashier, "Expected BookstoreCashier object, got " . get_class($o3));
+                
         }
 }