Changeset 10606

Timestamp:

08/02/08 00:16:44 (4 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Implemented sfDoctrineFinder::fromArray(), and sfDoctrineFinder::getLatestQuery()

Files:

• plugins/sfPropelFinderPlugin/README (modified) (1 diff)
• plugins/sfPropelFinderPlugin/lib/DbFinder.php (modified) (4 diffs)
• plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php (modified) (5 diffs)
• plugins/sfPropelFinderPlugin/lib/sfDoctrineFinderListener.php (added)
• plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php (modified) (3 diffs)

plugins/sfPropelFinderPlugin/README

@@ -611 +611 @@
-== Changelog ==
-
-
-
+
+
+
- * francois: Added `DbFinderAdminGenerator` (WIP)
- * francois: Fixed problem with `join()` and `with()` when called by children of `sfPropelPager`

plugins/sfPropelFinderPlugin/lib/DbFinder.php

@@ -34 +34 @@
-      return self::fromClass($from);
-    }
-
+ || $from instanceof Doctrine_Collection
-    {
-      return self::fromCollection($from);
@@ -117 +117 @@
-      else
-      {
-
+
+
+
+
+
+
-      }
-      
@@ -147 +152 @@
-      foreach ($tempObject->getTable()->getColumns() as $name => $column)
-      {
-$column->contains('primary'
+array_key_exists('primary', $column
-        {
-          if($pkName)
@@ -175 +180 @@
-  {
-    $finder = self::fromClass($class);
- in 
+in
-    
-    return $finder;

plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php

@@ -12 +12 @@
-class sfDoctrineFinder extends DbFinder
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-  public function __construct($class = '')
-  {
-    list($class, $alias) = $this->getClassAndAlias($class);
-    $this->query = Doctrine_Query::create()->from($class . ' ' . $alias);
-    if($class)
-    {
+      list($class, $alias) = $this->getClassAndAlias($class);
-      $this->setClass($class, $alias);
-
+
+
+
+
+
-    }
-  }
@@ -39 +43 @@
-    $this->addRelation($class, $alias);
-    $this->class = $class;
+    $this->object = new $class();
+    $this->query = Doctrine_Query::create()->from($class . ' ' . $alias);
+    $this->queryListener = sfDoctrineFinderListener::getInstance();
+    
-    
-    return $this;
@@ -56 +64 @@
-  public function getLatestQuery($con = null)
-  {
-throw new Exception('This method is not yet implemented'
+return $this->queryListener->getLatestQuery(
-  }
-  
@@ -189 +197 @@
-      if(is_array($pk))
-      {
-in
+ IN 
-        return $this->find();
-      }
@@ -302 +310 @@
-  protected function addCondition($column, $comparison, $value)
-  {
-in
+ IN 
-    {
-      $this->query->whereIn($column, $value);

plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php

@@ -18 +18 @@
-        title:       string(255)
-        category_id: integer
+      relations:
+        Category:
+          class:    DCategory
+          local:    category_id
+          type:     one
+          foreign:  id
+          foreignAlias: Articles
-    DArticleI18n:
-      columns:
@@ -64 +71 @@
-Doctrine_Query::create()->delete()->from('DArticle')->execute();
-
-36
+47
-
-$t->diag('find()');
@@ -252 +259 @@
-$articleI18n = sfDoctrineFinder::from('DArticleI18n')->findPk(array($articlei18n1->getId(), $articlei18n1->getCulture()));
-$t->is_deeply($articleI18n->toArray(), $articlei18n1->toArray(), 'findPk() retrieves objects with composite primary keys based on an array of Pks');
+
+$t->diag('Instanciation possibilities');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+
+$article1 = new DArticle();
+$article1->setTitle('foo');
+$article1->save();
+
+$article2 = new DArticle();
+$article2->setTitle('foo2');
+$article2->save();
+
+$article3 = new DArticle();
+$article3->setTitle('foo3');
+$article3->save();
+
+$finder = new sfDoctrineFinder('DArticle');
+$t->is($finder->getClass(), 'DArticle', 'Record Class can be set during instanciation, in which case the finder is automatically initialized');
+$articles = $finder->find();
+$article = $articles[0];
+$t->is($article->getTitle(), 'foo', 'A finder instanciated directly with a Record class returns the correct objects');
+
+$finder = new sfDoctrineFinder();
+$finder->setClass('DArticle');
+$t->is($finder->getClass(), 'DArticle', 'setClass() and getClass() are accesors to the protected $class property');
+$articles = $finder->find();
+$article = $articles[0];
+$t->is($article->getTitle(), 'foo', 'A finder can be instanciated without parameter, and initialized later after defining its class');
+
+$articles = sfDoctrineFinder::from('DArticle')->find();
+$t->is(count($articles), 3, 'from() allows direct chaining of conditions');
+
+class DArticleFinder extends sfDoctrineFinder
+{
+  protected $class = 'DArticle';
+}
+$finder = new DArticleFinder();
+$article = $finder->findOne();
+$t->isa_ok($article, 'DArticle', 'A finder extending sfDoctrineFinder can be used directly if defining the $class property');
+$finder = new DArticleFinder();
+$articles = $finder->find();
+$t->is(count($articles), 3, 'A finder extending sfDoctrineFinder can be used directly if defining the $class property');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+Doctrine_Query::create()->delete()->from('DCategory')->execute();
+$category1 = new DCategory();
+$category1->setName('cat1');
+$category1->save();
+$category2 = new DCategory();
+$category2->setName('cat2');
+$category2->save();
+$article1 = new DArticle();
+$article1->setTitle('aaaaa');
+$article1->setCategory($category1);
+$article1->save();
+$article2 = new DArticle();
+$article2->setTitle('bbbbb');
+$article2->setCategory($category1);
+$article2->save();
+$article3 = new DArticle();
+$article3->setTitle('ccccc');
+$article3->setCategory($category2);
+$article3->save();
+
+$finder = sfDoctrineFinder::from($category1->getArticles());
+$articles = $finder->find();
+$t->is(count($articles), 2, 'from() accepts an array of Doctrine objects');
+$t->isnt(
+  strpos($finder->getLatestQuery(), "WHERE d.id IN ("),
+  false,
+  'using from() with an array of Propel objects results in a IN'
+);
+$t->isa_ok($finder->findOne(), 'DArticle', 'using from() with an array of Doctrine objects returns some of these objects');
+$articles = sfDoctrineFinder::from($category1->getArticles())->where('Title', 'aaaaa')->find();
+$t->is(count($articles), 1, 'A finder initialized from an array accepts further conditions');