Changeset 10132

Timestamp:

07/05/08 11:34:47 (5 years ago)

Author:

francois

Message:

sfPropelFinderPlugin Slight refactoring + fixing i18n relations when hydrating (closes #3911)

Files:

• plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php (modified) (8 diffs)
• plugins/sfPropelFinderPlugin/lib/sfPropelFinderUtils.php (modified) (1 diff)
• plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderRelationsTest.php (modified) (4 diffs)

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -258 +258 @@
-      $this->criteria->setLimit($limit);
-    }
-this->getCriteria(), $
+
-    $this->updateLatestQuery($con);
-    if($reinitCriteria)
@@ -271 +271 @@
-  {
-    $this->criteria->setLimit(1);
-this->getCriteria(), $
+
-    $this->updateLatestQuery($con);
-    if($reinitCriteria)
@@ -455 +455 @@
-  }
-  
-
-
+
+
+
-    if($this->getWithClasses() || $this->getWithColumns())
-    {
-$criteria
+
-      if(method_exists($this->getPeerClass(), 'doSelectRS'))
-      {
@@ -527 +528 @@
-            }
-          }
-
+
+
+
+
+
+
+
+
-          $objectsInJoin []= $withObj;
-          if ($isNewObject)
@@ -566 +574 @@
-    {
-      // No 'with', so we use the native Propel doSelect()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  
@@ -573 +605 @@
-   * Prepare the select columns and add the missing joins
-   */
-
-
+
+
+
-    $c = clone $criteria;
-    $c->clearSelectColumns();
@@ -582 +615 @@
-    foreach ($this->getWithClasses() as $className)
-    {
-
-
-
-
-
-
-
-
-
+
-    }
-    // Then the columns added one by one by way of 'withColumn'
-    foreach($this->getWithColumns() as $alias => $column)
-    {
-      // if the column is on a related object property 
-      // and if join() wasn't called previously on this object, do a simple join
-      $peerClass = $column['peerClass'];
-      if($peerClass && !in_array($peerClass, $this->relations))
-      {
-        list($column1, $column2) = $this->getRelation(sfPropelFinderUtils::getClassFromPeerClass($peerClass));
-        $c->addJoin($column1, $column2);
-        $this->relations[]= $peerClass;
-      }
-      $c->addAsColumn('\''.$alias.'\'', $column['column']);
-    }
@@ -636 +652 @@
-  {
-    $i18nClass = $this->class.'I18n';
-
-
-
-
-
-
+
+
+
-    
-    return $this;

plugins/sfPropelFinderPlugin/lib/sfPropelFinderUtils.php

@@ -25 +25 @@
-        }
-        call_user_func(array($new, $methodName), $existingObject);
+        break;
+      }
+    }
+  }
+  
+  public static function relateI18nObjects($new, $existingObjects, $culture)
+  {
+    // brute force (to be optimized later)
+    foreach ($existingObjects as $existingObject)
+    {
+      $methodName = 'set'.get_class($new).'ForCulture';
+      if(method_exists($existingObject, $methodName))
+      {
+        call_user_func(array($existingObject, $methodName), $new, $culture);
+        call_user_func(array($new, 'set'.get_class($existingObject)), $existingObject);
-        break;
-      }

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderRelationsTest.php

@@ -79 +79 @@
-$con = Propel::getConnection();
-
-1
+2
-
-$t->diag('findRelation()');
@@ -274 +274 @@
-$article1->setCategory($category1);
-$article1->save();
+$sql = 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM article, category WHERE article.CATEGORY_ID=category.ID LIMIT 1';
-$finder = sfPropelFinder::from('Article')->join('Category')->with('Category');
-$article = $finder->findOne();
-$sql = 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM article, category WHERE article.CATEGORY_ID=category.ID LIMIT 1';
-$t->is($finder->getLatestQuery(), $sql, 'with() gets the columns of the with class in addition to the columns of the current class');
+$article->getCategory();
+$t->is(Propel::getConnection()->getLastExecutedQuery(), $sql, 'with() hydrates the related classes and avoids subsequent queries');
+
-$finder = sfPropelFinder::from('Article')->with('Category');
-$article = $finder->findOne();
-$t->is($finder->getLatestQuery(), $sql, 'with() adds a join if not already added');
-$t->is($article->getTitle(), 'aaaaa', 'fetching objects with a with() returns the correct main object');
-
-
-
-
-
+
+
-
-ArticlePeer::doDeleteAll();
@@ -305 +305 @@
-$finder = sfPropelFinder::from('Comment')->with('Article')->with('Author');
-$comment = $finder->findOne();
+$sql = 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, author.ID, author.NAME FROM comment, article, author WHERE comment.ARTICLE_ID=article.ID AND comment.AUTHOR_ID=author.ID LIMIT 1';
+$t->is($finder->getLatestQuery(), $sql, 'you can call with() several times to hydrate more than one related object');
-$t->is($comment->getContent(), 'foo', 'you can call with() several times to hydrate more than one related object');
-$t->is($comment->getArticle()->getTitle(), 'bbbbb', 'you can call with() several times to hydrate more than one related object');
-$t->is($comment->getAuthor()->getName(), 'John', 'you can call with() several times to hydrate more than one related object');
-$finder->getLatestQuery(), 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, author.ID, author.NAME FROM comment, article, author WHERE comment.ARTICLE_ID=article.ID AND comment.AUTHOR_ID=author.ID LIMIT 1', 'you can call with() several times to hydrate more than one related object
+Propel::getConnection()->getLastExecutedQuery(), $sql, 'with() called several tims hydrates the related classes and avoids subsequent queries
-
-$finder = sfPropelFinder::from('Comment')->with('Article')->with('Category');
@@ -333 +335 @@
-$finder = sfPropelFinder::from('Article')->withI18n();
-$article = $finder->findOne();
-
-finder->getLatestQuery()
+
+query
-$t->is($article->getContent(), 'english content', 'withI18n() considers the current user culture for hydration');
+$t->is(Propel::getConnection()->getLastExecutedQuery(), $query, 'withI18n() hydrates the i18n object so that no further query is necessary');
-
-sfContext::getInstance()->getUser()->setCulture('fr');