Changeset 59

Timestamp:

26.12.2011 14:26:02 (5 months ago)

Author:

benjamin

Message:

ran propel-gen for 1.6.3

Location:

branches/Credentials/app

Files:

• config/classmap-syscpng-conf.php (modified) (1 diff)
• config/syscpng-conf.php (modified) (2 diffs)
• lib/propelom/map/CredentialTableMap.php (modified) (1 diff)
• lib/propelom/map/RoleTableMap.php (modified) (1 diff)
• lib/propelom/map/UserTableMap.php (modified) (1 diff)
• lib/propelom/om/BaseCredential.php (modified) (19 diffs)
• lib/propelom/om/BaseCredentialPeer.php (modified) (3 diffs)
• lib/propelom/om/BaseCredentialQuery.php (modified) (22 diffs)
• lib/propelom/om/BaseRole.php (modified) (17 diffs)
• lib/propelom/om/BaseRoleCredential.php (modified) (6 diffs)
• lib/propelom/om/BaseRoleCredentialPeer.php (modified) (10 diffs)
• lib/propelom/om/BaseRoleCredentialQuery.php (modified) (19 diffs)
• lib/propelom/om/BaseRolePeer.php (modified) (3 diffs)
• lib/propelom/om/BaseRoleQuery.php (modified) (20 diffs)
• lib/propelom/om/BaseUser.php (modified) (33 diffs)
• lib/propelom/om/BaseUserCredential.php (modified) (6 diffs)
• lib/propelom/om/BaseUserCredentialPeer.php (modified) (10 diffs)
• lib/propelom/om/BaseUserCredentialQuery.php (modified) (19 diffs)
• lib/propelom/om/BaseUserPeer.php (modified) (10 diffs)
• lib/propelom/om/BaseUserQuery.php (modified) (28 diffs)

branches/Credentials/app/config/classmap-syscpng-conf.php

@@ -1 +1 @@
 <?php
-// This file generated by Propel 1.6.1 convert-conf target
+// This file generated by Propel 1.6.3 convert-conf target
 return array (
   'BaseCredential' => 'propelom/om/BaseCredential.php',

branches/Credentials/app/config/syscpng-conf.php

@@ -1 +1 @@
 <?php
-// This file generated by Propel 1.6.1 convert-conf target
+// This file generated by Propel 1.6.3 convert-conf target
 // from XML runtime conf file /Users/benjamin/Workspaces/Projekte/SysCP-ng/dev/lib/propel/runtime-conf.xml
 $conf = array (
@@ -18 +18 @@
     'default' => 'syscpng',
   ),
-  'generator_version' => '1.6.1',
+  'generator_version' => '1.6.3',
 );
 $conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-syscpng-conf.php');

branches/Credentials/app/lib/propelom/map/CredentialTableMap.php

@@ -50 +50 @@
     public function buildRelations()
     {
-        $this->addRelation('RoleCredential', 'RoleCredential', RelationMap::ONE_TO_MANY, array('id' => 'credential_id', ), null, null);
-        $this->addRelation('UserCredential', 'UserCredential', RelationMap::ONE_TO_MANY, array('id' => 'credential_id', ), null, null);
-        $this->addRelation('Role', 'Role', RelationMap::MANY_TO_MANY, array(), null, null);
-        $this->addRelation('User', 'User', RelationMap::MANY_TO_MANY, array(), null, null);
+        $this->addRelation('RoleCredential', 'RoleCredential', RelationMap::ONE_TO_MANY, array('id' => 'credential_id', ), null, null, 'RoleCredentials');
+        $this->addRelation('UserCredential', 'UserCredential', RelationMap::ONE_TO_MANY, array('id' => 'credential_id', ), null, null, 'UserCredentials');
+        $this->addRelation('Role', 'Role', RelationMap::MANY_TO_MANY, array(), null, null, 'Roles');
+        $this->addRelation('User', 'User', RelationMap::MANY_TO_MANY, array(), null, null, 'Users');
     } // buildRelations()
 

branches/Credentials/app/lib/propelom/map/RoleTableMap.php

@@ -49 +49 @@
     public function buildRelations()
     {
-        $this->addRelation('User', 'User', RelationMap::ONE_TO_MANY, array('id' => 'role_id', ), null, null);
-        $this->addRelation('RoleCredential', 'RoleCredential', RelationMap::ONE_TO_MANY, array('id' => 'role_id', ), null, null);
-        $this->addRelation('Credential', 'Credential', RelationMap::MANY_TO_MANY, array(), null, null);
+        $this->addRelation('User', 'User', RelationMap::ONE_TO_MANY, array('id' => 'role_id', ), null, null, 'Users');
+        $this->addRelation('RoleCredential', 'RoleCredential', RelationMap::ONE_TO_MANY, array('id' => 'role_id', ), null, null, 'RoleCredentials');
+        $this->addRelation('Credential', 'Credential', RelationMap::MANY_TO_MANY, array(), null, null, 'Credentials');
     } // buildRelations()
 

branches/Credentials/app/lib/propelom/map/UserTableMap.php

@@ -59 +59 @@
     {
         $this->addRelation('Role', 'Role', RelationMap::MANY_TO_ONE, array('role_id' => 'id', ), null, null);
-        $this->addRelation('UserCredential', 'UserCredential', RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), null, null);
-        $this->addRelation('Credential', 'Credential', RelationMap::MANY_TO_MANY, array(), null, null);
+        $this->addRelation('UserCredential', 'UserCredential', RelationMap::ONE_TO_MANY, array('id' => 'user_id', ), null, null, 'UserCredentials');
+        $this->addRelation('Credential', 'Credential', RelationMap::MANY_TO_MANY, array(), null, null, 'Credentials');
     } // buildRelations()
 
     /**
-     * 
+     *
      * Gets the list of behaviors registered for this table
-     * 
+     *
      * @return array Associative array (name => parameters) of behaviors
      */

branches/Credentials/app/lib/propelom/om/BaseCredential.php

@@ -78 +78 @@
 
     /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $rolesScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $usersScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $roleCredentialsScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $userCredentialsScheduledForDeletion = null;
+
+    /**
      * Get the [id] column value.
      * 
@@ -302 +326 @@
         $con->beginTransaction();
         try {
+            $deleteQuery = CredentialQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
-                CredentialQuery::create()
-                    ->filterByPrimaryKey($this->getPrimaryKey())
-                    ->delete($con);
+                $deleteQuery->delete($con);
                 $this->postDelete($con);
                 $con->commit();
@@ -313 +337 @@
                 $con->commit();
             }
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -365 +389 @@
             $con->commit();
             return $affectedRows;
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -388 +412 @@
             $this->alreadyInSave = true;
 
-            if ($this->isNew() ) {
-                $this->modifiedColumns[] = CredentialPeer::ID;
-            }
-
-            // If this object has been modified, then save it to the database.
-            if ($this->isModified()) {
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
                 if ($this->isNew()) {
-                    $criteria = $this->buildCriteria();
-                    if ($criteria->keyContainsValue(CredentialPeer::ID) ) {
-                        throw new PropelException('Cannot insert a value for auto-increment primary key ('.CredentialPeer::ID.')');
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            if ($this->rolesScheduledForDeletion !== null) {
+                if (!$this->rolesScheduledForDeletion->isEmpty()) {
+                    RoleCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->rolesScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->rolesScheduledForDeletion = null;
+                }
+
+                foreach ($this->getRoles() as $role) {
+                    if ($role->isModified()) {
+                        $role->save($con);
                     }
-
-                    $pk = BasePeer::doInsert($criteria, $con);
-                    $affectedRows = 1;
-                    $this->setId($pk);  //[IMV] update autoincrement primary key
-                    $this->setNew(false);
-                } else {
-                    $affectedRows = CredentialPeer::doUpdate($this, $con);
-                }
-
-                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                }
+            }
+
+            if ($this->usersScheduledForDeletion !== null) {
+                if (!$this->usersScheduledForDeletion->isEmpty()) {
+                    UserCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->usersScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->usersScheduledForDeletion = null;
+                }
+
+                foreach ($this->getUsers() as $user) {
+                    if ($user->isModified()) {
+                        $user->save($con);
+                    }
+                }
+            }
+
+            if ($this->roleCredentialsScheduledForDeletion !== null) {
+                if (!$this->roleCredentialsScheduledForDeletion->isEmpty()) {
+                    RoleCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->roleCredentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->roleCredentialsScheduledForDeletion = null;
+                }
             }
 
@@ -419 +470 @@
             }
 
+            if ($this->userCredentialsScheduledForDeletion !== null) {
+                if (!$this->userCredentialsScheduledForDeletion->isEmpty()) {
+                    UserCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->userCredentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->userCredentialsScheduledForDeletion = null;
+                }
+            }
+
             if ($this->collUserCredentials !== null) {
                 foreach ($this->collUserCredentials as $referrerFK) {
@@ -432 +492 @@
         return $affectedRows;
     } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    protected function doInsert(PropelPDO $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = CredentialPeer::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . CredentialPeer::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(CredentialPeer::ID)) {
+            $modifiedColumns[':p' . $index++]  = '`ID`';
+        }
+        if ($this->isColumnModified(CredentialPeer::MODULE)) {
+            $modifiedColumns[':p' . $index++]  = '`MODULE`';
+        }
+        if ($this->isColumnModified(CredentialPeer::VALUE)) {
+            $modifiedColumns[':p' . $index++]  = '`VALUE`';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO `credential` (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case '`ID`':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case '`MODULE`':
+                        $stmt->bindValue($identifier, $this->module, PDO::PARAM_STR);
+                        break;
+                    case '`VALUE`':
+                        $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @see        doSave()
+     */
+    protected function doUpdate(PropelPDO $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+        BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con);
+    }
 
     /**
@@ -808 +948 @@
     /**
      * Initializes a collection based on the name of a relation.
-     * Avoids crafting an 'init[$relationName]s' method name 
+     * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
@@ -893 +1033 @@
 
     /**
+     * Sets a collection of RoleCredential objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $roleCredentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setRoleCredentials(PropelCollection $roleCredentials, PropelPDO $con = null)
+    {
+        $this->roleCredentialsScheduledForDeletion = $this->getRoleCredentials(new Criteria(), $con)->diff($roleCredentials);
+
+        foreach ($roleCredentials as $roleCredential) {
+            // Fix issue with collection modified by reference
+            if ($roleCredential->isNew()) {
+                $roleCredential->setCredential($this);
+            }
+            $this->addRoleCredential($roleCredential);
+        }
+
+        $this->collRoleCredentials = $roleCredentials;
+    }
+
+    /**
      * Returns the number of related RoleCredential objects.
      *
@@ -925 +1089 @@
      *
      * @param      RoleCredential $l RoleCredential
-     * @return     void
-     * @throws     PropelException
+     * @return     Credential The current object (for fluent API support)
      */
     public function addRoleCredential(RoleCredential $l)
