Changeset 10120

Timestamp:

07/04/08 16:11:04 (2 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Added the ability to do left, right, and inner joins in a simple way

Files:

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

plugins/sfPropelFinderPlugin/README

@@ -193 +193 @@
-#!php
-<?php
+// Test data
-$article1 = new Article();
-$article1->setTitle('Hello, world!');
@@ -202 +203 @@
-
-// Add a join statement
-// No need to tell the finder which columns to use for the join, just the related Class
-// After all, the columns of the FK are already defined in the schema
-$article = sfPropelFinder::from('Article')->
-  join('Comment')->
-  where('Comment.Content', 'You rock!')->
-  findOne();
-
-
-
-
+
+
+
+
+
+
-$article = sfPropelFinder::from('Article')->
-  where('Comment.Content', 'You rock!')->
-  findOne();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$article2 = new Article();
-$article2->setTitle('Hello again, world!');
@@ -499 +518 @@
- * Merge with sfPropelImpersonatorPlugin!
- * Add support for `with()` in `findPk()` (and document the method)
- * Add the ability to do left, right, inner joins, etc.
- * Change `with()` and `join()` to accept only one relation at a time, but with the ability to set the local and foreign parts of the relation. maybe replace the current multiple ability of these methods by `joins()` and `withs()`
- * Handle complex queries with And and Or
- * Add a `__toString()` method which returns a var_export() of the results, or a description of the conditions if not yet executed
@@ -510 +527 @@
-=== 2008-07-04 | Trunk ===
-
+ * francois: Added the ability to do left, right, and inner joins in a simple way
- * francois: Made `join()` useless if there is an explicit `where()` on the table afterwards
- * francois: Added a `prove.php` test file to launch all tests at once in a test harness

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -891 +891 @@
-   *   $articleFinder->join('Category', 'RIGHT JOIN')
-   *    => $c->addJoin(ArticlePeer::CATEGORY_ID, CategoryPeer::ID, Criteria::RIGHT_JOIN)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    $this->criteria->addJoin($column1, $column2, $operator);
@@ -985 +1005 @@
-  }
-  
-
+, $autoAddJoin = true
-  {
-    if(array_key_exists($phpName, $this->withColumns))
@@ -1010 +1030 @@
-      $peerClass = $this->peerClass;
-    }
-
+ && $autoAddJoin
-    {
-      $this->join($class);
@@ -1039 +1059 @@
-      return $this->join(substr($name, 4), $arguments);
-    }
+    if(strpos($name, 'Join') > 0)
+    {
+      $pos = strpos($name, 'Join');
+      $joinType = strtoupper(substr($name, 0, $pos)) . ' JOIN';
+      array_push($arguments, $joinType);
+      return call_user_func_array(array($this, 'join'), $arguments);
+    }
-    if(strpos($name, '_and') === 0)
-    {

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderRelationsTest.php

@@ -12 +12 @@
-You need a model built with a running database to run these tests.
-The tests expect a model similar to this one:
+
+    propel:
+      article:
+        id:          ~
+        title:       varchar(255)
+        category_id: ~
+      article_i18n:
+        content:     varchar(255)
+      category:
+        id:          ~
+        name:        varchar(255)
+      comment:
+        id:          ~
+        content:     varchar(255)
+        article_id:  ~
+        author_id:   ~
+      author:
+        id:          ~
+        name:        varchar(255)
+
+And a second model similar to:
-
-    propel:
@@ -58 +79 @@
-$con = Propel::getConnection();
-
-4
+71
-
-$t->diag('findRelation()');
@@ -92 +113 @@
-$t->is($person->getName(), 'John Doe', 'findRelation() can find a relation when the foreign phpName is not the camelCase version of the foreign Tablename');
-$t->is($person->getCivility()->getIsMan(), true, 'findRelation() can find a relation when the foreign phpName is not the camelCase version of the foreign Tablename');
+
+$t->diag('getRelation()');
-
-ClubPeer::doDeleteAll();
@@ -106 +129 @@
-$person1->setFoo($club1->getId());
-$person1->save();
+
+list($column1, $column2) = sfPropelFinder::from('Article')->getRelation('Category');
+$t->is($column1, ArticlePeer::CATEGORY_ID, 'getRelation() guesses the two parts of a relation properly for many-to-one relationships');
+$t->is($column2, CategoryPeer::ID, 'getRelation() guesses the two parts of a relation properly for many-to-one relationships');
+list($column1, $column2) = sfPropelFinder::from('Article')->getRelation('Comment');
+$t->is($column1, ArticlePeer::ID, 'getRelation() guesses the two parts of a relation properly for one-to-many relationships');
+$t->is($column2, CommentPeer::ARTICLE_ID, 'getRelation() guesses the two parts of a relation properly for one-to-many relationships');
+
+$t->diag('join()');
+
+$finder = sfPropelFinder::from('Article')->join('Comment');
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), null, 'join() ends up in a simple join');
+$t->is($join->getLeftColumnName(), 'ID', 'join($table) guesses the left column name');
+$t->is($join->getLeftTableName(), 'article', 'join($table) guesses the left table name');
+$t->is($join->getRightColumnName(), 'ARTICLE_ID', 'join($table) guesses the right column name');
+$t->is($join->getRightTableName(), 'comment', 'join($table) guesses the right table name');
+
+$finder = sfPropelFinder::from('Article')->join('Comment', Criteria::LEFT_JOIN);
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'LEFT JOIN', 'join($table, $type) creates a typed join');
+$t->is($join->getLeftColumnName(), 'ID', 'join($table, $type) guesses the left column name');
+$t->is($join->getLeftTableName(), 'article', 'join($table, $type) guesses the left table name');
+$t->is($join->getRightColumnName(), 'ARTICLE_ID', 'join($table, $type) guesses the right column name');
+$t->is($join->getRightTableName(), 'comment', 'join($table, $type) guesses the right table name');
+
+$finder = sfPropelFinder::from('Article')->join('Article.Id', 'Comment.ArticleId', Criteria::LEFT_JOIN);
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'LEFT JOIN', 'join($start, $end, $type) creates a typed join');
+$t->is($join->getLeftColumnName(), 'ID', 'join($start, $end, $type) converts the left column name');
+$t->is($join->getLeftTableName(), 'article', 'join($start, $end, $type) converts the left table name');
+$t->is($join->getRightColumnName(), 'ARTICLE_ID', 'join($start, $end, $type) converts the right column name');
+$t->is($join->getRightTableName(), 'comment', 'join($start, $end, $type) converts the right table name');
+
+ArticlePeer::doDeleteAll();
+CategoryPeer::doDeleteAll();
+$category1 = new Category();
+$category1->setName('cat1');
+$category1->save();
+$category2 = new Category();
+$category2->setName('cat2');
+$category2->save();
+$article1 = new Article();
+$article1->setTitle('aaaaa');
+$article1->setCategory($category1);
+$article1->save();
+$article2 = new Article();
+$article2->setTitle('bbbbb');
+$article2->setCategory($category1);
+$article2->save();
+$article3 = new Article();
+$article3->setTitle('ccccc');
+$article3->setCategory($category2);
+$article3->save();
+$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat1')->count();
+$t->is($nbArticles, 2, 'join() allows to join to another table (many-to-one)');
+$nbArticles = sfPropelFinder::from('Article')->where('Category.Name', 'cat1')->count();
+$t->is($nbArticles, 2, 'join() can be omitted if column names are explicit (many-to-one)');
+$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->count();
+$t->is($nbArticles, 1, 'join() allows to join to another table (many-to-one)');
+$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->count();
+$t->is($nbArticles, 1, 'join() can be omitted if column names are explicit (many-to-one)');
+$article = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->findOne();
+$t->is($article->getTitle(), 'ccccc', 'join() allows to join to another table (many-to-one)');
+ArticlePeer::doDeleteAll();
+CommentPeer::doDeleteAll();
+$article1 = new Article();
+$article1->setTitle('aaaaa');
+$article1->setCategory($category1);
+$article1->save();
+$article2 = new Article();
+$article2->setTitle('bbbbb');
+$article2->setCategory($category1);
+$article2->save();
+$comment = new Comment();
+$comment->setContent('foo');
+$comment->setArticleId($article2->getId());
+$comment->save();
+$nbArticles = sfPropelFinder::from('Article')->join('Comment')->where('Comment.Content', 'foo')->count();
+$t->is($nbArticles, 1, 'join() allows to join to another table (one-to-many)');
+$nbArticles = sfPropelFinder::from('Article')->where('Comment.Content', 'foo')->count();
+$t->is($nbArticles, 1, 'join() can be omitted if column names are explicit (one-to-many)');
+$article = sfPropelFinder::from('Article')->join('Comment')->where('Comment.Content', 'foo')->findOne();
+$t->is($article->getTitle(), 'bbbbb', 'join() allows to join to another table (one-to-many)');
+
+ArticlePeer::doDeleteAll();
+CommentPeer::doDeleteAll();
+AuthorPeer::doDeleteAll();
+$article1 = new Article();
+$article1->setTitle('aaaaa');
+$article1->setCategory($category1);
+$article1->save();
+$author1 = new Author();
+$author1->setName('John');
+$author1->save();
+$comment = new Comment();
+$comment->setContent('foo');
+$comment->setArticleId($article1->getId());
+$comment->setAuthor($author1);
+$comment->save();
+$article = sfPropelFinder::from('Article')->join('Comment')->join('Author')->where('Author.Name', 'John')->findOne();
+$t->is($article->getTitle(), 'aaaaa', 'you can chain several join() statements');
+$article = sfPropelFinder::from('Article')->join('Comment')->where('Author.Name', 'John')->findOne();
+$t->is($article->getTitle(), 'aaaaa', 'join() can be omitted if column names are explicit');
+$article = sfPropelFinder::from('Article')->joinComment()->joinAuthor()->where('Author.Name', 'John')->findOne();
+$t->is($article->getTitle(), 'aaaaa', 'joinXXX() does a join according to the XXX column name');
+
+$t->diag('leftJoin(), rightJoin(), innerJoin()');
+
+$finder = sfPropelFinder::from('Article')->leftJoin('Comment');
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'LEFT JOIN', 'leftJoin($table) ends up in a left join');
+$finder = sfPropelFinder::from('Article')->rightJoin('Comment');
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'RIGHT JOIN', 'rightJoin($table) ends up in a right join');
+$finder = sfPropelFinder::from('Article')->innerJoin('Comment');
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'INNER JOIN', 'innerJoin($table) ends up in an inner join');
+
+$finder = sfPropelFinder::from('Article')->leftJoin('Article.Id', 'Comment.ArticleId');
+$join = array_pop($finder->getCriteria()->getJoins());
+$t->is($join->getJoinType(), 'LEFT JOIN', 'leftJoin($start, $end) creates a left join');
+$t->is($join->getLeftColumnName(), 'ID', 'leftJoin($start, $end) converts the left column name');
+$t->is($join->getLeftTableName(), 'article', 'leftJoin($start, $end) converts the left table name');
+$t->is($join->getRightColumnName(), 'ARTICLE_ID', 'leftJoin($start, $end) converts the right column name');
+$t->is($join->getRightTableName(), 'comment', 'leftJoin($start, $end) converts the right table name');
+
+$t->diag('with()');
+
+ArticlePeer::doDeleteAll();
+CategoryPeer::doDeleteAll();
+$category1 = new Category();
+$category1->setName('cat1');
+$category1->save();
+$article1 = new Article();
+$article1->setTitle('aaaaa');
+$article1->setCategory($category1);
+$article1->save();
+$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');
+$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');
+$category = $article->getCategory();
+$t->is($category->getName(), 'cat1', 'fetching objects with a with() returns the correct related object');
+$con = Propel::getConnection();
+$latestQuery = $con->getLastExecutedQuery();
+$t->is($latestQuery, $sql, 'calling a FK getter on an object hydrated with with() does not issue a new query');
+
+ArticlePeer::doDeleteAll();
+CommentPeer::doDeleteAll();
+AuthorPeer::doDeleteAll();
+$article1 = new Article();
+$article1->setTitle('bbbbb');
+$article1->setCategory($category1);
+$article1->save();
+$author1 = new Author();
+$author1->setName('John');
+$author1->save();
+$comment = new Comment();
+$comment->setContent('foo');
+$comment->setArticleId($article1->getId());
+$comment->setAuthor($author1);
+$comment->save();
+$finder = sfPropelFinder::from('Comment')->with('Article')->with('Author');
+$comment = $finder->findOne();
+$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');
+$t->is($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');
+
+$finder = sfPropelFinder::from('Comment')->with('Article')->with('Category');
+$comment = $finder->findOne();
+$t->is($finder->getLatestQuery(), 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM comment, article, category WHERE comment.ARTICLE_ID=article.ID AND article.CATEGORY_ID=category.ID LIMIT 1', 'with() can even hydrate related objects via a related object');
+
+$finder = sfPropelFinder::from('Comment')->with('Article', 'Category');
+$comment = $finder->findOne();
+$t->is($finder->getLatestQuery(), 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM comment, article, category WHERE comment.ARTICLE_ID=article.ID AND article.CATEGORY_ID=category.ID LIMIT 1', 'with() accepts several arguments, so you don\'t need to call it several times');
+
+$t->diag('withI18n()');
+
+ArticlePeer::doDeleteAll();
+ArticleI18nPeer::doDeleteAll();
+$article1 = new Article();
+$article1->setTitle('aaa');
+$article1->setCulture('en');
+$article1->setContent('english content');
+$article1->setCulture('fr');
+$article1->setContent('contenu français');
+$article1->save();
+
+sfContext::getInstance()->getUser()->setCulture('en');
+$finder = sfPropelFinder::from('Article')->withI18n();
+$article = $finder->findOne();
+
+$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'withI18n() hydrates the related I18n object with a culture taken from the user object');
+$t->is($article->getContent(), 'english content', 'withI18n() considers the current user culture for hydration');
+
+sfContext::getInstance()->getUser()->setCulture('fr');
+$finder = sfPropelFinder::from('Article')->withI18n();
+$article = $finder->findOne();
+
+$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'fr\' AND article.ID=article_i18n.ID LIMIT 1', 'withI18n() hydrates the related I18n object with a culture taken from the user object');
+$t->is($article->getContent(), 'contenu français', 'withI18n() considers the current user culture for hydration');
+
+sfContext::getInstance()->getUser()->setCulture('fr');
+$article = sfPropelFinder::from('Article')->
+  withI18n('en')->
+  findOne();
+$t->is($article->getContent(), 'english content', 'withI18n() accepts a culture parameter to override the user culture');
+
+sfContext::getInstance()->getUser()->setCulture('en');
+$finder = sfPropelFinder::from('Article')->with('I18n');
+$article = $finder->findOne();
+$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'with(\'I18n\') is a synonym for withI18n()');
+$finder = sfPropelFinder::from('Article')->with('i18n');
+$article = $finder->findOne();
+$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'with(\'i18n\') is a synonym for withI18n()');
+
+$t->diag('withColumn()');
+
+ArticlePeer::doDeleteAll();
+CommentPeer::doDeleteAll();
+
+$article1 = new Article();
+$article1->setTitle('bbbbb');
+$article1->setCategory($category1);
+$article1->save();
+$author1 = new Author();
+$author1->setName('John');
+$author1->save();
+$comment = new Comment();
+$comment->setContent('foo');
+$comment->setArticleId($article1->getId());
+$comment->setAuthor($author1);
+$comment->save();
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->
+  withColumn('Article.Title')->
+  findOne();
+$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'Additional columns added with withColumn() are stored in the object and can be retrieved with getColumn()');
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->
+  findOne();
+try
+{
+  $comment->getColumn('Article.Title');
+  $t->fail('getColumn() is not available as long as you don\'t add a column with withColumn()');
+}
+catch(Exception $e)
+{
+  $t->pass('getColumn() is not available as long as you don\'t add a column with withColumn()');
+}
+
+$comment = sfPropelFinder::from('Comment')->
+  withColumn('Article.Title')->
+  findOne();
+$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'If withColumn() is called on a related object column with no join on this class, the finder adds the join automatically');
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->
+  withColumn('Article.Title', 'ArticleTitle')->
+  findOne();
+$t->is($comment->getColumn('ArticleTitle'), 'bbbbb', 'withColumn() second parameter serves as a column alias');
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->
+  withColumn('Article.Title', 'ArticleTitle', 'int')->
+  findOne();
+$t->is($comment->getColumn('ArticleTitle'), '0', 'withColumn() third parameter serves as a type caster');
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->join('Author')->
+  withColumn('Article.Title')->
+  withColumn('Author.Name')->
+  findOne();
+$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'withColumn() can be called several times');
+$t->is($comment->getColumn('Author.Name'), 'John', 'withColumn() can be called several times');
+
+$comment = sfPropelFinder::from('Comment')->
+  join('Article')->with('Author')->
+  withColumn('Article.Title')->
+  findOne();
+$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'Columns added with withColumn() live together well with related objects added with with()');
+$t->is($comment->getAuthor()->getName(), 'John', 'Related objects added with with() live together well with columns added with withColumn()');
+
+$article = sfPropelFinder::from('Article')->
+  join('Comment')->
+  groupBy('Article.Id')->
+  withColumn('COUNT(comment.ID)', 'NbComments')->
+  findOne();
+$t->is($article->getColumn('NbComments'), '1', 'withColumn() accepts complex SQL calculations as additional column');
+
+$finder = sfPropelFinder::from('Article')->
+  join('Comment')->
+  groupBy('Article.Id')->
+  withColumn('COUNT(comment.ID)', 'NbComments')->
+  orderBy('NbComments');
+$article = $finder->findOne();
+$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, COUNT(comment.ID) AS \'NbComments\' FROM article, comment WHERE article.ID=comment.ARTICLE_ID GROUP BY article.ID ORDER BY NbComments ASC LIMIT 1', 'Columns added with withColumn() can be used for sorting');

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php

