Changeset 10755

Timestamp:

08/08/08 18:35:14 (4 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Implemented sfDoctrineFinder::delete()

Files:

• plugins/sfPropelFinderPlugin/README (modified) (1 diff)
• plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php (modified) (2 diffs)
• plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php (modified) (3 diffs)
• plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php (modified) (2 diffs)

plugins/sfPropelFinderPlugin/README

@@ -531 +531 @@
----------
-
-
-
+
+
+
-* francois: Turned README into Markdown syntax, and changed the main name to `DbFinder`
-* francois: `DbFinder::from('Article')` returns an instance of `ArticleFinder` if it exists. That way, extending the finder gets easier.

plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php

@@ -309 +309 @@
-  public function delete($forceIndividualDeletes = false)
-  {
+    if($forceIndividualDeletes)
+    {
+      $objects = $this->query->delete()->execute();
+      $nbDeleted = 0;
+      foreach($objects as $object)
+      {
+        $object->delete();
+        $nbDeleted++;
+      }
+    }
+    else
+    {
+      if (!$this->query->contains('where'))
+      {
+        // Empty queries don't return the number of deleted rows
+        $this->query->addWhere('1 = 1');
+      }
+      $nbDeleted = $this->query->delete()->execute();
+    }
-    $this->cleanup();
-
+
+
-  }
-  
@@ -515 +535 @@
-    else
-    {
-
+
+
+
+
+
+
+
+
-    }
-  }

plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php