@@ -934 +1097 @@
         }
         if (!$this->collRoleCredentials->contains($l)) { // only add it if the **same** object is not already associated
-            $this->collRoleCredentials[]= $l;
-            $l->setCredential($this);
-        }
+            $this->doAddRoleCredential($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param   RoleCredential $roleCredential The roleCredential object to add.
+     */
+    protected function doAddRoleCredential($roleCredential)
+    {
+        $this->collRoleCredentials[]= $roleCredential;
+        $roleCredential->setCredential($this);
     }
 
@@ -1033 +1206 @@
 
     /**
+     * Sets a collection of UserCredential objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $userCredentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setUserCredentials(PropelCollection $userCredentials, PropelPDO $con = null)
+    {
+        $this->userCredentialsScheduledForDeletion = $this->getUserCredentials(new Criteria(), $con)->diff($userCredentials);
+
+        foreach ($userCredentials as $userCredential) {
+            // Fix issue with collection modified by reference
+            if ($userCredential->isNew()) {
+                $userCredential->setCredential($this);
+            }
+            $this->addUserCredential($userCredential);
+        }
+
+        $this->collUserCredentials = $userCredentials;
+    }
+
+    /**
      * Returns the number of related UserCredential objects.
      *
@@ -1065 +1262 @@
      *
      * @param      UserCredential $l UserCredential
-     * @return     void
-     * @throws     PropelException
+     * @return     Credential The current object (for fluent API support)
      */
     public function addUserCredential(UserCredential $l)
@@ -1074 +1270 @@
         }
         if (!$this->collUserCredentials->contains($l)) { // only add it if the **same** object is not already associated
-            $this->collUserCredentials[]= $l;
-            $l->setCredential($this);
-        }
+            $this->doAddUserCredential($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param   UserCredential $userCredential The userCredential object to add.
+     */
+    protected function doAddUserCredential($userCredential)
+    {
+        $this->collUserCredentials[]= $userCredential;
+        $userCredential->setCredential($this);
     }
 
@@ -1168 +1374 @@
 
     /**
+     * Sets a collection of Role objects related by a many-to-many relationship
+     * to the current object by way of the role_credential cross-reference table.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $roles A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setRoles(PropelCollection $roles, PropelPDO $con = null)
+    {
+        $roleCredentials = RoleCredentialQuery::create()
+            ->filterByRole($roles)
+            ->filterByCredential($this)
+            ->find($con);
+
+        $this->rolesScheduledForDeletion = $this->getRoleCredentials()->diff($roleCredentials);
+        $this->collRoleCredentials = $roleCredentials;
+
+        foreach ($roles as $role) {
+            // Fix issue with collection modified by reference
+            if ($role->isNew()) {
+                $this->doAddRole($role);
+            } else {
+                $this->addRole($role);
+            }
+        }
+
+        $this->collRoles = $roles;
+    }
+
+    /**
      * Gets the number of Role objects related by a many-to-many relationship
      * to the current object by way of the role_credential cross-reference table.
@@ -1209 +1446 @@
         }
         if (!$this->collRoles->contains($role)) { // only add it if the **same** object is not already associated
-            $roleCredential = new RoleCredential();
-            $roleCredential->setRole($role);
-            $this->addRoleCredential($roleCredential);
+            $this->doAddRole($role);
 
             $this->collRoles[]= $role;
         }
+    }
+
+    /**
+     * @param   Role $role The role object to add.
+     */
+    protected function doAddRole($role)
+    {
+        $roleCredential = new RoleCredential();
+        $roleCredential->setRole($role);
+        $this->addRoleCredential($roleCredential);
     }
 
@@ -1281 +1526 @@
 
     /**
+     * Sets a collection of User objects related by a many-to-many relationship
+     * to the current object by way of the user_credential cross-reference table.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $users A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setUsers(PropelCollection $users, PropelPDO $con = null)
+    {
+        $userCredentials = UserCredentialQuery::create()
+            ->filterByUser($users)
+            ->filterByCredential($this)
+            ->find($con);
+
+        $this->usersScheduledForDeletion = $this->getUserCredentials()->diff($userCredentials);
+        $this->collUserCredentials = $userCredentials;
+
+        foreach ($users as $user) {
+            // Fix issue with collection modified by reference
+            if ($user->isNew()) {
+                $this->doAddUser($user);
+            } else {
+                $this->addUser($user);
+            }
+        }
+
+        $this->collUsers = $users;
+    }
+
+    /**
      * Gets the number of User objects related by a many-to-many relationship
      * to the current object by way of the user_credential cross-reference table.
@@ -1322 +1598 @@
         }
         if (!$this->collUsers->contains($user)) { // only add it if the **same** object is not already associated
-            $userCredential = new UserCredential();
-            $userCredential->setUser($user);
-            $this->addUserCredential($userCredential);
+            $this->doAddUser($user);
 
             $this->collUsers[]= $user;
         }
+    }
+
+    /**
+     * @param   User $user The user object to add.
+     */
+    protected function doAddUser($user)
+    {
+        $userCredential = new UserCredential();
+        $userCredential->setUser($user);
+        $this->addUserCredential($userCredential);
     }
 
@@ -1408 +1692 @@
     }
 
-    /**
-     * Catches calls to virtual methods
-     */
-    public function __call($name, $params)
-    {
-        if (preg_match('/get(\w+)/', $name, $matches)) {
-            $virtualColumn = $matches[1];
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-            // no lcfirst in php<5.3...
-            $virtualColumn[0] = strtolower($virtualColumn[0]);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-        return parent::__call($name, $params);
-    }
-
 } // BaseCredential

branches/Credentials/app/lib/propelom/om/BaseCredentialPeer.php

@@ -25 +25 @@
     /** the related TableMap class for this table */
     const TM_CLASS = 'CredentialTableMap';
-    
+
     /** The total number of columns. */
     const NUM_COLUMNS = 3;
@@ -46 +46 @@
     /** The default string format for model objects of the related table **/
     const DEFAULT_STRING_FORMAT = 'YAML';
