Changeset 1591

Timestamp:

03/02/10 20:57:59 (10 days ago)

Author:

francois

Message:

[1.5] Introducing the query_cache behavior

Location:

branches/1.5

Files:

• docs/behavior/query_cache.txt (added)
• docs/guide/07-Behaviors.txt (modified) (2 diffs)
• generator/default.properties (modified) (1 diff)
• generator/lib/behavior/query_cache (added)
• generator/lib/behavior/query_cache/QueryCacheBehavior.php (added)
• runtime/lib/query/Criteria.php (modified) (3 diffs)
• runtime/lib/query/ModelCriteria.php (modified) (1 diff)

branches/1.5/docs/guide/07-Behaviors.txt

@@ -136 +136 @@
 == Bundled Behaviors ==
 
-Propel currently bundles eight behaviors. Check the behavior documentation for details on usage:
+Propel currently bundles nine behaviors. Check the behavior documentation for details on usage:
 
  * [wiki:Users/Documentation/1.5/Behaviors/alternative_coding_standards alternative_coding_standards]
@@ -145 +145 @@
  * [wiki:Users/Documentation/1.5/Behaviors/sortable sortable]
  * [wiki:Users/Documentation/1.5/Behaviors/nested_set nested_set]
+ * [wiki:Users/Documentation/1.5/Behaviors/query_cache query_cache]
  * And [wiki:Users/Documentation/1.5/Inheritance#ConcreteTableInheritance concrete_inheritance], documented in the Inheritance Chapter even if it's a behavior
 

branches/1.5/generator/default.properties

@@ -255 +255 @@
 propel.behavior.sluggable.class = behavior.sluggable.SluggableBehavior
 propel.behavior.concrete_inheritance.class = behavior.concrete_inheritance.ConcreteInheritanceBehavior
+propel.behavior.query_cache.class = behavior.query_cache.QueryCacheBehavior

branches/1.5/runtime/lib/query/Criteria.php

@@ -210 +210 @@
 
   /**
-   * Get the criteria map.
+   * Get the criteria map, i.e. the array of Criterions
    * @return     array
    */
@@ -408 +408 @@
   public function getCriterion($column)
   {
-    if ( isset ( $this->map[$column] ) ) {
-      return $this->map[$column];
-    }
-    return null;
+    return $this->map[$column];
   }
   
@@ -1119 +1116 @@
     return $this->having;
   }
-
+  
   /**
    * Remove an object from the criteria.

branches/1.5/runtime/lib/query/ModelCriteria.php

@@ -1542 +1542 @@
     return $this->containsKey($key) ? $this->addAnd($key, $value, $comparison) : $this->add($key, $value, $comparison);
   }
+  
+  /**
+   * Get all the parameters to bind to this criteria
+   * Does part of the job of BasePeer::createSelectSql() for the cache
+   *
+   * @return    array list of parameters, each parameter being an array like
+   *                  array('table' => $realtable, 'column' => $column, 'value' => $value)
+   */
+  public function getParams()
+  {
+    $params = array();
+    $dbMap = Propel::getDatabaseMap($this->getDbName());
+
+    foreach ($this->getMap() as $criterion) {
+
+      $table = null;
+      foreach ($criterion->getAttachedCriterion() as $attachedCriterion) {
+        $tableName = $attachedCriterion->getTable();
+
+        $table = $this->getTableForAlias($tableName);
+        if (null === $table) {
+          $table = $tableName;
+        }
+
+        if (($this->isIgnoreCase() || $attachedCriterion->isIgnoreCase())
+        && $dbMap->getTable($table)->getColumn($attachedCriterion->getColumn())->isText()) {
+          $attachedCriterion->setIgnoreCase(true);
+        }
+      }
+
+      $sb = '';
+      $criterion->appendPsTo($sb, $params);
+    }
+
+    $having = $this->getHaving();
+    if ($having !== null) {
+      $sb = '';
+      $having->appendPsTo($sb, $params);
+    }
+
+    return $params;
+  }
 
   /**