Changeset 1068 for trunk/generator/test/classes/propel/GeneratedPeerTest.php

Timestamp:

08/06/08 07:55:11 (2 months ago)

Author:

ron

Message:

Merge in changes from 1.3 branch: merge -r 832:1067

Files:

• trunk/generator (modified) (1 prop)
• trunk/generator/test/classes/propel/GeneratedPeerTest.php (modified) (16 diffs)

trunk/generator/test/classes/propel/GeneratedPeerTest.php

@@ -41 +41 @@
-         * Test ability to delete multiple rows via single Criteria object.
-         */
-3
+
-
-                $selc = new Criteria();
@@ -90 +90 @@
-         * Test that cascading deletes are happening correctly (whether emulated or native).
-         */
-
+
+
-
-                // The 'media' table will cascade from book deletes
@@ -96 +97 @@
-                // 1) Assert the row exists right now
-
-       
-       
-       
-       
+
+
+
+
-
-                // 2) Delete the owning book
-
-       
-       
+
+
-
-                // 3) Assert that the media row is now also gone
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        }
@@ -121 +189 @@
-
-                // 1) Get an arbitrary book
-
-
-
-
-
-
+
+
+
+
+
-
-                // 2) Delete the author for that book
-       
+
-
-                // 3) Assert that the book.author_id column is now NULL
-
-       
-       
+
+
-
-        }
@@ -144 +211 @@
-
-                // 1) get an arbitrary book
-       
-       
+
+
-
-                // 2) now delete that book
-       
+
-
-                // 3) now make sure it's gone
-       
-       
+
+
-
-        }
@@ -162 +229 @@
-
-                // 1) get an arbitrary book
-       
-       
+
+
-
-                // 2) now delete that book
-       
+
-
-                // 3) now make sure it's gone
-       
-       
-
-       
+
+
+
+
-
-
@@ -220 +287 @@
-
-                $values = new Criteria();
-                $values->add(PublisherPeer::ID, 1);
-                $values->add(PublisherPeer::NAME, $name);
-                PublisherPeer::doInsert($values);
@@ -456 +522 @@
-
-        /**
+         * Tests the doCount() method with limit/offset.
+         */
+        public function testDoCountLimitOffset()
+        {
+                BookPeer::doDeleteAll();
+
+                for ($i=0; $i < 25; $i++) {
+                        $b = new Book();
+                        $b->setTitle("Book $i");
+                        $b->setISBN("ISBN $i");
+                        $b->save();
+                }
+
+                $c = new Criteria();
+                $totalCount = BookPeer::doCount($c);
+
+                $this->assertEquals(25, $totalCount);
+
+                $c2 = new Criteria();
+                $c2->setLimit(10);
+                $this->assertEquals(10, BookPeer::doCount($c2));
+
+                $c3 = new Criteria();
+                $c3->setOffset(10);
+                $this->assertEquals(15, BookPeer::doCount($c3));
+
+                $c4 = new Criteria();
+                $c4->setOffset(5);
+                $c4->setLimit(5);
+                $this->assertEquals(5, BookPeer::doCount($c4));
+
+                $c5 = new Criteria();
+                $c5->setOffset(20);
+                $c5->setLimit(10);
+                $this->assertEquals(5, BookPeer::doCount($c5));
+        }
+
+        /**
+         * Test doCountJoin*() methods.
+         */
+        public function testDoCountJoin()
+        {
+                BookPeer::doDeleteAll();
+
+                for ($i=0; $i < 25; $i++) {
+                        $b = new Book();
+                        $b->setTitle("Book $i");
+                        $b->setISBN("ISBN $i");
+                        $b->save();
+                }
+
+                $c = new Criteria();
+                $totalCount = BookPeer::doCount($c);
+
+                $this->assertEquals($totalCount, BookPeer::doCountJoinAuthor($c));
+                $this->assertEquals($totalCount, BookPeer::doCountJoinPublisher($c));
+        }
+
+        /**
-         * Test passing null values to removeInstanceFromPool().
-         */
@@ -467 +592 @@
-                }
-        }
-
+
-        /**
-         * @see        testDoDeleteCompositePK()
@@ -486 +611 @@
-                }
-        }
-
+
-        /**
-         * @see        testDoDeleteCompositePK()
@@ -505 +630 @@
-                }
-        }
-
+
-        /**
-         * @link       http://propel.phpdb.org/trac/ticket/519
@@ -512 +637 @@
-        {
-                $con = Propel::getConnection(BookPeer::DATABASE_NAME);
-
+
-                ReaderFavoritePeer::doDeleteAll();
-                // Create book and reader with ID 1
-                // Create book and reader with ID 2
-
+
-                $this->createBookWithId(1);
-                $this->createBookWithId(2);
-                $this->createReaderWithId(1);
-                $this->createReaderWithId(2);
-
-
-
+
+
+
+
+
+
+
+
-                                $rf = new ReaderFavorite();
-                                $rf->setBookId($i);
@@ -532 +662 @@
-
-                $this->assertEquals(4, ReaderFavoritePeer::doCount(new Criteria()));
-
- 
+
+
-                ReaderFavoritePeer::doDelete(array(array(1,1), array(2,2)));
-
+
-                $this->assertEquals(2, ReaderFavoritePeer::doCount(new Criteria()));
-
+
-                $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(2,1));
-                $this->assertNotNull(ReaderFavoritePeer::retrieveByPK(1,2));
@@ -543 +673 @@
-                $this->assertNull(ReaderFavoritePeer::retrieveByPK(2,2));
-        }
-
-
+
+
-        /**
-         * Test hydration of joined rows that contain lazy load columns.
@@ -559 +689 @@
-                $bemp2->setJobTitle("Clerk");
-                $bemp2->save();
-
+
-                $role = new AcctAccessRole();
-                $role->setName("Admin");
-
+
-                $bempacct = new BookstoreEmployeeAccount();
-                $bempacct->setBookstoreEmployee($bemp2);
@@ -569 +699 @@
-                $bempacct->setPassword("johnp4ss");
-                $bempacct->save();
-
+
-                $c = new Criteria();
-                $results = BookstoreEmployeeAccountPeer::doSelectJoinAll($c);
-                $o = $results[0];
-
+
-                $this->assertEquals('Admin', $o->getAcctAccessRole()->getName());
-        }
-
+        /**
+         * Testing foreign keys with multiple referrer columns.
+         * @link       http://propel.phpdb.org/trac/ticket/606
+         */
+        public function testMultiColFk()
+        {
+                $con = Propel::getConnection(BookPeer::DATABASE_NAME);
+
+                ReaderFavoritePeer::doDeleteAll();
+                
+                $b1 = new Book();
+                $b1->setTitle("Book1");
+                $b1->setISBN("ISBN-1");
+                $b1->save();
+                
+                $r1 = new BookReader();
+                $r1-> setName("Me");
+                $r1->save();
+                
+                $bo1 = new BookOpinion();
+                $bo1->setBookId($b1->getId());
+                $bo1->setReaderId($r1->getId());
+                $bo1->setRating(9);
+                $bo1->setRecommendToFriend(true);
+                $bo1->save();
+                
+                $rf1 = new ReaderFavorite();
+                $rf1->setReaderId($r1->getId());
+                $rf1->setBookId($b1->getId());
+                $rf1->save();
+                
+                $c = new Criteria(ReaderFavoritePeer::DATABASE_NAME);
+                $c->add(ReaderFavoritePeer::BOOK_ID, $b1->getId());
+                $c->add(ReaderFavoritePeer::READER_ID, $r1->getId());
+                
+                // This will produce an error!
+                $results = ReaderFavoritePeer::doSelectJoinBookOpinion($c);
+                $this->assertEquals(1, count($results), "Expected 1 result");
+        }
+        /**
+         * Testing foreign keys with multiple referrer columns.
+         * @link       http://propel.phpdb.org/trac/ticket/606
+         */
+        public function testMultiColJoin()
+        {
+                BookstoreContestPeer::doDeleteAll();
+                BookstoreContestEntryPeer::doDeleteAll();
+                
+                $bs = new Bookstore();
+                $bs->setStoreName("Test1");
+                $bs->setPopulationServed(5);
+                $bs->save();
+                $bs1Id = $bs->getId();
+                
+                $bs2 = new Bookstore();
+                $bs2->setStoreName("Test2");
+                $bs2->setPopulationServed(5);
+                $bs2->save();
+                $bs2Id = $bs2->getId();
+                
+                $ct1 = new Contest();
+                $ct1->setName("Contest1!");
+                $ct1->save();
+                $ct1Id = $ct1->getId();
+                
+                $ct2 = new Contest();
+                $ct2->setName("Contest2!");
+                $ct2->save();
+                $ct2Id = $ct2->getId();
+                
+                $cmr = new Customer();
+                $cmr->setName("Customer1");
+                $cmr->save();
+                $cmr1Id = $cmr->getId();
+
+                $cmr2 = new Customer();
+                $cmr2->setName("Customer2");
+                $cmr2->save();
+                $cmr2Id = $cmr2->getId();
+                
+                $contest = new BookstoreContest();
+                $contest->setBookstoreId($bs1Id);
+                $contest->setContestId($ct1Id);
+                $contest->save();
+                
+                $contest = new BookstoreContest();
+                $contest->setBookstoreId($bs2Id);
+                $contest->setContestId($ct1Id);
+                $contest->save();
+        
+                $entry = new BookstoreContestEntry();
+                $entry->setBookstoreId($bs1Id);
+                $entry->setContestId($ct1Id);
+                $entry->setCustomerId($cmr1Id);
+                $entry->save();
+                
+                $entry = new BookstoreContestEntry();
+                $entry->setBookstoreId($bs1Id);
+                $entry->setContestId($ct1Id);
+                $entry->setCustomerId($cmr2Id);
+                $entry->save();
+                
+                // Note: this test isn't really working very well.  We setup fkeys that
+                // require that the BookstoreContest rows exist and then try to violate
+                // the rules ... :-/  This may work in some lenient databases, but an error
+                // is expected here. 
+                
+                /*
+                 * Commented out for now ... though without it, this test may not really be testing anything
+                $entry = new BookstoreContestEntry();
+                $entry->setBookstoreId($bs1Id);
+                $entry->setContestId($ct2Id);
+                $entry->setCustomerId($cmr2Id);
+                $entry->save();
+                */
+                
+        
+                $c = new Criteria();
+                $c->addJoin(array(BookstoreContestEntryPeer::BOOKSTORE_ID, BookstoreContestEntryPeer::CONTEST_ID), array(BookstoreContestPeer::BOOKSTORE_ID, BookstoreContestPeer::CONTEST_ID) );
+
+                $results = BookstoreContestEntryPeer::doSelect($c);
+                $this->assertEquals(2, count($results) );
+                foreach ($results as $result) {
+                        $this->assertEquals($bs1Id, $result->getBookstoreId() );
+                        $this->assertEquals($ct1Id, $result->getContestId() );
+                }
+        }
+        
+        
+        /**
+         * Test doCountJoin*() methods with ORDER BY columns in Criteria.
+         * @link http://propel.phpdb.org/trac/ticket/627
+         */
+        public function testDoCountJoinWithOrderBy()
+        {
+                $c = new Criteria(BookPeer::DATABASE_NAME);
+                $c->addAscendingOrderByColumn(BookPeer::ID);
+                
+                // None of these should not throw an exception!
+                BookPeer::doCountJoinAll($c); 
+                BookPeer::doCountJoinAllExceptAuthor($c);
+                BookPeer::doCountJoinAuthor($c);
+        }
-}