Changeset 10664

Timestamp:

08/05/08 14:54:54 (4 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Fixed issue when calling several termination methods on a finder (patch from mrhyde) (closes #4133)

Files:

• plugins/sfPropelFinderPlugin/README (modified) (1 diff)
• plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php (modified) (1 diff)
• plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderPagerTest.php (modified) (2 diffs)

plugins/sfPropelFinderPlugin/README

@@ -612 +612 @@
-== Changelog ==
-
-
-
+
+
+
- * francois: Implemented `sfDoctrineFinder::count()`
- * francois: [BC Break] Replaced `sfPropelFinder::setPeerClass()` by `sfPropelFinder::setClass()` (will break classes extending sfPropelFinder)

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -798 +798 @@
-    $criteria = clone $this->criteria;
-    $criterions = $this->criterions;
-
+
+
+
+
+
+
-    while ($criterion = array_pop($criterions))
-    {

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderPagerTest.php

@@ -51 +51 @@
-ArticlePeer::doDeleteAll();
-
-0
+1
-
-$article1 = new Article();
@@ -152 +152 @@
-  $t->fail('Children of sfPropelFinder can use paginate()');
-}
+
+$t->diag('sfPropelFinderPager issues with repeated criterions');
+
+$finder = sfPropelFinder::from('Article')->
+  where('Title', 'foo')->
+  where('CategoryId', 1);
+$pager = $finder->paginate(2, 1);
+$results = $pager->getResults();
+$t->is(
+  $finder->getLatestQuery(),
+  "SELECT article.ID, article.TITLE, article.CATEGORY_ID FROM article WHERE (article.TITLE='foo' AND article.CATEGORY_ID=1) LIMIT 1",
+  'getResults() does not repeat conditions'
+);