Changeset 10341

Timestamp:

07/17/08 14:43:06 (4 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Implemented sfDoctrineFinder::findOne(), findFirst(), findLast() and orderBy()

Files:

• plugins/sfPropelFinderPlugin/README (modified) (1 diff)
• plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php (modified) (10 diffs)
• plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderInternalsTest.php (added)
• plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php (modified) (3 diffs)

plugins/sfPropelFinderPlugin/README

@@ -589 +589 @@
-== Changelog ==
-
-
-
+
+
+
- * francois: Initialized `DbFinder` and `sfDoctrineFinder` (WIP)
-

plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php

@@ -13 +13 @@
-{
-  protected $class = null;
+  protected $object = null;
-  protected $relations = null;
-  protected $latestQuery = '';
@@ -25 +26 @@
-    {
-      $this->class = $class;
+      $this->object = new $class();
-    }
-  }
@@ -30 +32 @@
-  public function getClass()
-  {
-peerC
+c
-  }
-
@@ -41 +43 @@
-  }
-  
+  public function getObject()
+  {
+    return $this->object;
+  }
+
-  public function getLatestQuery($con = null)
-  {
@@ -82 +89 @@
-  }
-  
+  /**
+   * Class initializer
+   *
+   * @param string $from Doctrine classname on which the search will be done
+   * @return sfDoctrineFinder a finder object
+   */
+  public static function fromClass($class)
+  {
+    $me = __CLASS__;
+    $finder = new $me($class);
+    
+    return $finder;
+  }
+  
+  
-  // Finder Executers
-  
@@ -91 +113 @@
-  public function find($limit = null, $con = null, $reinitCriteria = false)
-  {
+    if($limit)
+    {
+      $this->query->limit($limit);
+    }
-    return $this->query->execute();
-  }
@@ -96 +122 @@
-  public function findOne($con = null, $reinitCriteria = true)
-  {
-
+
+
+
-  }
-  
-  public function findLast($column = null, $con = null, $reinitCriteria = true)
-  {
-
+
+
+
+
+
+
+
+
+
+
-  }
-  
-  public function findFirst($column = null, $con = null, $reinitCriteria = true)
-  {
-
+
+
+
+
+
+
+
+
+
+
-  }
-  
@@ -259 +305 @@
-  }
-  
-
-
-
+
+
+
+
+
+
+
+
-    
-    return $this;
@@ -285 +336 @@
-  public function guessOrder($direction = 'desc')
-  {
-
+
+
+
+
+
+
+
+
+
-    
-    throw new Exception('Unable to figure out the column to use to order rows in sfPropelFinder::guessOrder()');
-  }
-  
+  protected static function camelize($arg)
+  {
+    if(is_array($arg))
+    {
+      $ret = array();
+      foreach ($arg as $arg1)
+      {
+        $ret []= self::camelize($arg1);
+      }
+      return $ret;
+    }
+    else
+    {
+      return sfInflector::camelize($arg);
+    }
+  }
+
+  protected static function underscore($arg)
+  {
+    if(is_array($arg))
+    {
+      $ret = array();
+      foreach ($arg as $arg1)
+      {
+        $ret []= self::underscore($arg1);
+      }
+      return $ret;
+    }
+    else
+    {
+      return sfInflector::underscore($arg);
+    }
+  }
+  
+  
-  /**
-   * Infers $column1, $column2 and $operator from $relatedClass and some optional arguments
@@ -328 +422 @@
-  }
-  
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  

plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php

@@ -13 +13 @@
-The tests expect a model similar to this one:
-
+    connection:    doctrine
-    DArticle:
-      columns:
@@ -63 +64 @@
-Doctrine_Query::create()->delete()->from('DArticle')->execute();
-
-
+1
-
-$t->diag('find()');
@@ -101 +102 @@
-$t->is($article->getTitle(), 'foo3', 'find() with no argument returns an array of all the records');
-
+$finder = new sfDoctrineFinder('DArticle');
+$articles = $finder->find(2);
+$t->is(count($articles), 2, 'find() with an argument returns a limited array of records');
+
+$t->diag('findOne()');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findOne();
+$t->is($article, null, 'findOne() returns null when no records match');
+
+$article1 = new DArticle();
+$article1->setTitle('foo');
+$article1->save();
+
+$article2 = new DArticle();
+$article2->setTitle('foo2');
+$article2->save();
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findOne();
+$t->isa_ok($article, 'DArticle', 'findOne() returns a single object');
+$t->is($article->getTitle(), 'foo', 'findOne() returns the first object matching the conditions');
+
+$t->diag('findLast() and findFirst()');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findFirst();
+$t->is($article, null, 'findFirst() returns null when no records match');
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findLast();
+$t->is($article, null, 'findLast() returns null when no records match');
+
+$article1 = new DArticle();
+$article1->setTitle('foo');
+$article1->save();
+
+$article2 = new DArticle();
+$article2->setTitle('foo2');
+$article2->save();
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findFirst();
+$t->isa_ok($article, 'DArticle', 'findFirst() returns a single object');
+$t->is($article->getTitle(), 'foo', 'findFirst() returns the last object matching the conditions');
+
+$finder = new sfDoctrineFinder('DArticle');
+$article = $finder->findLast();
+$t->isa_ok($article, 'DArticle', 'findLast() returns a single object');
+$t->is($article->getTitle(), 'foo2', 'findLast() returns the last object matching the conditions');