-    
+
     /**
      * An identiy map to hold any loaded instances of Credential objects.
@@ -377 +377 @@
 
     /**
-     * Retrieves the primary key from the DB resultset row 
+     * Retrieves the primary key from the DB resultset row
      * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
      * a multi-column primary key, an array of the primary key columns will be returned.

branches/Credentials/app/lib/propelom/om/BaseCredentialQuery.php

@@ -42 +42 @@
 abstract class BaseCredentialQuery extends ModelCriteria
 {
-
+    
     /**
      * Initializes internal state of BaseCredentialQuery object.
@@ -79 +79 @@
 
     /**
-     * Find object by primary key
-     * Use instance pooling to avoid a database query if the object exists
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
      * <code>
      * $obj  = $c->findPk(12, $con);
      * </code>
+     *
      * @param     mixed $key Primary key to use for the query
      * @param     PropelPDO $con an optional connection object
@@ -91 +94 @@
     public function findPk($key, $con = null)
     {
-        if ((null !== ($obj = CredentialPeer::getInstanceFromPool((string) $key))) && $this->getFormatter()->isObjectFormatter()) {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = CredentialPeer::getInstanceFromPool((string) $key))) && !$this->formatter) {
             // the object is alredy in the instance pool
             return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getConnection(CredentialPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
         } else {
-            // the object has not been requested yet, or the formatter is not an object formatter
-            $criteria = $this->isKeepQuery() ? clone $this : $this;
-            $stmt = $criteria
-                ->filterByPrimaryKey($key)
-                ->getSelectStatement($con);
-            return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
-        }
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    Credential A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT `ID`, `MODULE`, `VALUE` FROM `credential` WHERE `ID` = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+            $obj = new Credential();
+            $obj->hydrate($row);
+            CredentialPeer::addInstanceToPool($obj, (string) $row[0]);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    Credential|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $stmt = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
     }
 
@@ -116 +175 @@
     public function findPks($keys, $con = null)
     {
+        if ($con === null) {
+            $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
         $criteria = $this->isKeepQuery() ? clone $this : $this;
-        return $this
+        $stmt = $criteria
             ->filterByPrimaryKeys($keys)
-            ->find($con);
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->format($stmt);
     }
 
@@ -148 +212 @@
     /**
      * Filter the query on the id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -174 +238 @@
     /**
      * Filter the query on the module column
-     * 
+     *
      * Example usage:
      * <code>
@@ -202 +266 @@
     /**
      * Filter the query on the value column
-     * 
+     *
      * Example usage:
      * <code>
@@ -244 +308 @@
             return $this
                 ->useRoleCredentialQuery()
-                    ->filterByPrimaryKeys($roleCredential->getPrimaryKeys())
+                ->filterByPrimaryKeys($roleCredential->getPrimaryKeys())
                 ->endUse();
         } else {
@@ -253 +317 @@
     /**
      * Adds a JOIN clause to the query using the RoleCredential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -263 +327 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('RoleCredential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -271 +335 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -279 +343 @@
             $this->addJoinObject($join, 'RoleCredential');
         }
-        
+
         return $this;
     }
@@ -287 +351 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -317 +381 @@
             return $this
                 ->useUserCredentialQuery()
-                    ->filterByPrimaryKeys($userCredential->getPrimaryKeys())
+                ->filterByPrimaryKeys($userCredential->getPrimaryKeys())
                 ->endUse();
         } else {
@@ -326 +390 @@
     /**
      * Adds a JOIN clause to the query using the UserCredential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -336 +400 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('UserCredential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -344 +408 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -352 +416 @@
             $this->addJoinObject($join, 'UserCredential');
         }
-        
+
         return $this;
     }
@@ -360 +424 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -387 +451 @@
         return $this
             ->useRoleCredentialQuery()
-                ->filterByRole($role, $comparison)
+            ->filterByRole($role, $comparison)
             ->endUse();
     }
-    
+
     /**
      * Filter the query by a related User object
@@ -404 +468 @@
         return $this
             ->useUserCredentialQuery()
-                ->filterByUser($user, $comparison)
+            ->filterByUser($user, $comparison)
             ->endUse();
     }
-    
+
     /**
      * Exclude object from result
@@ -419 +483 @@
         if ($credential) {
             $this->addUsingAlias(CredentialPeer::ID, $credential->getId(), Criteria::NOT_EQUAL);
-      }
-      
+        }
+
         return $this;
     }

branches/Credentials/app/lib/propelom/om/BaseRole.php

@@ -67 +67 @@
 
     /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $credentialsScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $usersScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $roleCredentialsScheduledForDeletion = null;
+
+    /**
      * Get the [id] column value.
      * 
@@ -259 +277 @@
         $con->beginTransaction();
         try {
+            $deleteQuery = RoleQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
-                RoleQuery::create()
-                    ->filterByPrimaryKey($this->getPrimaryKey())
-                    ->delete($con);
+                $deleteQuery->delete($con);
                 $this->postDelete($con);
                 $con->commit();
@@ -270 +288 @@
                 $con->commit();
             }
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -322 +340 @@
             $con->commit();
             return $affectedRows;
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -345 +363 @@
             $this->alreadyInSave = true;
 
-            if ($this->isNew() ) {
-                $this->modifiedColumns[] = RolePeer::ID;
-            }
-
-            // If this object has been modified, then save it to the database.
-            if ($this->isModified()) {
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
                 if ($this->isNew()) {
-                    $criteria = $this->buildCriteria();
-                    if ($criteria->keyContainsValue(RolePeer::ID) ) {
-                        throw new PropelException('Cannot insert a value for auto-increment primary key ('.RolePeer::ID.')');
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            if ($this->credentialsScheduledForDeletion !== null) {
+                if (!$this->credentialsScheduledForDeletion->isEmpty()) {
+                    RoleCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->credentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->credentialsScheduledForDeletion = null;
+                }
+
+                foreach ($this->getCredentials() as $credential) {
+                    if ($credential->isModified()) {
+                        $credential->save($con);
                     }
-
-                    $pk = BasePeer::doInsert($criteria, $con);
-                    $affectedRows = 1;
-                    $this->setId($pk);  //[IMV] update autoincrement primary key
-                    $this->setNew(false);
-                } else {
-                    $affectedRows = RolePeer::doUpdate($this, $con);
-                }
-
-                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                }
+            }
+
+            if ($this->usersScheduledForDeletion !== null) {
+                if (!$this->usersScheduledForDeletion->isEmpty()) {
+                    UserQuery::create()
+                        ->filterByPrimaryKeys($this->usersScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->usersScheduledForDeletion = null;
+                }
             }
 
@@ -376 +406 @@
             }
 
+            if ($this->roleCredentialsScheduledForDeletion !== null) {
+                if (!$this->roleCredentialsScheduledForDeletion->isEmpty()) {
+                    RoleCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->roleCredentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->roleCredentialsScheduledForDeletion = null;
+                }
+            }
+
             if ($this->collRoleCredentials !== null) {
                 foreach ($this->collRoleCredentials as $referrerFK) {
@@ -389 +428 @@
         return $affectedRows;
     } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    protected function doInsert(PropelPDO $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = RolePeer::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . RolePeer::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(RolePeer::ID)) {
+            $modifiedColumns[':p' . $index++]  = '`ID`';
+        }
+        if ($this->isColumnModified(RolePeer::ROLENAME)) {
+            $modifiedColumns[':p' . $index++]  = '`ROLENAME`';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO `role` (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case '`ID`':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case '`ROLENAME`':
+                        $stmt->bindValue($identifier, $this->rolename, PDO::PARAM_STR);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @see        doSave()
+     */
+    protected function doUpdate(PropelPDO $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+        BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con);
+    }
 
     /**
@@ -755 +868 @@
     /**
      * Initializes a collection based on the name of a relation.
-     * Avoids crafting an 'init[$relationName]s' method name 
+     * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
@@ -840 +953 @@
 
     /**
+     * Sets a collection of User objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $users A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setUsers(PropelCollection $users, PropelPDO $con = null)
+    {
+        $this->usersScheduledForDeletion = $this->getUsers(new Criteria(), $con)->diff($users);
+
+        foreach ($users as $user) {
+            // Fix issue with collection modified by reference
+            if ($user->isNew()) {
+                $user->setRole($this);
+            }
+            $this->addUser($user);
+        }
+
+        $this->collUsers = $users;
+    }
+
+    /**
      * Returns the number of related User objects.
      *
@@ -872 +1009 @@
      *
      * @param      User $l User
-     * @return     void
-     * @throws     PropelException
+     * @return     Role The current object (for fluent API support)
      */
     public function addUser(User $l)
@@ -881 +1017 @@
         }
         if (!$this->collUsers->contains($l)) { // only add it if the **same** object is not already associated
-            $this->collUsers[]= $l;
-            $l->setRole($this);
-        }
+            $this->doAddUser($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param   User $user The user object to add.
+     */
+    protected function doAddUser($user)
+    {
+        $this->collUsers[]= $user;
+        $user->setRole($this);
     }
 
@@ -955 +1101 @@
 
     /**
+     * Sets a collection of RoleCredential objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $roleCredentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setRoleCredentials(PropelCollection $roleCredentials, PropelPDO $con = null)
+    {
+        $this->roleCredentialsScheduledForDeletion = $this->getRoleCredentials(new Criteria(), $con)->diff($roleCredentials);
+
+        foreach ($roleCredentials as $roleCredential) {
+            // Fix issue with collection modified by reference
+            if ($roleCredential->isNew()) {
+                $roleCredential->setRole($this);
+            }
+            $this->addRoleCredential($roleCredential);
+        }
+
+        $this->collRoleCredentials = $roleCredentials;
+    }
+
+    /**
      * Returns the number of related RoleCredential objects.
      *
@@ -987 +1157 @@
      *
      * @param      RoleCredential $l RoleCredential
-     * @return     void
-     * @throws     PropelException
+     * @return     Role The current object (for fluent API support)
      */
     public function addRoleCredential(RoleCredential $l)
@@ -996 +1165 @@
         }
         if (!$this->collRoleCredentials->contains($l)) { // only add it if the **same** object is not already associated
-            $this->collRoleCredentials[]= $l;
-            $l->setRole($this);
-        }
+            $this->doAddRoleCredential($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param   RoleCredential $roleCredential The roleCredential object to add.
+     */
+    protected function doAddRoleCredential($roleCredential)
+    {
+        $this->collRoleCredentials[]= $roleCredential;
+        $roleCredential->setRole($this);
     }
 
@@ -1090 +1269 @@
 
     /**
+     * Sets a collection of Credential objects related by a many-to-many relationship
+     * to the current object by way of the role_credential cross-reference table.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $credentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setCredentials(PropelCollection $credentials, PropelPDO $con = null)
+    {
+        $roleCredentials = RoleCredentialQuery::create()
+            ->filterByCredential($credentials)
+            ->filterByRole($this)
+            ->find($con);
+
+        $this->credentialsScheduledForDeletion = $this->getRoleCredentials()->diff($roleCredentials);
+        $this->collRoleCredentials = $roleCredentials;
+
+        foreach ($credentials as $credential) {
+            // Fix issue with collection modified by reference
+            if ($credential->isNew()) {
+                $this->doAddCredential($credential);
+            } else {
+                $this->addCredential($credential);
+            }
+        }
+
+        $this->collCredentials = $credentials;
+    }
+
+    /**
      * Gets the number of Credential objects related by a many-to-many relationship
      * to the current object by way of the role_credential cross-reference table.
@@ -1131 +1341 @@
         }
         if (!$this->collCredentials->contains($credential)) { // only add it if the **same** object is not already associated
-            $roleCredential = new RoleCredential();
-            $roleCredential->setCredential($credential);
-            $this->addRoleCredential($roleCredential);
+            $this->doAddCredential($credential);
 
             $this->collCredentials[]= $credential;
         }
+    }
+
+    /**
+     * @param   Credential $credential The credential object to add.
+     */
+    protected function doAddCredential($credential)
+    {
+        $roleCredential = new RoleCredential();
+        $roleCredential->setCredential($credential);
+        $this->addRoleCredential($roleCredential);
     }
 
@@ -1207 +1425 @@
     }
 