@@ -27 +27 @@
-    DArticleI18n:
-      columns:
+        id:          { type: integer, primary: true }
+        culture:     { type: string(5), primary: true }
-        content:     string(255)
-    DCategory:
@@ -71 +73 @@
-Doctrine_Query::create()->delete()->from('DArticle')->execute();
-
-53
+77
-
-$t->diag('find()');
@@ -353 +355 @@
-$nbArticles = $finder->whereTitle('foo2')->count();
-$t->is($nbArticles, 1, 'count() returns the number of records matching the condition');
+
+$t->diag('delete()');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+$finder = new sfDoctrineFinder('DArticle');
+$nbDeleted = $finder->delete();
+$t->is($nbDeleted, 0, 'delete() on an empty finder with no results returns 0');
+$article2 = new DArticle();
+$article2->setTitle('foo2');
+$article2->save();
+$article3 = new DArticle();
+$article3->setTitle('foo3');
+$article3->save();
+$finder = new sfDoctrineFinder('DArticle');
+$nbDeleted = $finder->delete();
+$t->is($nbDeleted, 2, 'delete() deletes records from the table and returns the number of deleted rows');
+$finder = new sfDoctrineFinder('DArticle');
+$nbArticles = $finder->count();
+$t->is($nbArticles, 0, 'delete() on an empty finder deletes all rows');
+$article2 = new DArticle();
+$article2->setTitle('foo2');
+$article2->save();
+$article3 = new DArticle();
+$article3->setTitle('foo3');
+$article3->save();
+$finder = new sfDoctrineFinder('DArticle');
+$nbDeleted = $finder->where('Title', 'foo2')->delete();
+$t->is($nbDeleted, 1, 'delete() deletes all rows found by a finder');
+$nbArticles = $finder->count();
+$t->is($nbArticles, 1, 'delete() does not delete rows not found by the finder');
+
+$t->diag('where()');
+
+Doctrine_Query::create()->delete()->from('DArticle')->execute();
+$article1 = new DArticle();
+$article1->setTitle('abc');
+$article1->save();
+$article2 = new DArticle();
+$article2->setTitle('def');
+$article2->save();
+$article3 = new DArticle();
+$article3->setTitle('bbc');
+$article3->save();
+$article = sfDoctrineFinder::from('DArticle')->where('Title', 'abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'where() accepts a simple CamelCase column name like ClassName');
+try
+{
+  $article = sfDoctrineFinder::from('DArticle')->where('Foo', 'abc')->find();
+  $t->fail('where() throws an exception when the column is not found (but only after calling find())');
+}
+catch (Exception $e)
+{
+  $t->pass('where() throws an exception when the column is not found (but only after calling find())');
+}
+$article = sfDoctrineFinder::from('DArticle')->where('DArticle.Title', 'abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'where() accepts a complete column name ClassName.ColumnName');
+$article = sfDoctrineFinder::from('DArticle')->where('DArticle_Title', 'abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'where() accepts a complete column name ClassName_ColumnName');
+$article = sfDoctrineFinder::from('DArticle')->where('d.Title', 'abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'where() accepts a complete column name ClassShortcut.ColumnName');
+$article = sfDoctrineFinder::from('DArticle b')->where('b.Title', 'abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'where() accepts a complete column name ClassAlias.ColumnName');
+$article = sfDoctrineFinder::from('DArticle')->where('Title', 'def')->findOne();
+$t->is($article->getId(), $article2->getId(), 'where() adds a WHERE condition on the column given as first argument');
+$articles = sfDoctrineFinder::from('DArticle')->where('Title', ' LIKE ', '%bc')->find();
+$t->is(count($articles), 2, 'where() accepts a comparator as second argument when three arguments are given');
+$articles = sfDoctrineFinder::from('DArticle')->where('Title', 'like', '%bc')->find();
+$t->is(count($articles), 2, 'where() accepts a text comparator and is permissive on syntax');
+$articles = sfDoctrineFinder::from('DArticle')->where('Title', 'is not null', null)->find();
+$t->is(count($articles), 3, 'where() accepts a text comparator and is permissive on syntax');
+$articles = sfDoctrineFinder::from('DArticle')->where('Title', ' in ', array('abc', 'def'))->find();
+$t->is(count($articles), 2, 'where() accepts a "in" comparator');
+
+try
+{
+  $article = sfDoctrineFinder::from('DArticle')->whereFoo('abc')->find();
+  $t->fail('whereXXX() throws an exception when the XXX column is not found (but only after calling find())');
+}
+catch (Exception $e)
+{
+  $t->pass('whereXXX() throws an exception when the XXX column is not found (but only after calling find())');
+}
+
+try
+{
+  $article = sfDoctrineFinder::from('DArticle')->wherecategoryid('abc')->find();
+  $t->fail('whereXXX() expects a column name in CamelCase');
+}
+catch (Exception $e)
+{
+  $t->pass('whereXXX() expects a column name in CamelCase');
+}
+
+try
+{
+  $article = sfDoctrineFinder::from('DArticle')->whereCategoryId('abc')->find();
+  $t->pass('whereXXX() expects a column name in CamelCase');
+}
+catch (Exception $e)
+{
+  $t->fail('whereXXX() expects a column name in CamelCase');
+}
+
+try
+{
+  $article = sfDoctrineFinder::from('DArticle')->whereTitle('abc', 'def', 'ghi', 'jkl')->find();
+  $t->fail('whereXXX() throws an exception when called with more than three parameters');
+}
+catch (Exception $e)
+{
+  $t->pass('whereXXX() throws an exception when called with more than three parameters');
+}
+
+$article = sfDoctrineFinder::from('DArticle')->whereTitle('abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'whereXXX() adds a where condition according to the XXX column name');
+$article = sfDoctrineFinder::from('DArticle')->whereDArticle_Title('abc')->findOne();
+$t->is($article->getId(), $article1->getId(), 'whereXXX() accepts a complete column name like whereClassName_ColumnName()');
+$article = sfDoctrineFinder::from('DArticle')->whereTitle('def')->findOne();
+$t->is($article->getId(), $article2->getId(), 'whereXXX() adds a WHERE condition on the XXX column');
+$articles = sfDoctrineFinder::from('DArticle')->whereTitle('like', '%bc')->find();
+$t->is(count($articles), 2, 'whereXXX() accepts a comparator as first argument when two arguments are given');

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php

@@ -422 +422 @@
-try
-{
-title
+categoryid
-  $t->fail('whereXXX() expects a column name in CamelCase');
-}
@@ -432 +432 @@
-try
-{
-Title
+CategoryId
-  $t->pass('whereXXX() expects a column name in CamelCase');
-}