Changeset 10780

Timestamp:

08/11/08 16:26:01 (3 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Implemented sfDoctrine::combine()

Files:

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

plugins/sfPropelFinderPlugin/README

@@ -533 +533 @@
-### 2008-08-11 | Trunk
-
+* francois: Implemented `sfDoctrine::combine()`
-* francois: Implemented `sfDoctrineFinder::orWhere()`
-* francois: [BC Break] Removed `_and()` (synonym for `where()`) and renamed `_or()` to `orWhere()`

plugins/sfPropelFinderPlugin/lib/sfDoctrineFinder.php

@@ -21 +21 @@
-    $queryPattern  = '',
-    $queryArgs     = array(),
+    $namedPatterns = array(),
+    $namedArgs     = array(),
-    $argNumber     = 0,
-    $queryListener = null,
@@ -440 +442 @@
-      for ($i=0; $i < $count; $i++)
-      { 
-
+'and', 
-      }
-      return $this->findOne();
@@ -449 +451 @@
-      if(is_array($pk))
-      {
-
+'and', 
-        return $this->find();
-      }
-      else
-      {
-
+'and', 
-        return $this->findOne();
-      }
@@ -684 +686 @@
-    }
-    list($value, $comparison) = self::getValueAndComparisonFromArguments($arguments);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-  }
-
@@ -736 +706 @@
-    $column = $this->getColName($columnName);
-    list($value, $comparison) = self::getValueAndComparisonFromArguments($arguments);
-$column, $comparison, $value, 'or'
+'or', $column, $comparison, $value
-    
-    return $this;
-  }
-
+  protected function addCondition($cond = 'and', $column, $comparison, $value, $namedCondition = null)
+  {
+    if($comparison == ' NOT IN ')
+    {
+      throw new Exception('sfDoctrineFinder cannot add a condition with a NOT IN');
+    }
+    if($comparison == ' IN ')
+    {
+      if($cond == 'or')
+      {
+        throw new Exception('sfDoctrineFinder cannot OR a condition with an IN');
+      }
+      $this->query->whereIn($column, $value);
+    }
+    else
+    {
+      if($namedCondition)
+      {
+        if(is_null($value))
+        {
+          $this->namedPatterns[$namedCondition] = sprintf('%s %s', $column, $comparison);
+        }
+        else
+        {
+          $argName = ':param'.$this->argNumber;
+          $this->argNumber++;
+          $this->namedPatterns[$namedCondition] = sprintf('%s %s %s', $column, $comparison, $argName);
+          $this->namedArgs[$namedCondition][$argName] = $value;
+        }
+      }
+      else
+      {
+        // The operator of the first condition is ignored
+        $cond = $this->queryPattern ? $cond : '';
+        if(is_null($value))
+        {
+          $this->queryPattern .= sprintf(' %s %s %s', $cond, $column, $comparison);
+        }
+        else
+        {
+          $argName = ':param'.$this->argNumber;
+          $this->argNumber++;
+          $this->queryPattern .= sprintf(' %s %s %s %s', $cond, $column, $comparison, $argName);
+          $this->queryArgs[$argName] = $value;
+        }
+      }
+    }
+  }
+  
-  /**
-   * Combine named conditions into the main query or into a new named condition
@@ -754 +773 @@
-  public function combine($conditions, $operator = 'and', $namedCondition = null)
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    return $this;

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -13 +13 @@
-{
-  protected 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
-  public function getClass()
@@ -1022 +1023 @@
-  {
-    $addMethod = 'add'.ucfirst(strtolower(trim($operator)));
-A
+a
-    {
-      $conditions = array($conditions);

plugins/sfPropelFinderPlugin/test/unit/sfDoctrineFinderTest.php

@@ -73 +73 @@
-Doctrine_Query::create()->delete()->from('DArticle')->execute();
-
-84
+92
-
-$t->diag('find()');
@@ -560 +560 @@
-$t->skip('orWhere() works on a simple jointure');
-$t->skip('orWhere() works on a multiple jointure');
+
+$t->diag('combine()');
+
+$columns    = "d.id AS d__id, d.title AS d__title, d.category_id AS d__category_id";
+$baseSelect = "SELECT $columns FROM d_article d WHERE ";
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "d.title = 'bar'",
+  'where() called with a named condition does not affect the SQL until it is combined'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  combine(array('cond1', 'cond2'), 'or');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(d.title = 'foo' OR d.title = 'bar')",
+  'combine() combines conditions into the main query'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  combine(array('cond1', 'cond2'), 'and');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(d.title = 'foo' AND d.title = 'bar')",
+  'combine() combines conditions into the main criteria'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  where('Title', '=', 'foobar')->
+  combine(array('cond1', 'cond2'), 'or');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(d.title = 'foo' OR d.title = 'bar') AND d.title = 'foobar'",
+  'combine() clauses live well with the usual conditions'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  combine(array('cond1', 'cond2'), 'or')->
+  where('Title', '=', 'foobar');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(d.title = 'foo' OR d.title = 'bar') AND d.title = 'foobar'",
+  'combine() clauses live well with the usual conditions and appear ordered as they were called'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  where('Title', '=', 'foobar', 'cond3')->
+  combine(array('cond1', 'cond2'), 'or', 'cond4')->
+  combine(array('cond4', 'cond3'), 'and');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "((d.title = 'foo' OR d.title = 'bar') AND d.title = 'foobar')",
+  'combine() can return a named condition'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  where('Title', '=', 'foobar', 'cond3')->
+  where('Title', '=', 'boofar', 'cond4')->
+  combine(array('cond1', 'cond2'), 'or', 'cond6')->
+  combine(array('cond3', 'cond4'), 'or', 'cond7')->
+  combine(array('cond6', 'cond7'), 'and');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "((d.title = 'foo' OR d.title = 'bar') AND (d.title = 'foobar' OR d.title = 'boofar'))",
+  'combine() allows for imbricated conditions'
+);
+
+$finder = sfDoctrineFinder::from('DArticle')->
+  where('Title', '=', 'foo', 'cond1')->
+  where('Title', '=', 'bar', 'cond2')->
+  where('Title', '=', 'foobar', 'cond3')->
+  combine(array('cond1', 'cond2', 'cond3'), 'or');
+$finder->find();
+$t->is(
+  $finder->getLatestQuery(),
+  $baseSelect . "(d.title = 'foo' OR d.title = 'bar' OR d.title = 'foobar')",
+  'combine() can combine more than two conditions'
+);