-    /**
-     * Catches calls to virtual methods
-     */
-    public function __call($name, $params)
-    {
-        if (preg_match('/get(\w+)/', $name, $matches)) {
-            $virtualColumn = $matches[1];
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-            // no lcfirst in php<5.3...
-            $virtualColumn[0] = strtolower($virtualColumn[0]);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-        return parent::__call($name, $params);
-    }
-
 } // BaseRole

branches/Credentials/app/lib/propelom/om/BaseRoleCredential.php

@@ -265 +265 @@
         $con->beginTransaction();
         try {
+            $deleteQuery = RoleCredentialQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
-                RoleCredentialQuery::create()
-                    ->filterByPrimaryKey($this->getPrimaryKey())
-                    ->delete($con);
+                $deleteQuery->delete($con);
                 $this->postDelete($con);
                 $con->commit();
@@ -276 +276 @@
                 $con->commit();
             }
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -328 +328 @@
             $con->commit();
             return $affectedRows;
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -370 +370 @@
             }
 
-
-            // If this object has been modified, then save it to the database.
-            if ($this->isModified()) {
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
                 if ($this->isNew()) {
-                    $criteria = $this->buildCriteria();
-                    $pk = BasePeer::doInsert($criteria, $con);
-                    $affectedRows += 1;
-                    $this->setNew(false);
+                    $this->doInsert($con);
                 } else {
-                    $affectedRows += RoleCredentialPeer::doUpdate($this, $con);
+                    $this->doUpdate($con);
                 }
-
-                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                $affectedRows += 1;
+                $this->resetModified();
             }
 
@@ -390 +386 @@
         return $affectedRows;
     } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    protected function doInsert(PropelPDO $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(RoleCredentialPeer::ROLE_ID)) {
+            $modifiedColumns[':p' . $index++]  = '`ROLE_ID`';
+        }
+        if ($this->isColumnModified(RoleCredentialPeer::CREDENTIAL_ID)) {
+            $modifiedColumns[':p' . $index++]  = '`CREDENTIAL_ID`';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO `role_credential` (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case '`ROLE_ID`':
+                        $stmt->bindValue($identifier, $this->role_id, PDO::PARAM_INT);
+                        break;
+                    case '`CREDENTIAL_ID`':
+                        $stmt->bindValue($identifier, $this->credential_id, PDO::PARAM_INT);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e);
+        }
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @see        doSave()
+     */
+    protected function doUpdate(PropelPDO $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+        BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con);
+    }
 
     /**
@@ -883 +942 @@
     }
 
-    /**
-     * Catches calls to virtual methods
-     */
-    public function __call($name, $params)
-    {
-        if (preg_match('/get(\w+)/', $name, $matches)) {
-            $virtualColumn = $matches[1];
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-            // no lcfirst in php<5.3...
-            $virtualColumn[0] = strtolower($virtualColumn[0]);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-        return parent::__call($name, $params);
-    }
-
 } // BaseRoleCredential

branches/Credentials/app/lib/propelom/om/BaseRoleCredentialPeer.php

@@ -25 +25 @@
     /** the related TableMap class for this table */
     const TM_CLASS = 'RoleCredentialTableMap';
-    
+
     /** The total number of columns. */
     const NUM_COLUMNS = 2;
@@ -43 +43 @@
     /** The default string format for model objects of the related table **/
     const DEFAULT_STRING_FORMAT = 'YAML';
-    
+
     /**
      * An identiy map to hold any loaded instances of RoleCredential objects.
@@ -372 +372 @@
 
     /**
-     * Retrieves the primary key from the DB resultset row 
+     * Retrieves the primary key from the DB resultset row
      * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
      * a multi-column primary key, an array of the primary key columns will be returned.
@@ -469 +469 @@
             RoleCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -519 +519 @@
             RoleCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -701 +701 @@
             RoleCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -836 +836 @@
         // tables go into the FROM clause.
         $criteria->setPrimaryTableName(RoleCredentialPeer::TABLE_NAME);
-        
+
         if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
             $criteria->setDistinct();
@@ -844 +844 @@
             RoleCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY should not affect count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -886 +886 @@
         // tables go into the FROM clause.
         $criteria->setPrimaryTableName(RoleCredentialPeer::TABLE_NAME);
-        
+
         if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
             $criteria->setDistinct();
@@ -894 +894 @@
             RoleCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY should not affect count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);

branches/Credentials/app/lib/propelom/om/BaseRoleCredentialQuery.php

@@ -38 +38 @@
 abstract class BaseRoleCredentialQuery extends ModelCriteria
 {
-
+    
     /**
      * Initializes internal state of BaseRoleCredentialQuery object.
@@ -75 +75 @@
 
     /**
-     * Find object by primary key
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
      * <code>
      * $obj = $c->findPk(array(12, 34), $con);
      * </code>
+     *
      * @param     array[$role_id, $credential_id] $key Primary key to use for the query
      * @param     PropelPDO $con an optional connection object
@@ -86 +90 @@
     public function findPk($key, $con = null)
     {
-        if ((null !== ($obj = RoleCredentialPeer::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && $this->getFormatter()->isObjectFormatter()) {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = RoleCredentialPeer::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
             // the object is alredy in the instance pool
             return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getConnection(RoleCredentialPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
         } else {
-            // the object has not been requested yet, or the formatter is not an object formatter
-            $criteria = $this->isKeepQuery() ? clone $this : $this;
-            $stmt = $criteria
-                ->filterByPrimaryKey($key)
-                ->getSelectStatement($con);
-            return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
-        }
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    RoleCredential A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT `ROLE_ID`, `CREDENTIAL_ID` FROM `role_credential` WHERE `ROLE_ID` = :p0 AND `CREDENTIAL_ID` = :p1';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
+            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+            $obj = new RoleCredential();
+            $obj->hydrate($row);
+            RoleCredentialPeer::addInstanceToPool($obj, serialize(array((string) $row[0], (string) $row[1])));
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    RoleCredential|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $stmt = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
     }
 
@@ -111 +172 @@
     public function findPks($keys, $con = null)
     {
+        if ($con === null) {
+            $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
         $criteria = $this->isKeepQuery() ? clone $this : $this;
-        return $this
+        $stmt = $criteria
             ->filterByPrimaryKeys($keys)
-            ->find($con);
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->format($stmt);
     }
 
@@ -128 +194 @@
         $this->addUsingAlias(RoleCredentialPeer::ROLE_ID, $key[0], Criteria::EQUAL);
         $this->addUsingAlias(RoleCredentialPeer::CREDENTIAL_ID, $key[1], Criteria::EQUAL);
-        
+
         return $this;
     }
@@ -150 +216 @@
             $this->addOr($cton0);
         }
-        
+
         return $this;
     }
@@ -156 +222 @@
     /**
      * Filter the query on the role_id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -184 +250 @@
     /**
      * Filter the query on the credential_id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -236 +302 @@
     /**
      * Adds a JOIN clause to the query using the Role relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -246 +312 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Role');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -254 +320 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -262 +328 @@
             $this->addJoinObject($join, 'Role');
         }
-        
+
         return $this;
     }
@@ -270 +336 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -310 +376 @@
     /**
      * Adds a JOIN clause to the query using the Credential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -320 +386 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Credential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -328 +394 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -336 +402 @@
             $this->addJoinObject($join, 'Credential');
         }
-        
+
         return $this;
     }
@@ -344 +410 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -371 +437 @@
             $this->addCond('pruneCond1', $this->getAliasedColName(RoleCredentialPeer::CREDENTIAL_ID), $roleCredential->getCredentialId(), Criteria::NOT_EQUAL);
             $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
-      }
-      
+        }
+
         return $this;
     }

branches/Credentials/app/lib/propelom/om/BaseRolePeer.php

@@ -25 +25 @@
     /** the related TableMap class for this table */
     const TM_CLASS = 'RoleTableMap';