@@ -65 +65 @@
-ArticlePeer::doDeleteAll();
-
-46
+02
-
-$t->diag('find()');
@@ -596 +596 @@
-$t->is($article->getTitle(), 'ccccc', 'orderByXXX() takes an order as argument');
-
-$t->diag('join()');
-
-list($column1, $column2) = sfPropelFinder::from('Article')->getRelation('Category');
-$t->is($column1, ArticlePeer::CATEGORY_ID, 'getRelation() guesses the two parts of a relation properly for many-to-one relationships');
-$t->is($column2, CategoryPeer::ID, 'getRelation() guesses the two parts of a relation properly for many-to-one relationships');
-list($column1, $column2) = sfPropelFinder::from('Article')->getRelation('Comment');
-$t->is($column1, ArticlePeer::ID, 'getRelation() guesses the two parts of a relation properly for one-to-many relationships');
-$t->is($column2, CommentPeer::ARTICLE_ID, 'getRelation() guesses the two parts of a relation properly for one-to-many relationships');
-ArticlePeer::doDeleteAll();
-CategoryPeer::doDeleteAll();
-$category1 = new Category();
-$category1->setName('cat1');
-$category1->save();
-$category2 = new Category();
-$category2->setName('cat2');
-$category2->save();
-$article1 = new Article();
-$article1->setTitle('aaaaa');
-$article1->setCategory($category1);
-$article1->save();
-$article2 = new Article();
-$article2->setTitle('bbbbb');
-$article2->setCategory($category1);
-$article2->save();
-$article3 = new Article();
-$article3->setTitle('ccccc');
-$article3->setCategory($category2);
-$article3->save();
-$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat1')->count();
-$t->is($nbArticles, 2, 'join() allows to join to another table (many-to-one)');
-$nbArticles = sfPropelFinder::from('Article')->where('Category.Name', 'cat1')->count();
-$t->is($nbArticles, 2, 'join() can be omitted if column names are explicit (many-to-one)');
-$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->count();
-$t->is($nbArticles, 1, 'join() allows to join to another table (many-to-one)');
-$nbArticles = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->count();
-$t->is($nbArticles, 1, 'join() can be omitted if column names are explicit (many-to-one)');
-$article = sfPropelFinder::from('Article')->join('Category')->where('Category.Name', 'cat2')->findOne();
-$t->is($article->getTitle(), 'ccccc', 'join() allows to join to another table (many-to-one)');
-ArticlePeer::doDeleteAll();
-CommentPeer::doDeleteAll();
-$article1 = new Article();
-$article1->setTitle('aaaaa');
-$article1->setCategory($category1);
-$article1->save();
-$article2 = new Article();
-$article2->setTitle('bbbbb');
-$article2->setCategory($category1);
-$article2->save();
-$comment = new Comment();
-$comment->setContent('foo');
-$comment->setArticleId($article2->getId());
-$comment->save();
-$nbArticles = sfPropelFinder::from('Article')->join('Comment')->where('Comment.Content', 'foo')->count();
-$t->is($nbArticles, 1, 'join() allows to join to another table (one-to-many)');
-$nbArticles = sfPropelFinder::from('Article')->where('Comment.Content', 'foo')->count();
-$t->is($nbArticles, 1, 'join() can be omitted if column names are explicit (one-to-many)');
-$article = sfPropelFinder::from('Article')->join('Comment')->where('Comment.Content', 'foo')->findOne();
-$t->is($article->getTitle(), 'bbbbb', 'join() allows to join to another table (one-to-many)');
-
-ArticlePeer::doDeleteAll();
-CommentPeer::doDeleteAll();
-AuthorPeer::doDeleteAll();
-$article1 = new Article();
-$article1->setTitle('aaaaa');
-$article1->setCategory($category1);
-$article1->save();
-$author1 = new Author();
-$author1->setName('John');
-$author1->save();
-$comment = new Comment();
-$comment->setContent('foo');
-$comment->setArticleId($article1->getId());
-$comment->setAuthor($author1);
-$comment->save();
-$article = sfPropelFinder::from('Article')->join('Comment')->join('Author')->where('Author.Name', 'John')->findOne();
-$t->is($article->getTitle(), 'aaaaa', 'you can chain several join() statements');
-$article = sfPropelFinder::from('Article')->join('Comment')->where('Author.Name', 'John')->findOne();
-$t->is($article->getTitle(), 'aaaaa', 'join() can be omitted if column names are explicit');
-$article = sfPropelFinder::from('Article')->joinComment()->joinAuthor()->where('Author.Name', 'John')->findOne();
-$t->is($article->getTitle(), 'aaaaa', 'joinXXX() does a join according to the XXX column name');
-
-$t->diag('with()');
-
-ArticlePeer::doDeleteAll();
-CategoryPeer::doDeleteAll();
-$category1 = new Category();
-$category1->setName('cat1');
-$category1->save();
-$article1 = new Article();
-$article1->setTitle('aaaaa');
-$article1->setCategory($category1);
-$article1->save();
-$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');
-$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');
-$category = $article->getCategory();
-$t->is($category->getName(), 'cat1', 'fetching objects with a with() returns the correct related object');
-$con = Propel::getConnection();
-$latestQuery = $con->getLastExecutedQuery();
-$t->is($latestQuery, $sql, 'calling a FK getter on an object hydrated with with() does not issue a new query');
-
-ArticlePeer::doDeleteAll();
-CommentPeer::doDeleteAll();
-AuthorPeer::doDeleteAll();
-$article1 = new Article();
-$article1->setTitle('bbbbb');
-$article1->setCategory($category1);
-$article1->save();
-$author1 = new Author();
-$author1->setName('John');
-$author1->save();
-$comment = new Comment();
-$comment->setContent('foo');
-$comment->setArticleId($article1->getId());
-$comment->setAuthor($author1);
-$comment->save();
-$finder = sfPropelFinder::from('Comment')->with('Article')->with('Author');
-$comment = $finder->findOne();
-$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');
-$t->is($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');
-
-$finder = sfPropelFinder::from('Comment')->with('Article')->with('Category');
-$comment = $finder->findOne();
-$t->is($finder->getLatestQuery(), 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM comment, article, category WHERE comment.ARTICLE_ID=article.ID AND article.CATEGORY_ID=category.ID LIMIT 1', 'with() can even hydrate related objects via a related object');
-
-$finder = sfPropelFinder::from('Comment')->with('Article', 'Category');
-$comment = $finder->findOne();
-$t->is($finder->getLatestQuery(), 'SELECT comment.ID, comment.CONTENT, comment.ARTICLE_ID, comment.AUTHOR_ID, article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, category.ID, category.NAME FROM comment, article, category WHERE comment.ARTICLE_ID=article.ID AND article.CATEGORY_ID=category.ID LIMIT 1', 'with() accepts several arguments, so you don\'t need to call it several times');
-
-$t->diag('withI18n()');
-
-ArticlePeer::doDeleteAll();
-ArticleI18nPeer::doDeleteAll();
-$article1 = new Article();
-$article1->setTitle('aaa');
-$article1->setCulture('en');
-$article1->setContent('english content');
-$article1->setCulture('fr');
-$article1->setContent('contenu français');
-$article1->save();
-
-sfContext::getInstance()->getUser()->setCulture('en');
-$finder = sfPropelFinder::from('Article')->withI18n();
-$article = $finder->findOne();
-
-$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'withI18n() hydrates the related I18n object with a culture taken from the user object');
-$t->is($article->getContent(), 'english content', 'withI18n() considers the current user culture for hydration');
-
-sfContext::getInstance()->getUser()->setCulture('fr');
-$finder = sfPropelFinder::from('Article')->withI18n();
-$article = $finder->findOne();
-
-$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'fr\' AND article.ID=article_i18n.ID LIMIT 1', 'withI18n() hydrates the related I18n object with a culture taken from the user object');
-$t->is($article->getContent(), 'contenu français', 'withI18n() considers the current user culture for hydration');
-
-sfContext::getInstance()->getUser()->setCulture('fr');
-$article = sfPropelFinder::from('Article')->
-  withI18n('en')->
-  findOne();
-$t->is($article->getContent(), 'english content', 'withI18n() accepts a culture parameter to override the user culture');
-
-sfContext::getInstance()->getUser()->setCulture('en');
-$finder = sfPropelFinder::from('Article')->with('I18n');
-$article = $finder->findOne();
-$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'with(\'I18n\') is a synonym for withI18n()');
-$finder = sfPropelFinder::from('Article')->with('i18n');
-$article = $finder->findOne();
-$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, article_i18n.CONTENT, article_i18n.ID, article_i18n.CULTURE FROM article, article_i18n WHERE article_i18n.CULTURE=\'en\' AND article.ID=article_i18n.ID LIMIT 1', 'with(\'i18n\') is a synonym for withI18n()');
-
-$t->diag('withColumn()');
-
-ArticlePeer::doDeleteAll();
-CommentPeer::doDeleteAll();
-
-$article1 = new Article();
-$article1->setTitle('bbbbb');
-$article1->setCategory($category1);
-$article1->save();
-$author1 = new Author();
-$author1->setName('John');
-$author1->save();
-$comment = new Comment();
-$comment->setContent('foo');
-$comment->setArticleId($article1->getId());
-$comment->setAuthor($author1);
-$comment->save();
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->
-  withColumn('Article.Title')->
-  findOne();
-$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'Additional columns added with withColumn() are stored in the object and can be retrieved with getColumn()');
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->
-  findOne();
-try
-{
-  $comment->getColumn('Article.Title');
-  $t->fail('getColumn() is not available as long as you don\'t add a column with withColumn()');
-}
-catch(Exception $e)
-{
-  $t->pass('getColumn() is not available as long as you don\'t add a column with withColumn()');
-}
-
-$comment = sfPropelFinder::from('Comment')->
-  withColumn('Article.Title')->
-  findOne();
-$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'If withColumn() is called on a related object column with no join on this class, the finder adds the join automatically');
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->
-  withColumn('Article.Title', 'ArticleTitle')->
-  findOne();
-$t->is($comment->getColumn('ArticleTitle'), 'bbbbb', 'withColumn() second parameter serves as a column alias');
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->
-  withColumn('Article.Title', 'ArticleTitle', 'int')->
-  findOne();
-$t->is($comment->getColumn('ArticleTitle'), '0', 'withColumn() third parameter serves as a type caster');
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->join('Author')->
-  withColumn('Article.Title')->
-  withColumn('Author.Name')->
-  findOne();
-$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'withColumn() can be called several times');
-$t->is($comment->getColumn('Author.Name'), 'John', 'withColumn() can be called several times');
-
-$comment = sfPropelFinder::from('Comment')->
-  join('Article')->with('Author')->
-  withColumn('Article.Title')->
-  findOne();
-$t->is($comment->getColumn('Article.Title'), 'bbbbb', 'Columns added with withColumn() live together well with related objects added with with()');
-$t->is($comment->getAuthor()->getName(), 'John', 'Related objects added with with() live together well with columns added with withColumn()');
-
-$article = sfPropelFinder::from('Article')->
-  join('Comment')->
-  groupBy('Article.Id')->
-  withColumn('COUNT(comment.ID)', 'NbComments')->
-  findOne();
-$t->is($article->getColumn('NbComments'), '1', 'withColumn() accepts complex SQL calculations as additional column');
-
-$finder = sfPropelFinder::from('Article')->
-  join('Comment')->
-  groupBy('Article.Id')->
-  withColumn('COUNT(comment.ID)', 'NbComments')->
-  orderBy('NbComments');
-$article = $finder->findOne();
-$t->is($finder->getLatestQuery(), 'SELECT article.ID, article.VERSION, article.TITLE, article.CATEGORY_ID, COUNT(comment.ID) AS \'NbComments\' FROM article, comment WHERE article.ID=comment.ARTICLE_ID GROUP BY article.ID ORDER BY NbComments ASC LIMIT 1', 'Columns added with withColumn() can be used for sorting');
-
-$t->diag('set()');
-