Changeset 1583

Timestamp:

25.02.2010 15:03:39 (5 months ago)

Author:

francois

Message:

[1.5] Added more minor optimizations

Location:

branches/1.5/runtime/lib

Files:

• Propel.php (modified) (1 diff)
• config/PropelConfiguration.php (modified) (2 diffs)
• query/ModelCriteria.php (modified) (8 diffs)

branches/1.5/runtime/lib/Propel.php

@@ -460 +460 @@
                 }
 
-                if (!array_key_exists($name, self::$dbMaps)) {
+                if (!isset(self::$dbMaps[$name])) {
                         $clazz = self::$databaseMapClass;
                         self::$dbMaps[$name] = new $clazz($name);

branches/1.5/runtime/lib/config/PropelConfiguration.php

@@ -60 +60 @@
         public function offsetExists($offset)
         {
-                return isset($this->parameter[$offset]) || array_key_exists($offset, $this->parameters);
+                return array_key_exists($offset, $this->parameters);
         }
 
@@ -100 +100 @@
                 $parts = explode('.', $name); //name.space.name
                 while ($part = array_shift($parts)) {
-                        if (array_key_exists($part, $ret)) {
+                        if (isset($ret[$part])) {
                                 $ret = $ret[$part];
                         } else {

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

@@ -481 +481 @@
                 list($fullName, $relationAlias) = self::getClassAndAlias($relation);
                 if (strpos($fullName, '.') === false) {
-                        $tableMap = $this->getTableMap();
+                        // simple relation name, refers to the current table
                         $leftName = $this->getModelAliasOrName();
                         $relationName = $fullName;
                         $previousJoin = null;
+                        $tableMap = $this->getTableMap();
                 } else {
                         list($leftName, $relationName) = explode('.', $fullName);
@@ -491 +492 @@
                                 $previousJoin = null;
                                 $tableMap = $this->getTableMap();
-                        } elseif (array_key_exists($leftName, $this->joins)) {
+                        } elseif (isset($this->joins[$leftName])) {
                                 $previousJoin = $this->joins[$leftName];
                                 $tableMap = $previousJoin->getTableMap();
@@ -498 +499 @@
                         }
                 }
-                $leftTableAlias = array_key_exists($leftName, $this->aliases) ? $leftName : null;
+                $leftTableAlias = isset($this->aliases[$leftName]) ? $leftName : null;
                 
                 // find the RelationMap in the TableMap using the $relationName
@@ -589 +590 @@
         public function with($relation)
         {
-                if (!array_key_exists($relation, $this->joins)) {
+                if (!isset($this->joins[$relation])) {
                         throw new PropelException('Unknown relation name or alias ' . $relation);
                 }
@@ -665 +666 @@
         public function useQuery($relationName, $secondaryCriteriaClass = null)
         {
-                if (!array_key_exists($relationName, $this->joins)) {
+                if (!isset($this->joins[$relationName])) {
                         throw new PropelException('Unknown class or alias ' . $name);
                 }
@@ -691 +692 @@
         public function endUse()
         {
-                if (array_key_exists($this->modelAlias, $this->aliases)) {
+                if (isset($this->aliases[$this->modelAlias])) {
                         unset($this->aliases[$this->modelAlias]);
                 }
@@ -1451 +1452 @@
                         // column of the Criteria's model
                         $tableMap = $this->getTableMap();
-                } elseif (array_key_exists($class, $this->joins)) {
+                } elseif (isset($this->joins[$class])) {
                         // column of a relations's model
                         $tableMap = $this->joins[$class]->getTableMap();
@@ -1464 +1465 @@
                 if ($tableMap->hasColumnByPhpName($phpName)) {
                         $column = $tableMap->getColumnByPhpName($phpName);
-                        if (array_key_exists($class, $this->aliases)) {
+                        if (isset($this->aliases[$class])) {
                                 $this->currentAlias = $class;
                                 $realColumnName = $class . '.' . $column->getName();