-    
+
     /** The total number of columns. */
     const NUM_COLUMNS = 2;
@@ -43 +43 @@
     /** The default string format for model objects of the related table **/
     const DEFAULT_STRING_FORMAT = 'YAML';
-    
+
     /**
      * An identiy map to hold any loaded instances of Role objects.
@@ -372 +372 @@
 
     /**
-     * Retrieves the primary key from the DB resultset row 
+     * Retrieves the primary key from the DB resultset row
      * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
      * a multi-column primary key, an array of the primary key columns will be returned.

branches/Credentials/app/lib/propelom/om/BaseRoleQuery.php

@@ -38 +38 @@
 abstract class BaseRoleQuery extends ModelCriteria
 {
-
+    
     /**
      * Initializes internal state of BaseRoleQuery object.
@@ -75 +75 @@
 
     /**
-     * Find object by primary key
-     * Use instance pooling to avoid a database query if the object exists
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
      * <code>
      * $obj  = $c->findPk(12, $con);
      * </code>
+     *
      * @param     mixed $key Primary key to use for the query
      * @param     PropelPDO $con an optional connection object
@@ -87 +90 @@
     public function findPk($key, $con = null)
     {
-        if ((null !== ($obj = RolePeer::getInstanceFromPool((string) $key))) && $this->getFormatter()->isObjectFormatter()) {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = RolePeer::getInstanceFromPool((string) $key))) && !$this->formatter) {
             // the object is alredy in the instance pool
             return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getConnection(RolePeer::DATABASE_NAME, Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
         } else {
-            // the object has not been requested yet, or the formatter is not an object formatter
-            $criteria = $this->isKeepQuery() ? clone $this : $this;
-            $stmt = $criteria
-                ->filterByPrimaryKey($key)
-                ->getSelectStatement($con);
-            return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
-        }
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    Role A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT `ID`, `ROLENAME` FROM `role` WHERE `ID` = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+            $obj = new Role();
+            $obj->hydrate($row);
+            RolePeer::addInstanceToPool($obj, (string) $row[0]);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    Role|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $stmt = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
     }
 
@@ -112 +171 @@
     public function findPks($keys, $con = null)
     {
+        if ($con === null) {
+            $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
         $criteria = $this->isKeepQuery() ? clone $this : $this;
-        return $this
+        $stmt = $criteria
             ->filterByPrimaryKeys($keys)
-            ->find($con);
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->format($stmt);
     }
 
@@ -144 +208 @@
     /**
      * Filter the query on the id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -170 +234 @@
     /**
      * Filter the query on the rolename column
-     * 
+     *
      * Example usage:
      * <code>
@@ -212 +276 @@
             return $this
                 ->useUserQuery()
-                    ->filterByPrimaryKeys($user->getPrimaryKeys())
+                ->filterByPrimaryKeys($user->getPrimaryKeys())
                 ->endUse();
         } else {
@@ -221 +285 @@
     /**
      * Adds a JOIN clause to the query using the User relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -231 +295 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('User');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -239 +303 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -247 +311 @@
             $this->addJoinObject($join, 'User');
         }
-        
+
         return $this;
     }
@@ -255 +319 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -285 +349 @@
             return $this
                 ->useRoleCredentialQuery()
-                    ->filterByPrimaryKeys($roleCredential->getPrimaryKeys())
+                ->filterByPrimaryKeys($roleCredential->getPrimaryKeys())
                 ->endUse();
         } else {
@@ -294 +358 @@
     /**
      * Adds a JOIN clause to the query using the RoleCredential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -304 +368 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('RoleCredential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -312 +376 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -320 +384 @@
             $this->addJoinObject($join, 'RoleCredential');
         }
-        
+
         return $this;
     }
@@ -328 +392 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -355 +419 @@
         return $this
             ->useRoleCredentialQuery()
-                ->filterByCredential($credential, $comparison)
+            ->filterByCredential($credential, $comparison)
             ->endUse();
     }
-    
+
     /**
      * Exclude object from result
@@ -370 +434 @@
         if ($role) {
             $this->addUsingAlias(RolePeer::ID, $role->getId(), Criteria::NOT_EQUAL);
-      }
-      
+        }
+
         return $this;
     }

branches/Credentials/app/lib/propelom/om/BaseUser.php

@@ -143 +143 @@
 
     /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $credentialsScheduledForDeletion = null;
+
+    /**
+     * An array of objects scheduled for deletion.
+     * @var     array
+     */
+    protected $userCredentialsScheduledForDeletion = null;
+
+    /**
      * Applies default values to this object.
      * This method should be called from the object's constructor (or
@@ -437 +449 @@
         }
 
-        if ($this->login_failure_count !== $v || $this->isNew()) {
+        if ($this->login_failure_count !== $v) {
             $this->login_failure_count = $v;
             $this->modifiedColumns[] = UserPeer::LOGIN_FAILURE_COUNT;
@@ -675 +687 @@
         $con->beginTransaction();
         try {
+            $deleteQuery = UserQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             // nested_set behavior
@@ -686 +700 @@
 
             if ($ret) {
-                UserQuery::create()
-                    ->filterByPrimaryKey($this->getPrimaryKey())
-                    ->delete($con);
+                $deleteQuery->delete($con);
                 $this->postDelete($con);
                 // nested_set behavior
@@ -701 +713 @@
                 $con->commit();
             }
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -764 +776 @@
             $con->commit();
             return $affectedRows;
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -799 +811 @@
             }
 
-            if ($this->isNew() ) {
-                $this->modifiedColumns[] = UserPeer::ID;
-            }
-
-            // If this object has been modified, then save it to the database.
-            if ($this->isModified()) {
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
                 if ($this->isNew()) {
-                    $criteria = $this->buildCriteria();
-                    if ($criteria->keyContainsValue(UserPeer::ID) ) {
-                        throw new PropelException('Cannot insert a value for auto-increment primary key ('.UserPeer::ID.')');
+                    $this->doInsert($con);
+                } else {
+                    $this->doUpdate($con);
+                }
+                $affectedRows += 1;
+                $this->resetModified();
+            }
+
+            if ($this->credentialsScheduledForDeletion !== null) {
+                if (!$this->credentialsScheduledForDeletion->isEmpty()) {
+                    UserCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->credentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->credentialsScheduledForDeletion = null;
+                }
+
+                foreach ($this->getCredentials() as $credential) {
+                    if ($credential->isModified()) {
+                        $credential->save($con);
                     }
-
-                    $pk = BasePeer::doInsert($criteria, $con);
-                    $affectedRows += 1;
-                    $this->setId($pk);  //[IMV] update autoincrement primary key
-                    $this->setNew(false);
-                } else {
-                    $affectedRows += UserPeer::doUpdate($this, $con);
                 }
-
-                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+            }
+
+            if ($this->userCredentialsScheduledForDeletion !== null) {
+                if (!$this->userCredentialsScheduledForDeletion->isEmpty()) {
+                    UserCredentialQuery::create()
+                        ->filterByPrimaryKeys($this->userCredentialsScheduledForDeletion->getPrimaryKeys(false))
+                        ->delete($con);
+                    $this->userCredentialsScheduledForDeletion = null;
+                }
             }
 
@@ -835 +859 @@
         return $affectedRows;
     } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    protected function doInsert(PropelPDO $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+        $this->modifiedColumns[] = UserPeer::ID;
+        if (null !== $this->id) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key (' . UserPeer::ID . ')');
+        }
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(UserPeer::ID)) {
+            $modifiedColumns[':p' . $index++]  = '`ID`';
+        }
+        if ($this->isColumnModified(UserPeer::USERNAME)) {
+            $modifiedColumns[':p' . $index++]  = '`USERNAME`';
+        }
+        if ($this->isColumnModified(UserPeer::EMAIL)) {
+            $modifiedColumns[':p' . $index++]  = '`EMAIL`';
+        }
+        if ($this->isColumnModified(UserPeer::SALT)) {
+            $modifiedColumns[':p' . $index++]  = '`SALT`';
+        }
+        if ($this->isColumnModified(UserPeer::PASSWORD)) {
+            $modifiedColumns[':p' . $index++]  = '`PASSWORD`';
+        }
+        if ($this->isColumnModified(UserPeer::ROLE_ID)) {
+            $modifiedColumns[':p' . $index++]  = '`ROLE_ID`';
+        }
+        if ($this->isColumnModified(UserPeer::LOGIN_FAILURE_COUNT)) {
+            $modifiedColumns[':p' . $index++]  = '`LOGIN_FAILURE_COUNT`';
+        }
+        if ($this->isColumnModified(UserPeer::LOGIN_FAILURE_DATE)) {
+            $modifiedColumns[':p' . $index++]  = '`LOGIN_FAILURE_DATE`';
+        }
+        if ($this->isColumnModified(UserPeer::TREE_LEFT)) {
+            $modifiedColumns[':p' . $index++]  = '`TREE_LEFT`';
+        }
+        if ($this->isColumnModified(UserPeer::TREE_RIGHT)) {
+            $modifiedColumns[':p' . $index++]  = '`TREE_RIGHT`';
+        }
+        if ($this->isColumnModified(UserPeer::TREE_LEVEL)) {
+            $modifiedColumns[':p' . $index++]  = '`TREE_LEVEL`';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO `user` (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case '`ID`':
+                        $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+                        break;
+                    case '`USERNAME`':
+                        $stmt->bindValue($identifier, $this->username, PDO::PARAM_STR);
+                        break;
+                    case '`EMAIL`':
+                        $stmt->bindValue($identifier, $this->email, PDO::PARAM_STR);
+                        break;
+                    case '`SALT`':
+                        $stmt->bindValue($identifier, $this->salt, PDO::PARAM_STR);
+                        break;
+                    case '`PASSWORD`':
+                        $stmt->bindValue($identifier, $this->password, PDO::PARAM_STR);
+                        break;
+                    case '`ROLE_ID`':
+                        $stmt->bindValue($identifier, $this->role_id, PDO::PARAM_INT);
+                        break;
+                    case '`LOGIN_FAILURE_COUNT`':
+                        $stmt->bindValue($identifier, $this->login_failure_count, PDO::PARAM_INT);
+                        break;
+                    case '`LOGIN_FAILURE_DATE`':
+                        $stmt->bindValue($identifier, $this->login_failure_date, PDO::PARAM_STR);
+                        break;
+                    case '`TREE_LEFT`':
+                        $stmt->bindValue($identifier, $this->tree_left, PDO::PARAM_INT);
+                        break;
+                    case '`TREE_RIGHT`':
+                        $stmt->bindValue($identifier, $this->tree_right, PDO::PARAM_INT);
+                        break;
+                    case '`TREE_LEVEL`':
+                        $stmt->bindValue($identifier, $this->tree_level, PDO::PARAM_INT);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e);
+        }
+
+        try {
+            $pk = $con->lastInsertId();
+        } catch (Exception $e) {
+            throw new PropelException('Unable to get autoincrement id.', $e);
+        }
+        $this->setId($pk);
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @see        doSave()
+     */
+    protected function doUpdate(PropelPDO $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+        BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con);
+    }
 
     /**
@@ -1338 +1490 @@
     /**
      * Initializes a collection based on the name of a relation.
-     * Avoids crafting an 'init[$relationName]s' method name 
+     * Avoids crafting an 'init[$relationName]s' method name
      * that wouldn't work when StandardEnglishPluralizer is used.
      *
@@ -1420 +1572 @@
 
     /**
+     * Sets a collection of UserCredential objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $userCredentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setUserCredentials(PropelCollection $userCredentials, PropelPDO $con = null)
+    {
+        $this->userCredentialsScheduledForDeletion = $this->getUserCredentials(new Criteria(), $con)->diff($userCredentials);
+
+        foreach ($userCredentials as $userCredential) {
+            // Fix issue with collection modified by reference
+            if ($userCredential->isNew()) {
+                $userCredential->setUser($this);
+            }
+            $this->addUserCredential($userCredential);
+        }
+
+        $this->collUserCredentials = $userCredentials;
+    }
+
+    /**
      * Returns the number of related UserCredential objects.
      *
@@ -1452 +1628 @@
      *
      * @param      UserCredential $l UserCredential
-     * @return     void
-     * @throws     PropelException
+     * @return     User The current object (for fluent API support)
      */
     public function addUserCredential(UserCredential $l)
