Changeset 8370

Timestamp:

04/09/08 12:10:14 (6 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Fixed _and() and _or() so that they give expected results, rather than the buggy results of Propel s addAnd() and addOr() (based on a patch from jug) (refs #3287)

Files:

• plugins/sfPropelFinderPlugin/README (modified) (3 diffs)
• plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php (modified) (12 diffs)
• plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php (modified) (2 diffs)

plugins/sfPropelFinderPlugin/README

@@ -226 +226 @@
-}}}
-
-after executing a termination method (`find()`, `findOne()`, `findPk()`, `count()`, `delete()`)
+before executing a termination method by calling `getCriteria()->toString()`, or after executing a termination method
-
-{{{
@@ -232 +232 @@
-<?php
-$finder = sfPropelFinder::from('Article')->where('Title', 'foo');
+echo $finder->getCriteria()->toString();
+// SELECT FROM article WHERE article.TITLE=?
-$finder->findOne();
-$query =
+echo
-// 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID FROM article WHERE article.TITLE=\'foo\' LIMIT 1'
-}}}
@@ -244 +246 @@
-
-== Changelog ==
+
+=== 2008-04-08 | Trunk ===
+
+ * francois: Added support for magic `andXXX()` and `orXXX()` methods.
+ * jug: Fixed `_and()` and `_or()` so that they give expected results, rather than the buggy results of Propel's `addAnd()` and `addOr()`
-
-=== 2008-03-31 | 0.2.0 Beta ===

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -17 +17 @@
-  protected $relations = null;
-  protected $latestQuery = '';
-
+
+
-  public function __construct($class = '')
-  {
@@ -47 +48 @@
-    $this->relations[]= $peerClass;
-    $this->peerClass = $peerClass;
+    
-    return $this;
-  }
@@ -52 +54 @@
-  public function getCriteria()
-  {
-criteria
+buildCriteria()
-  }
-  
@@ -58 +60 @@
-  {
-    $this->criteria = $criteria;
+    $this->criterions = array();
+    
-    return $this;
-  }
-
-  public function reinitCriteria()
-
-
-
+
+
-  }
-  
@@ -103 +106 @@
-  public function count($con = null, $reinitCriteria = true)
-  {
-criteria
+getCriteria()
-    $this->updateLatestQuery();
-    if($reinitCriteria)
@@ -119 +122 @@
-      $this->criteria->setLimit($limit);
-    }
-criteria
+getCriteria()
-    $this->updateLatestQuery();
-    if($reinitCriteria)
@@ -131 +134 @@
-  public function findOne($con = null, $reinitCriteria = true)
-  {
-criteria
+getCriteria()
-    $this->updateLatestQuery();
-    if($reinitCriteria)
@@ -158 +161 @@
-  public function delete($con = null, $reinitCriteria = true)
-  {
-clone $this->criteria
+$this->getCriteria()
-    if($deleteCriteria->equals(new Criteria()))
-    {
@@ -214 +217 @@
-    } 
-    list($value, $comparison) = $this->getValueAndComparisonFromArguments($arguments);
-
+
+
-    
-    return $this;
@@ -240 +244 @@
-    } 
-    list($value, $comparison) = $this->getValueAndComparisonFromArguments($arguments);
-
+
+
-    
-    return $this;
@@ -266 +271 @@
-    } 
-    list($value, $comparison) = $this->getValueAndComparisonFromArguments($arguments);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  
@@ -453 +495 @@
-      return $this->_and(substr($name, 4), $arguments);
-    }
+    if(strpos($name, 'and') === 0)
+    {
+      return $this->_and(substr($name, 3), $arguments);
+    }
-    if(strpos($name, '_or') === 0)
-    {
-      return $this->_or(substr($name, 3), $arguments);
+    }
+    if(strpos($name, 'or') === 0)
+    {
+      return $this->_or(substr($name, 2), $arguments);
-    }
-    if(method_exists($this->criteria, $name))

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php

@@ -63 +63 @@
-ArticlePeer::doDeleteAll();
-
-0
+7
-
-$t->diag('find()');
@@ -283 +283 @@
-$t->is(count($articles), 2, 'whereXXX() accepts a comparator as first argument when two arguments are given');
-
+$t->diag('_and() and _or()');
+
+$columns    = "article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID";
+$baseSelect = "SELECT $columns FROM article WHERE ";
+
+$finder = sfPropelFinder::from('Article')->whereTitle('foo')->_orTitle('bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(article.TITLE='foo' OR article.TITLE='bar')",
+  '_or() adds a SQL OR clause when called on a column where there is already a condition'
+);
+
+$finder = sfPropelFinder::from('Article')->whereTitle('foo')->_orCategoryId(1);
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(article.TITLE='foo' OR article.CATEGORY_ID=1)",
+  '_or() adds a SQL OR clause when called on a column where there is no condition yet'
+);
+
+$finder = sfPropelFinder::from('Article')->whereTitle('foo')->_andTitle('bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(article.TITLE='foo' AND article.TITLE='bar')",
+  '_and() adds a SQL AND clause when called on a column where there is already a condition'
+);
+
+$finder = sfPropelFinder::from('Article')->whereTitle('foo')->_andCategoryId(1);
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(article.TITLE='foo' AND article.CATEGORY_ID=1)",
+  '_and() adds a SQL AND clause when called on a column where there is no condition yet'
+);
+
+$finder = sfPropelFinder::from('Article')->whereCategoryId(1)->_andTitle('foo')->_orTitle('bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(article.CATEGORY_ID=1 AND (article.TITLE='foo' OR article.TITLE='bar'))",
+  '_and() and _or() can be combined on the same finder'
+);
+
+$finder = sfPropelFinder::from('Article')->joinCategory()->where('Category_Name', 'foo')->_or('Category_Name', 'bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  "SELECT $columns FROM article, category WHERE (category.NAME='foo' OR category.NAME='bar') AND article.CATEGORY_ID=category.ID",
+  '_or() works on a simple jointure'
+);
+
+$finder = sfPropelFinder::from('Comment')
+  ->joinArticle()
+  ->joinAuthor()
+  ->where('Article_Title', 'foo')
+  ->_or('Author_Name', 'bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  "SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID FROM comment, article, author WHERE (article.TITLE='foo' OR author.NAME='bar') AND comment.ARTICLE_ID=article.ID AND comment.AUTHOR_ID=author.ID",
+  '_or() works on a multiple jointure'
+);
-
-$t->diag('orderBy()');