@@ -1461 +1636 @@
         }
         if (!$this->collUserCredentials->contains($l)) { // only add it if the **same** object is not already associated
-            $this->collUserCredentials[]= $l;
-            $l->setUser($this);
-        }
+            $this->doAddUserCredential($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param   UserCredential $userCredential The userCredential object to add.
+     */
+    protected function doAddUserCredential($userCredential)
+    {
+        $this->collUserCredentials[]= $userCredential;
+        $userCredential->setUser($this);
     }
 
@@ -1555 +1740 @@
 
     /**
+     * Sets a collection of Credential objects related by a many-to-many relationship
+     * to the current object by way of the user_credential cross-reference table.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      PropelCollection $credentials A Propel collection.
+     * @param      PropelPDO $con Optional connection object
+     */
+    public function setCredentials(PropelCollection $credentials, PropelPDO $con = null)
+    {
+        $userCredentials = UserCredentialQuery::create()
+            ->filterByCredential($credentials)
+            ->filterByUser($this)
+            ->find($con);
+
+        $this->credentialsScheduledForDeletion = $this->getUserCredentials()->diff($userCredentials);
+        $this->collUserCredentials = $userCredentials;
+
+        foreach ($credentials as $credential) {
+            // Fix issue with collection modified by reference
+            if ($credential->isNew()) {
+                $this->doAddCredential($credential);
+            } else {
+                $this->addCredential($credential);
+            }
+        }
+
+        $this->collCredentials = $credentials;
+    }
+
+    /**
      * Gets the number of Credential objects related by a many-to-many relationship
      * to the current object by way of the user_credential cross-reference table.
@@ -1596 +1812 @@
         }
         if (!$this->collCredentials->contains($credential)) { // only add it if the **same** object is not already associated
-            $userCredential = new UserCredential();
-            $userCredential->setCredential($credential);
-            $this->addUserCredential($userCredential);
+            $this->doAddCredential($credential);
 
             $this->collCredentials[]= $credential;
         }
+    }
+
+    /**
+     * @param   Credential $credential The credential object to add.
+     */
+    protected function doAddCredential($credential)
+    {
+        $userCredential = new UserCredential();
+        $userCredential->setCredential($credential);
+        $this->addUserCredential($userCredential);
     }
 
@@ -2015 +2239 @@
      * Gets number of children for the given node
      *
-     * @param      Criteria  $criteria Criteria to filter results. 
+     * @param      Criteria  $criteria Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     int       Number of children
@@ -2037 +2261 @@
      * Gets the first child of the given node
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     array        List of User objects
@@ -2056 +2280 @@
      * Gets the last child of the given node
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     array        List of User objects
@@ -2076 +2300 @@
      *
      * @param      bool         $includeNode Whether to include the current node or not
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      *
@@ -2099 +2323 @@
      * Gets descendants for the given node
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     array        List of User objects
@@ -2118 +2342 @@
      * Gets number of descendants for the given node
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     int      Number of descendants
@@ -2137 +2361 @@
      * Gets descendants for the given node, plus the current node
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     array        List of User objects
@@ -2153 +2377 @@
      * Use it for breadcrumb paths for instance
      *
-     * @param      Criteria $query Criteria to filter results. 
+     * @param      Criteria $query Criteria to filter results.
      * @param      PropelPDO $con Connection to use.
      * @return     array        List of User objects
@@ -2209 +2433 @@
         // update the children collection of the parent
         $parent->addNestedSetChild($this);
-        
+    
         // Keep the tree modification query for the save() transaction
         $this->nestedSetQueries []= array(
@@ -2239 +2463 @@
         // update the children collection of the parent
         $parent->addNestedSetChild($this);
-        
+    
         // Keep the tree modification query for the save() transaction
         $this->nestedSetQueries []= array(
@@ -2319 +2543 @@
             throw new PropelException('Cannot move a node as child of one of its subtree nodes.');
         }
-        
+    
         $this->moveSubtreeTo($parent->getLeftValue() + 1, $parent->getLevel() - $this->getLevel() + 1, $con);
-        
+    
         return $this;
     }
@@ -2342 +2566 @@
             throw new PropelException('Cannot move a node as child of one of its subtree nodes.');
         }
-        
+    
         $this->moveSubtreeTo($parent->getRightValue(), $parent->getLevel() - $this->getLevel() + 1, $con);
-        
+    
         return $this;
     }
@@ -2368 +2592 @@
             throw new PropelException('Cannot move a node as sibling of one of its subtree nodes.');
         }
-        
+    
         $this->moveSubtreeTo($sibling->getLeftValue(), $sibling->getLevel() - $this->getLevel(), $con);
-        
+    
         return $this;
     }
@@ -2394 +2618 @@
             throw new PropelException('Cannot move a node as sibling of one of its subtree nodes.');
         }
-        
+    
         $this->moveSubtreeTo($sibling->getRightValue() + 1, $sibling->getLevel() - $this->getLevel(), $con);
-        
+    
         return $this;
     }
@@ -2413 +2637 @@
     
         $treeSize = $right - $left +1;
-        
+    
         if ($con === null) {
             $con = Propel::getConnection(UserPeer::DATABASE_NAME, Propel::CONNECTION_WRITE);
         }
-            
+    
         $con->beginTransaction();
         try {
             // make room next to the target for the subtree
             UserPeer::shiftRLValues($treeSize, $destLeft, null, $con);
-        
+    
             if ($left >= $destLeft) { // src was shifted too?
                 $left += $treeSize;
                 $right += $treeSize;
             }
-            
+    
             if ($levelDelta) {
                 // update the levels of the subtree
                 UserPeer::shiftLevel($levelDelta, $left, $right, $con);
             }
-            
+    
             // move the subtree to the target
             UserPeer::shiftRLValues($destLeft - $left, $left, $right, $con);
-        
+    
             // remove the empty room at the previous location of the subtree
             UserPeer::shiftRLValues(-$treeSize, $right + 1, null, $con);
-            
+    
             // update all loaded nodes
             UserPeer::updateLoadedNodes(null, $con);
-            
+    
             $con->commit();
         } catch (PropelException $e) {
@@ -2451 +2675 @@
     /**
      * Deletes all descendants for the given node
-     * Instance pooling is wiped out by this command, 
+     * Instance pooling is wiped out by this command,
      * so existing User instances are probably invalid (except for the current one)
      *
@@ -2475 +2699 @@
                 ->descendantsOf($this)
                 ->delete($con);
-            
+    
             // fill up the room that was used by descendants
             UserPeer::shiftRLValues($left - $right + 1, $right, null, $con);
-            
+    
             // fix the right value for the current node, which is now a leaf
             $this->setRightValue($left + 1);
-            
+    
             $con->commit();
         } catch (Exception $e) {
@@ -2487 +2711 @@
             throw $e;
         }
-        
+    
         return $ret;
     }
@@ -2501 +2725 @@
     }
 
-    /**
-     * Catches calls to virtual methods
-     */
-    public function __call($name, $params)
-    {
-        if (preg_match('/get(\w+)/', $name, $matches)) {
-            $virtualColumn = $matches[1];
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-            // no lcfirst in php<5.3...
-            $virtualColumn[0] = strtolower($virtualColumn[0]);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-        return parent::__call($name, $params);
-    }
-
 } // BaseUser

branches/Credentials/app/lib/propelom/om/BaseUserCredential.php

@@ -265 +265 @@
         $con->beginTransaction();
         try {
+            $deleteQuery = UserCredentialQuery::create()
+                ->filterByPrimaryKey($this->getPrimaryKey());
             $ret = $this->preDelete($con);
             if ($ret) {
-                UserCredentialQuery::create()
-                    ->filterByPrimaryKey($this->getPrimaryKey())
-                    ->delete($con);
+                $deleteQuery->delete($con);
                 $this->postDelete($con);
                 $con->commit();
@@ -276 +276 @@
                 $con->commit();
             }
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -328 +328 @@
             $con->commit();
             return $affectedRows;
-        } catch (PropelException $e) {
+        } catch (Exception $e) {
             $con->rollBack();
             throw $e;
@@ -370 +370 @@
             }
 
-
-            // If this object has been modified, then save it to the database.
-            if ($this->isModified()) {
+            if ($this->isNew() || $this->isModified()) {
+                // persist changes
                 if ($this->isNew()) {
-                    $criteria = $this->buildCriteria();
-                    $pk = BasePeer::doInsert($criteria, $con);
-                    $affectedRows += 1;
-                    $this->setNew(false);
+                    $this->doInsert($con);
                 } else {
-                    $affectedRows += UserCredentialPeer::doUpdate($this, $con);
+                    $this->doUpdate($con);
                 }
-
-                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+                $affectedRows += 1;
+                $this->resetModified();
             }
 
@@ -390 +386 @@
         return $affectedRows;
     } // doSave()
+
+    /**
+     * Insert the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    protected function doInsert(PropelPDO $con)
+    {
+        $modifiedColumns = array();
+        $index = 0;
+
+
+         // check the columns in natural order for more readable SQL queries
+        if ($this->isColumnModified(UserCredentialPeer::USER_ID)) {
+            $modifiedColumns[':p' . $index++]  = '`USER_ID`';
+        }
+        if ($this->isColumnModified(UserCredentialPeer::CREDENTIAL_ID)) {
+            $modifiedColumns[':p' . $index++]  = '`CREDENTIAL_ID`';
+        }
+
+        $sql = sprintf(
+            'INSERT INTO `user_credential` (%s) VALUES (%s)',
+            implode(', ', $modifiedColumns),
+            implode(', ', array_keys($modifiedColumns))
+        );
+
+        try {
+            $stmt = $con->prepare($sql);
+            foreach ($modifiedColumns as $identifier => $columnName) {
+                switch ($columnName) {
+                    case '`USER_ID`':
+                        $stmt->bindValue($identifier, $this->user_id, PDO::PARAM_INT);
+                        break;
+                    case '`CREDENTIAL_ID`':
+                        $stmt->bindValue($identifier, $this->credential_id, PDO::PARAM_INT);
+                        break;
+                }
+            }
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e);
+        }
+
+        $this->setNew(false);
+    }
+
+    /**
+     * Update the row in the database.
+     *
+     * @param      PropelPDO $con
+     *
+     * @see        doSave()
+     */
+    protected function doUpdate(PropelPDO $con)
+    {
+        $selectCriteria = $this->buildPkeyCriteria();
+        $valuesCriteria = $this->buildCriteria();
+        BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con);
+    }
 
     /**
@@ -883 +942 @@
     }
 
-    /**
-     * Catches calls to virtual methods
-     */
-    public function __call($name, $params)
-    {
-        if (preg_match('/get(\w+)/', $name, $matches)) {
-            $virtualColumn = $matches[1];
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-            // no lcfirst in php<5.3...
-            $virtualColumn[0] = strtolower($virtualColumn[0]);
-            if ($this->hasVirtualColumn($virtualColumn)) {
-                return $this->getVirtualColumn($virtualColumn);
-            }
-        }
-        return parent::__call($name, $params);
-    }
-
 } // BaseUserCredential

branches/Credentials/app/lib/propelom/om/BaseUserCredentialPeer.php

@@ -25 +25 @@
     /** the related TableMap class for this table */
     const TM_CLASS = 'UserCredentialTableMap';
-    
+
     /** The total number of columns. */
     const NUM_COLUMNS = 2;
@@ -43 +43 @@
     /** The default string format for model objects of the related table **/
     const DEFAULT_STRING_FORMAT = 'YAML';
-    
+
     /**
      * An identiy map to hold any loaded instances of UserCredential objects.
@@ -372 +372 @@
 
     /**
-     * Retrieves the primary key from the DB resultset row 
+     * Retrieves the primary key from the DB resultset row
      * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
      * a multi-column primary key, an array of the primary key columns will be returned.
@@ -469 +469 @@
             UserCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -519 +519 @@
             UserCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -701 +701 @@
             UserCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -836 +836 @@
         // tables go into the FROM clause.
         $criteria->setPrimaryTableName(UserCredentialPeer::TABLE_NAME);
-        
+
         if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
             $criteria->setDistinct();
@@ -844 +844 @@
             UserCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY should not affect count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -886 +886 @@
         // tables go into the FROM clause.
         $criteria->setPrimaryTableName(UserCredentialPeer::TABLE_NAME);
-        
+
         if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
             $criteria->setDistinct();
@@ -894 +894 @@
             UserCredentialPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY should not affect count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);

branches/Credentials/app/lib/propelom/om/BaseUserCredentialQuery.php

@@ -38 +38 @@
 abstract class BaseUserCredentialQuery extends ModelCriteria
 {
-
+    
     /**
      * Initializes internal state of BaseUserCredentialQuery object.
@@ -75 +75 @@
 
     /**
-     * Find object by primary key
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
      * <code>
      * $obj = $c->findPk(array(12, 34), $con);
      * </code>
+     *
      * @param     array[$user_id, $credential_id] $key Primary key to use for the query
      * @param     PropelPDO $con an optional connection object
@@ -86 +90 @@
     public function findPk($key, $con = null)
     {
-        if ((null !== ($obj = UserCredentialPeer::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && $this->getFormatter()->isObjectFormatter()) {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = UserCredentialPeer::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1]))))) && !$this->formatter) {
             // the object is alredy in the instance pool
             return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getConnection(UserCredentialPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
         } else {
-            // the object has not been requested yet, or the formatter is not an object formatter
-            $criteria = $this->isKeepQuery() ? clone $this : $this;
-            $stmt = $criteria
-                ->filterByPrimaryKey($key)
-                ->getSelectStatement($con);
-            return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
-        }
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    UserCredential A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT `USER_ID`, `CREDENTIAL_ID` FROM `user_credential` WHERE `USER_ID` = :p0 AND `CREDENTIAL_ID` = :p1';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
+            $stmt->bindValue(':p1', $key[1], PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+            $obj = new UserCredential();
+            $obj->hydrate($row);
+            UserCredentialPeer::addInstanceToPool($obj, serialize(array((string) $row[0], (string) $row[1])));
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    UserCredential|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $stmt = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
     }
 
@@ -111 +172 @@
     public function findPks($keys, $con = null)
     {
+        if ($con === null) {
+            $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
         $criteria = $this->isKeepQuery() ? clone $this : $this;
-        return $this
+        $stmt = $criteria
             ->filterByPrimaryKeys($keys)
-            ->find($con);
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->format($stmt);
     }
 
@@ -128 +194 @@
         $this->addUsingAlias(UserCredentialPeer::USER_ID, $key[0], Criteria::EQUAL);
         $this->addUsingAlias(UserCredentialPeer::CREDENTIAL_ID, $key[1], Criteria::EQUAL);
-        
+
         return $this;
     }
@@ -150 +216 @@
             $this->addOr($cton0);
         }
-        
+
         return $this;
     }
@@ -156 +222 @@
     /**
      * Filter the query on the user_id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -184 +250 @@
     /**
      * Filter the query on the credential_id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -236 +302 @@
     /**
      * Adds a JOIN clause to the query using the User relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -246 +312 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('User');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -254 +320 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -262 +328 @@
             $this->addJoinObject($join, 'User');
         }
-        
+
         return $this;
     }
@@ -270 +336 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -310 +376 @@
     /**
      * Adds a JOIN clause to the query using the Credential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -320 +386 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Credential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -328 +394 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -336 +402 @@
             $this->addJoinObject($join, 'Credential');
         }
-        
+
         return $this;
     }
@@ -344 +410 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -371 +437 @@
             $this->addCond('pruneCond1', $this->getAliasedColName(UserCredentialPeer::CREDENTIAL_ID), $userCredential->getCredentialId(), Criteria::NOT_EQUAL);
             $this->combine(array('pruneCond0', 'pruneCond1'), Criteria::LOGICAL_OR);
-      }
-      
+        }
+
         return $this;
     }

branches/Credentials/app/lib/propelom/om/BaseUserPeer.php

@@ -25 +25 @@
     /** the related TableMap class for this table */
     const TM_CLASS = 'UserTableMap';
-    
+
     /** The total number of columns. */
     const NUM_COLUMNS = 11;
@@ -70 +70 @@
     /** The default string format for model objects of the related table **/
     const DEFAULT_STRING_FORMAT = 'YAML';
-    
+
     /**
      * An identiy map to hold any loaded instances of User objects.
@@ -434 +434 @@
 
     /**
-     * Retrieves the primary key from the DB resultset row 
+     * Retrieves the primary key from the DB resultset row
      * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
      * a multi-column primary key, an array of the primary key columns will be returned.
@@ -531 +531 @@
             UserPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -647 +647 @@
             UserPeer::addSelectColumns($criteria);
         }
-        
+
         $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-        
+
         // Set the correct dbName
         $criteria->setDbName(self::DATABASE_NAME);
@@ -1065 +1065 @@
         }
         $criteria->addAscendingOrderByColumn(UserPeer::LEFT_COL);
-        
+    
         return UserPeer::doSelect($criteria, $con);
     }
@@ -1118 +1118 @@
         }
         $whereCriteria->add($criterion);
-        
+    
         $valuesCriteria = new Criteria(UserPeer::DATABASE_NAME);
         $valuesCriteria->add(UserPeer::LEFT_COL, array('raw' => UserPeer::LEFT_COL . ' + ?', 'value' => $delta), Criteria::CUSTOM_EQUAL);
@@ -1156 +1156 @@
         $whereCriteria->add(UserPeer::LEFT_COL, $first, Criteria::GREATER_EQUAL);
         $whereCriteria->add(UserPeer::RIGHT_COL, $last, Criteria::LESS_EQUAL);
-        
+    
         $valuesCriteria = new Criteria(UserPeer::DATABASE_NAME);
         $valuesCriteria->add(UserPeer::LEVEL_COL, array('raw' => UserPeer::LEVEL_COL . ' + ?', 'value' => $delta), Criteria::CUSTOM_EQUAL);
@@ -1239 +1239 @@
                 UserPeer::addInstanceToPool($obj, $key);
             }
-            
+    
             // compute level
             // Algorithm shamelessly stolen from sfPropelActAsNestedSetBehaviorPlugin
@@ -1254 +1254 @@
                 $prev[$i] = $obj->getRightValue();
             }
-            
+    
             // update level in node if necessary
             if ($obj->getLevel() !== $level) {

branches/Credentials/app/lib/propelom/om/BaseUserQuery.php

@@ -74 +74 @@
 abstract class BaseUserQuery extends ModelCriteria
 {
-
+    
     /**
      * Initializes internal state of BaseUserQuery object.
@@ -111 +111 @@
 
     /**
-     * Find object by primary key
-     * Use instance pooling to avoid a database query if the object exists
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
      * <code>
      * $obj  = $c->findPk(12, $con);
      * </code>
+     *
      * @param     mixed $key Primary key to use for the query
      * @param     PropelPDO $con an optional connection object
@@ -123 +126 @@
     public function findPk($key, $con = null)
     {
-        if ((null !== ($obj = UserPeer::getInstanceFromPool((string) $key))) && $this->getFormatter()->isObjectFormatter()) {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = UserPeer::getInstanceFromPool((string) $key))) && !$this->formatter) {
             // the object is alredy in the instance pool
             return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getConnection(UserPeer::DATABASE_NAME, Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
         } else {
-            // the object has not been requested yet, or the formatter is not an object formatter
-            $criteria = $this->isKeepQuery() ? clone $this : $this;
-            $stmt = $criteria
-                ->filterByPrimaryKey($key)
-                ->getSelectStatement($con);
-            return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
-        }
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    User A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, $con)
+    {
+        $sql = 'SELECT `ID`, `USERNAME`, `EMAIL`, `SALT`, `PASSWORD`, `ROLE_ID`, `LOGIN_FAILURE_COUNT`, `LOGIN_FAILURE_DATE`, `TREE_LEFT`, `TREE_RIGHT`, `TREE_LEVEL` FROM `user` WHERE `ID` = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(PDO::FETCH_NUM)) {
+            $obj = new User();
+            $obj->hydrate($row);
+            UserPeer::addInstanceToPool($obj, (string) $row[0]);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     PropelPDO $con A connection object
+     *
+     * @return    User|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $stmt = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->formatOne($stmt);
     }
 
@@ -148 +207 @@
     public function findPks($keys, $con = null)
     {
+        if ($con === null) {
+            $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ);
+        }
+        $this->basePreSelect($con);
         $criteria = $this->isKeepQuery() ? clone $this : $this;
-        return $this
+        $stmt = $criteria
             ->filterByPrimaryKeys($keys)
-            ->find($con);
+            ->doSelect($con);
+        return $criteria->getFormatter()->init($criteria)->format($stmt);
     }
 
@@ -180 +244 @@
     /**
      * Filter the query on the id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -206 +270 @@
     /**
      * Filter the query on the username column
-     * 
+     *
      * Example usage:
      * <code>
@@ -234 +298 @@
     /**
      * Filter the query on the email column
-     * 
+     *
      * Example usage:
      * <code>
@@ -262 +326 @@
     /**
      * Filter the query on the salt column
-     * 
+     *
      * Example usage:
      * <code>
@@ -290 +354 @@
     /**
      * Filter the query on the password column
-     * 
+     *
      * Example usage:
      * <code>
@@ -318 +382 @@
     /**
      * Filter the query on the role_id column
-     * 
+     *
      * Example usage:
      * <code>
@@ -360 +424 @@
     /**
      * Filter the query on the login_failure_count column
-     * 
+     *
      * Example usage:
      * <code>
@@ -400 +464 @@
     /**
      * Filter the query on the login_failure_date column
-     * 
+     *
      * Example usage:
      * <code>
@@ -442 +506 @@
     /**
      * Filter the query on the tree_left column
-     * 
+     *
      * Example usage:
      * <code>
@@ -482 +546 @@
     /**
      * Filter the query on the tree_right column
-     * 
+     *
      * Example usage:
      * <code>
@@ -522 +586 @@
     /**
      * Filter the query on the tree_level column
-     * 
+     *
      * Example usage:
      * <code>
@@ -586 +650 @@
     /**
      * Adds a JOIN clause to the query using the Role relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -596 +660 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('Role');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -604 +668 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -612 +676 @@
             $this->addJoinObject($join, 'Role');
         }
-        
+
         return $this;
     }
@@ -620 +684 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -650 +714 @@
             return $this
                 ->useUserCredentialQuery()
-                    ->filterByPrimaryKeys($userCredential->getPrimaryKeys())
+                ->filterByPrimaryKeys($userCredential->getPrimaryKeys())
                 ->endUse();
         } else {
@@ -659 +723 @@
     /**
      * Adds a JOIN clause to the query using the UserCredential relation
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation
      * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
@@ -669 +733 @@
         $tableMap = $this->getTableMap();
         $relationMap = $tableMap->getRelation('UserCredential');
-        
+
         // create a ModelJoin object for this join
         $join = new ModelJoin();
@@ -677 +741 @@
             $join->setPreviousJoin($previousJoin);
         }
-        
+
         // add the ModelJoin to the current object
         if($relationAlias) {
@@ -685 +749 @@
             $this->addJoinObject($join, 'UserCredential');
         }
-        
+
         return $this;
     }
@@ -693 +757 @@
      *
      * @see       useQuery()
-     * 
+     *
      * @param     string $relationAlias optional alias for the relation,
      *                                   to be used as main alias in the secondary query
@@ -720 +784 @@
         return $this
             ->useUserCredentialQuery()
-                ->filterByCredential($credential, $comparison)
+            ->filterByCredential($credential, $comparison)
             ->endUse();
     }
-    
+
     /**
      * Exclude object from result
@@ -735 +799 @@
         if ($user) {
             $this->addUsingAlias(UserPeer::ID, $user->getId(), Criteria::NOT_EQUAL);
-      }
-      
+        }
+
         return $this;
     }