thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/DbRow.php

Indentation +343 added lines, -343 removed lines

@@ -27,163 +27,163 @@ 
  */
 class DbRow
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * The object containing this db row.
-     *
-     * @var AbstractTDBMObject
-     */
-    private $object;
-
-    /**
-     * The name of the table the object if issued from.
-     *
-     * @var string
-     */
-    private $dbTableName;
-
-    /**
-     * The array of columns returned from database.
-     *
-     * @var array
-     */
-    private $dbRow = array();
-
-    /**
-     * @var AbstractTDBMObject[]
-     */
-    private $references = array();
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * The values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @var array An array of column => value
-     */
-    private $primaryKeys;
-
-    /**
-     * You should never call the constructor directly. Instead, you should use the
-     * TDBMService class that will create TDBMObjects for you.
-     *
-     * Used with id!=false when we want to retrieve an existing object
-     * and id==false if we want a new object
-     *
-     * @param AbstractTDBMObject $object      The object containing this db row.
-     * @param string             $table_name
-     * @param array              $primaryKeys
-     * @param TDBMService        $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
-    {
-        $this->object = $object;
-        $this->dbTableName = $table_name;
-
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        if ($tdbmService === null) {
-            if (!empty($primaryKeys)) {
-                throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
-            }
-        } else {
-            $this->tdbmService = $tdbmService;
-
-            if (!empty($primaryKeys)) {
-                $this->_setPrimaryKeys($primaryKeys);
-                if (!empty($dbRow)) {
-                    $this->dbRow = $dbRow;
-                    $this->status = TDBMObjectStateEnum::STATE_LOADED;
-                } else {
-                    $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                }
-                $tdbmService->_addToCache($this);
-            } else {
-                $this->status = TDBMObjectStateEnum::STATE_NEW;
-                $this->tdbmService->_addToToSaveObjectList($this);
-            }
-        }
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        $this->tdbmService->_addToToSaveObjectList($this);
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-    }
-
-    /**
-     * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
-     * If the object is in state 'not loaded', this method performs a query in database to load the object.
-     *
-     * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
-     * cannot be found).
-     */
-    public function _dbLoadIfNotLoaded()
-    {
-        if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
-            $connection = $this->tdbmService->getConnection();
-
-            /// buildFilterFromFilterBag($filter_bag)
-            list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
-
-            $sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
-            $result = $connection->executeQuery($sql, $parameters);
-
-            if ($result->rowCount() === 0) {
-                throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
-            }
-
-            $this->dbRow = $result->fetch(\PDO::FETCH_ASSOC);
-
-            $result->closeCursor();
-
-            $this->status = TDBMObjectStateEnum::STATE_LOADED;
-        }
-    }
-
-    public function get($var)
-    {
-        $this->_dbLoadIfNotLoaded();
-
-        // Let's first check if the key exist.
-        if (!isset($this->dbRow[$var])) {
-            /*
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * The object containing this db row.
+	 *
+	 * @var AbstractTDBMObject
+	 */
+	private $object;
+
+	/**
+	 * The name of the table the object if issued from.
+	 *
+	 * @var string
+	 */
+	private $dbTableName;
+
+	/**
+	 * The array of columns returned from database.
+	 *
+	 * @var array
+	 */
+	private $dbRow = array();
+
+	/**
+	 * @var AbstractTDBMObject[]
+	 */
+	private $references = array();
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * The values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @var array An array of column => value
+	 */
+	private $primaryKeys;
+
+	/**
+	 * You should never call the constructor directly. Instead, you should use the
+	 * TDBMService class that will create TDBMObjects for you.
+	 *
+	 * Used with id!=false when we want to retrieve an existing object
+	 * and id==false if we want a new object
+	 *
+	 * @param AbstractTDBMObject $object      The object containing this db row.
+	 * @param string             $table_name
+	 * @param array              $primaryKeys
+	 * @param TDBMService        $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
+	{
+		$this->object = $object;
+		$this->dbTableName = $table_name;
+
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		if ($tdbmService === null) {
+			if (!empty($primaryKeys)) {
+				throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
+			}
+		} else {
+			$this->tdbmService = $tdbmService;
+
+			if (!empty($primaryKeys)) {
+				$this->_setPrimaryKeys($primaryKeys);
+				if (!empty($dbRow)) {
+					$this->dbRow = $dbRow;
+					$this->status = TDBMObjectStateEnum::STATE_LOADED;
+				} else {
+					$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				}
+				$tdbmService->_addToCache($this);
+			} else {
+				$this->status = TDBMObjectStateEnum::STATE_NEW;
+				$this->tdbmService->_addToToSaveObjectList($this);
+			}
+		}
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		$this->tdbmService->_addToToSaveObjectList($this);
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+	}
+
+	/**
+	 * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
+	 * If the object is in state 'not loaded', this method performs a query in database to load the object.
+	 *
+	 * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
+	 * cannot be found).
+	 */
+	public function _dbLoadIfNotLoaded()
+	{
+		if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
+			$connection = $this->tdbmService->getConnection();
+
+			/// buildFilterFromFilterBag($filter_bag)
+			list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
+
+			$sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
+			$result = $connection->executeQuery($sql, $parameters);
+
+			if ($result->rowCount() === 0) {
+				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
+			}
+
+			$this->dbRow = $result->fetch(\PDO::FETCH_ASSOC);
+
+			$result->closeCursor();
+
+			$this->status = TDBMObjectStateEnum::STATE_LOADED;
+		}
+	}
+
+	public function get($var)
+	{
+		$this->_dbLoadIfNotLoaded();
+
+		// Let's first check if the key exist.
+		if (!isset($this->dbRow[$var])) {
+			/*
             // Unable to find column.... this is an error if the object has been retrieved from database.
             // If it's a new object, well, that may not be an error after all!
             // Let's check if the column does exist in the table
@@ -203,30 +203,30 @@ 
             $str = "Could not find column \"$var\" in table \"$this->dbTableName\". Maybe you meant one of those columns: '".implode("', '",$result_array)."'";
 
             throw new TDBMException($str);*/
-            return;
-        }
-
-        return $this->dbRow[$var];
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     *
-     * @return bool
-     */
-    /*public function has($var) {
+			return;
+		}
+
+		return $this->dbRow[$var];
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 *
+	 * @return bool
+	 */
+	/*public function has($var) {
         $this->_dbLoadIfNotLoaded();
 
         return isset($this->dbRow[$var]);
     }*/
 
-    public function set($var, $value)
-    {
-        $this->_dbLoadIfNotLoaded();
+	public function set($var, $value)
+	{
+		$this->_dbLoadIfNotLoaded();
 
-        /*
+		/*
         // Ok, let's start by checking the column type
         $type = $this->db_connection->getColumnType($this->dbTableName, $var);
 
@@ -236,173 +236,173 @@ 
         }
         */
 
-        /*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
+		/*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
             throw new TDBMException("Error! Changing primary key value is forbidden.");*/
-        $this->dbRow[$var] = $value;
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
-    {
-        $this->references[$foreignKeyName] = $bean;
-
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function getRef($foreignKeyName)
-    {
-        if (isset($this->references[$foreignKeyName])) {
-            return $this->references[$foreignKeyName];
-        } elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
-            // If the object is new and has no property, then it has to be empty.
-            return;
-        } else {
-            $this->_dbLoadIfNotLoaded();
-
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-
-            $values = [];
-            foreach ($fk->getLocalColumns() as $column) {
-                $values[] = $this->dbRow[$column];
-            }
-
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
-
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
-        }
-    }
-
-    /**
-     * Returns the name of the table this object comes from.
-     *
-     * @return string
-     */
-    public function _getDbTableName()
-    {
-        return $this->dbTableName;
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's load the row (before we lose the ID!)
-        $this->_dbLoadIfNotLoaded();
-
-        //Let's set the status to detached
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        $this->primaryKeys = null;
-
-        //Now unset the PK from the row
-        if ($this->tdbmService) {
-            $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-            foreach ($pk_array as $pk) {
-                $this->dbRow[$pk] = null;
-            }
-        }
-    }
-
-    /**
-     * Returns raw database row.
-     *
-     * @return array
-     */
-    public function _getDbRow()
-    {
-        // Let's merge $dbRow and $references
-        $dbRow = $this->dbRow;
-
-        foreach ($this->references as $foreignKeyName => $reference) {
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-            $refDbRows = $reference->_getDbRows();
-            $firstRefDbRow = reset($refDbRows);
-            $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-            $localColumns = $fk->getLocalColumns();
-
-            for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                $dbRow[$localColumns[$i]] = $pkValues[$i];
-            }
-        }
-
-        return $dbRow;
-    }
-
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences()
-    {
-        return $this->references;
-    }
-
-    /**
-     * Returns the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @return array
-     */
-    public function _getPrimaryKeys()
-    {
-        return $this->primaryKeys;
-    }
-
-    /**
-     * Sets the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @param array $primaryKeys
-     */
-    public function _setPrimaryKeys(array $primaryKeys)
-    {
-        $this->primaryKeys = $primaryKeys;
-        foreach ($this->primaryKeys as $column => $value) {
-            $this->dbRow[$column] = $value;
-        }
-    }
-
-    /**
-     * Returns the TDBMObject this bean is associated to.
-     *
-     * @return AbstractTDBMObject
-     */
-    public function getTDBMObject()
-    {
-        return $this->object;
-    }
+		$this->dbRow[$var] = $value;
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
+	{
+		$this->references[$foreignKeyName] = $bean;
+
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName)
+	{
+		if (isset($this->references[$foreignKeyName])) {
+			return $this->references[$foreignKeyName];
+		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
+			// If the object is new and has no property, then it has to be empty.
+			return;
+		} else {
+			$this->_dbLoadIfNotLoaded();
+
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				$values[] = $this->dbRow[$column];
+			}
+
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+		}
+	}
+
+	/**
+	 * Returns the name of the table this object comes from.
+	 *
+	 * @return string
+	 */
+	public function _getDbTableName()
+	{
+		return $this->dbTableName;
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's load the row (before we lose the ID!)
+		$this->_dbLoadIfNotLoaded();
+
+		//Let's set the status to detached
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		$this->primaryKeys = null;
+
+		//Now unset the PK from the row
+		if ($this->tdbmService) {
+			$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+			foreach ($pk_array as $pk) {
+				$this->dbRow[$pk] = null;
+			}
+		}
+	}
+
+	/**
+	 * Returns raw database row.
+	 *
+	 * @return array
+	 */
+	public function _getDbRow()
+	{
+		// Let's merge $dbRow and $references
+		$dbRow = $this->dbRow;
+
+		foreach ($this->references as $foreignKeyName => $reference) {
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			$refDbRows = $reference->_getDbRows();
+			$firstRefDbRow = reset($refDbRows);
+			$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+			$localColumns = $fk->getLocalColumns();
+
+			for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+				$dbRow[$localColumns[$i]] = $pkValues[$i];
+			}
+		}
+
+		return $dbRow;
+	}
+
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences()
+	{
+		return $this->references;
+	}
+
+	/**
+	 * Returns the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeys()
+	{
+		return $this->primaryKeys;
+	}
+
+	/**
+	 * Sets the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @param array $primaryKeys
+	 */
+	public function _setPrimaryKeys(array $primaryKeys)
+	{
+		$this->primaryKeys = $primaryKeys;
+		foreach ($this->primaryKeys as $column => $value) {
+			$this->dbRow[$column] = $value;
+		}
+	}
+
+	/**
+	 * Returns the TDBMObject this bean is associated to.
+	 *
+	 * @return AbstractTDBMObject
+	 */
+	public function getTDBMObject()
+	{
+		return $this->object;
+	}
 }

src/Mouf/Database/TDBM/Utils/TDBMDaoGenerator.php

Indentation +418 added lines, -418 removed lines

@@ -18,188 +18,188 @@ 
  */
 class TDBMDaoGenerator
 {
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * Constructor.
-     *
-     * @param Connection $dbConnection The connection to the database.
-     */
-    public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
-    {
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->rootPath = __DIR__.'/../../../../../../../../';
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $daoFactoryClassName The classe name of the DAO factory
-     * @param string $daonamespace        The namespace for the DAOs, without trailing \
-     * @param string $beannamespace       The Namespace for the beans, without trailing \
-     * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
-     *
-     * @return \string[] the list of tables
-     *
-     * @throws TDBMException
-     */
-    public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
-    {
-        // TODO: extract ClassNameMapper in its own package!
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
-
-        // TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
-
-        $tableList = $this->schema->getTables();
-
-        // Remove all beans and daos from junction tables
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function (Table $table) {
-            return $table->getName();
-        }, $junctionTables);
-
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
-            return !in_array($table->getName(), $junctionTableNames);
-        });
-
-        foreach ($tableList as $table) {
-            $this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
-        }
-
-        $this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
-
-        // Ok, let's return the list of all tables.
-        // These will be used by the calling script to create Mouf instances.
-
-        return array_map(function (Table $table) { return $table->getName(); }, $tableList);
-    }
-
-    /**
-     * Generates in one method call the daos and the beans for one table.
-     *
-     * @param $tableName
-     */
-    public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
-    {
-        $tableName = $table->getName();
-        $daoName = $this->getDaoNameFromTableName($tableName);
-        $beanName = $this->getBeanNameFromTableName($tableName);
-        $baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
-        $baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
-
-        $this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
-        $this->generateDao($daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
-    }
-
-    /**
-     * Returns the name of the bean class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBeanNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'Bean';
-    }
-
-    /**
-     * Returns the name of the DAO class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getDaoNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'Dao';
-    }
-
-    /**
-     * Returns the name of the base bean class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBaseBeanNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'BaseBean';
-    }
-
-    /**
-     * Returns the name of the base DAO class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBaseDaoNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'BaseDao';
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string          $className       The name of the class
-     * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
-     * @param Table           $table           The table
-     * @param string          $beannamespace   The namespace of the bean
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @throws TDBMException
-     */
-    public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
-    {
-        $beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer);
-
-        $str = $beanDescriptor->generatePhpCode($beannamespace);
-
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$baseClassName);
-        if (empty($possibleBaseFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        if (!file_exists($possibleFileName)) {
-            $tableName = $table->getName();
-
-            $str = "<?php
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Connection $dbConnection The connection to the database.
+	 */
+	public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
+	{
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->rootPath = __DIR__.'/../../../../../../../../';
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $daoFactoryClassName The classe name of the DAO factory
+	 * @param string $daonamespace        The namespace for the DAOs, without trailing \
+	 * @param string $beannamespace       The Namespace for the beans, without trailing \
+	 * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
+	 *
+	 * @return \string[] the list of tables
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
+	{
+		// TODO: extract ClassNameMapper in its own package!
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.'composer.json');
+
+		// TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
+
+		$tableList = $this->schema->getTables();
+
+		// Remove all beans and daos from junction tables
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		$junctionTableNames = array_map(function (Table $table) {
+			return $table->getName();
+		}, $junctionTables);
+
+		$tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+			return !in_array($table->getName(), $junctionTableNames);
+		});
+
+		foreach ($tableList as $table) {
+			$this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
+		}
+
+		$this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
+
+		// Ok, let's return the list of all tables.
+		// These will be used by the calling script to create Mouf instances.
+
+		return array_map(function (Table $table) { return $table->getName(); }, $tableList);
+	}
+
+	/**
+	 * Generates in one method call the daos and the beans for one table.
+	 *
+	 * @param $tableName
+	 */
+	public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
+	{
+		$tableName = $table->getName();
+		$daoName = $this->getDaoNameFromTableName($tableName);
+		$beanName = $this->getBeanNameFromTableName($tableName);
+		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
+		$baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
+
+		$this->generateBean($beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
+		$this->generateDao($daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
+	}
+
+	/**
+	 * Returns the name of the bean class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBeanNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'Bean';
+	}
+
+	/**
+	 * Returns the name of the DAO class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getDaoNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'Dao';
+	}
+
+	/**
+	 * Returns the name of the base bean class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBaseBeanNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'BaseBean';
+	}
+
+	/**
+	 * Returns the name of the base DAO class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBaseDaoNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'BaseDao';
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string          $className       The name of the class
+	 * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
+	 * @param Table           $table           The table
+	 * @param string          $beannamespace   The namespace of the bean
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateBean($className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
+	{
+		$beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer);
+
+		$str = $beanDescriptor->generatePhpCode($beannamespace);
+
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$baseClassName);
+		if (empty($possibleBaseFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		if (!file_exists($possibleFileName)) {
+			$tableName = $table->getName();
+
+			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
  * You can edit this file as it will not be overwritten.
@@ -214,45 +214,45 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Writes the PHP bean DAO with simple functions to create/get/save objects.
-     *
-     * @param string $fileName  The file that will be written (without the directory)
-     * @param string $className The name of the class
-     * @param string $tableName The name of the table
-     */
-    public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper)
-    {
-        $tableName = $table->getName();
-        $primaryKeyColumns = $table->getPrimaryKeyColumns();
-
-        $defaultSort = null;
-        foreach ($table->getColumns() as $column) {
-            $comments = $column->getComment();
-            $matches = array();
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
-                $defaultSort = $data['column_name'];
-                if (count($matches == 3)) {
-                    $defaultSortDirection = $matches[2];
-                } else {
-                    $defaultSortDirection = 'ASC';
-                }
-            }
-        }
-
-        // FIXME: lowercase tables with _ in the name should work!
-        $tableCamel = self::toSingular(self::toCamelCase($tableName));
-
-        $beanClassWithoutNameSpace = $beanClassName;
-        $beanClassName = $beannamespace.'\\'.$beanClassName;
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Writes the PHP bean DAO with simple functions to create/get/save objects.
+	 *
+	 * @param string $fileName  The file that will be written (without the directory)
+	 * @param string $className The name of the class
+	 * @param string $tableName The name of the table
+	 */
+	public function generateDao($className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper)
+	{
+		$tableName = $table->getName();
+		$primaryKeyColumns = $table->getPrimaryKeyColumns();
+
+		$defaultSort = null;
+		foreach ($table->getColumns() as $column) {
+			$comments = $column->getComment();
+			$matches = array();
+			if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
+				$defaultSort = $data['column_name'];
+				if (count($matches == 3)) {
+					$defaultSortDirection = $matches[2];
+				} else {
+					$defaultSortDirection = 'ASC';
+				}
+			}
+		}
+
+		// FIXME: lowercase tables with _ in the name should work!
+		$tableCamel = self::toSingular(self::toCamelCase($tableName));
+
+		$beanClassWithoutNameSpace = $beanClassName;
+		$beanClassName = $beannamespace.'\\'.$beanClassName;
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -339,9 +339,9 @@ 
     }
     ";
 
-        if (count($primaryKeyColumns) === 1) {
-            $primaryKeyColumn = $primaryKeyColumns[0];
-            $str .= "
+		if (count($primaryKeyColumns) === 1) {
+			$primaryKeyColumn = $primaryKeyColumns[0];
+			$str .= "
     /**
      * Get $beanClassWithoutNameSpace specified by its ID (its primary key)
      * If the primary key does not exist, an exception is thrown.
@@ -356,8 +356,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -415,33 +415,33 @@ 
     }
     ";
 
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$baseClassName);
-        if (!$possibleBaseFileNames) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        // Now, let's generate the "editable" class
-        if (!file_exists($possibleFileName)) {
-            $str = "<?php
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$baseClassName);
+		if (!$possibleBaseFileNames) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		// Now, let's generate the "editable" class
+		if (!file_exists($possibleFileName)) {
+			$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -458,22 +458,22 @@ 
 
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Generates the factory bean.
-     *
-     * @param Table[] $tableList
-     */
-    private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper)
-    {
-        // For each table, let's write a property.
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Generates the factory bean.
+	 *
+	 * @param Table[] $tableList
+	 */
+	private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper)
+	{
+		// For each table, let's write a property.
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -490,12 +490,12 @@ 
 {
 ";
 
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->getDaoNameFromTableName($tableName);
-            $daoInstanceName = self::toVariableName($daoClassName);
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->getDaoNameFromTableName($tableName);
+			$daoInstanceName = self::toVariableName($daoClassName);
 
-            $str .= '    /**
+			$str .= '    /**
      * @var '.$daoClassName.'
      */
     private $'.$daoInstanceName.';
@@ -520,155 +520,155 @@ 
     }
 
 ';
-        }
+		}
 
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\'.$daoFactoryClassName);
-        if (empty($possibleFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName, $str);
-        @chmod($possibleFileName, 0664);
-    }
-
-    /**
-     * Transforms a string to camelCase (except the first letter will be uppercase too).
-     * Underscores and spaces are removed and the first letter after the underscore is uppercased.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toCamelCase($str)
-    {
-        $str = strtoupper(substr($str, 0, 1)).substr($str, 1);
-        while (true) {
-            if (strpos($str, '_') === false && strpos($str, ' ') === false) {
-                break;
-            }
-
-            $pos = strpos($str, '_');
-            if ($pos === false) {
-                $pos = strpos($str, ' ');
-            }
-            $before = substr($str, 0, $pos);
-            $after = substr($str, $pos + 1);
-            $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
-        }
-
-        return $str;
-    }
-
-    /**
-     * Tries to put string to the singular form (if it is plural).
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toSingular($str)
-    {
-        return Inflector::singularize($str);
-    }
-
-    /**
-     * Put the first letter of the string in lower case.
-     * Very useful to transform a class name into a variable name.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toVariableName($str)
-    {
-        return strtolower(substr($str, 0, 1)).substr($str, 1);
-    }
-
-    /**
-     * Ensures the file passed in parameter can be written in its directory.
-     *
-     * @param string $fileName
-     *
-     * @throws TDBMException
-     */
-    private function ensureDirectoryExist($fileName)
-    {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result === false) {
-                throw new TDBMException("Unable to create directory: '".$dirName."'.");
-            }
-        }
-    }
-
-    /**
-     * @param string $rootPath
-     */
-    public function setRootPath($rootPath)
-    {
-        $this->rootPath = $rootPath;
-    }
-
-    /**
-     * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
-     *
-     * @param Type $type The DBAL type
-     *
-     * @return string The PHP type
-     */
-    public static function dbalTypeToPhpType(Type $type)
-    {
-        $map = [
-            Type::TARRAY => 'array',
-            Type::SIMPLE_ARRAY => 'array',
-            Type::JSON_ARRAY => 'array',
-            Type::BIGINT => 'string',
-            Type::BOOLEAN => 'bool',
-            Type::DATETIME => '\DateTimeInterface',
-            Type::DATETIMETZ => '\DateTimeInterface',
-            Type::DATE => '\DateTimeInterface',
-            Type::TIME => '\DateTimeInterface',
-            Type::DECIMAL => 'float',
-            Type::INTEGER => 'int',
-            Type::OBJECT => 'string',
-            Type::SMALLINT => 'int',
-            Type::STRING => 'string',
-            Type::TEXT => 'string',
-            Type::BINARY => 'string',
-            Type::BLOB => 'string',
-            Type::FLOAT => 'float',
-            Type::GUID => 'string',
-        ];
-
-        return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
-    }
-
-    /**
-     * @param string $beanNamespace
-     *
-     * @return \string[] Returns a map mapping table name to beans name
-     */
-    public function buildTableToBeanMap($beanNamespace)
-    {
-        $tableToBeanMap = [];
-
-        $tables = $this->schema->getTables();
-
-        foreach ($tables as $table) {
-            $tableName = $table->getName();
-            $tableToBeanMap[$tableName] = $beanNamespace.'\\'.self::getBeanNameFromTableName($tableName);
-        }
-
-        return $tableToBeanMap;
-    }
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\'.$daoFactoryClassName);
+		if (empty($possibleFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		$this->ensureDirectoryExist($possibleFileName);
+		file_put_contents($possibleFileName, $str);
+		@chmod($possibleFileName, 0664);
+	}
+
+	/**
+	 * Transforms a string to camelCase (except the first letter will be uppercase too).
+	 * Underscores and spaces are removed and the first letter after the underscore is uppercased.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toCamelCase($str)
+	{
+		$str = strtoupper(substr($str, 0, 1)).substr($str, 1);
+		while (true) {
+			if (strpos($str, '_') === false && strpos($str, ' ') === false) {
+				break;
+			}
+
+			$pos = strpos($str, '_');
+			if ($pos === false) {
+				$pos = strpos($str, ' ');
+			}
+			$before = substr($str, 0, $pos);
+			$after = substr($str, $pos + 1);
+			$str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Tries to put string to the singular form (if it is plural).
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toSingular($str)
+	{
+		return Inflector::singularize($str);
+	}
+
+	/**
+	 * Put the first letter of the string in lower case.
+	 * Very useful to transform a class name into a variable name.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toVariableName($str)
+	{
+		return strtolower(substr($str, 0, 1)).substr($str, 1);
+	}
+
+	/**
+	 * Ensures the file passed in parameter can be written in its directory.
+	 *
+	 * @param string $fileName
+	 *
+	 * @throws TDBMException
+	 */
+	private function ensureDirectoryExist($fileName)
+	{
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result === false) {
+				throw new TDBMException("Unable to create directory: '".$dirName."'.");
+			}
+		}
+	}
+
+	/**
+	 * @param string $rootPath
+	 */
+	public function setRootPath($rootPath)
+	{
+		$this->rootPath = $rootPath;
+	}
+
+	/**
+	 * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
+	 *
+	 * @param Type $type The DBAL type
+	 *
+	 * @return string The PHP type
+	 */
+	public static function dbalTypeToPhpType(Type $type)
+	{
+		$map = [
+			Type::TARRAY => 'array',
+			Type::SIMPLE_ARRAY => 'array',
+			Type::JSON_ARRAY => 'array',
+			Type::BIGINT => 'string',
+			Type::BOOLEAN => 'bool',
+			Type::DATETIME => '\DateTimeInterface',
+			Type::DATETIMETZ => '\DateTimeInterface',
+			Type::DATE => '\DateTimeInterface',
+			Type::TIME => '\DateTimeInterface',
+			Type::DECIMAL => 'float',
+			Type::INTEGER => 'int',
+			Type::OBJECT => 'string',
+			Type::SMALLINT => 'int',
+			Type::STRING => 'string',
+			Type::TEXT => 'string',
+			Type::BINARY => 'string',
+			Type::BLOB => 'string',
+			Type::FLOAT => 'float',
+			Type::GUID => 'string',
+		];
+
+		return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
+	}
+
+	/**
+	 * @param string $beanNamespace
+	 *
+	 * @return \string[] Returns a map mapping table name to beans name
+	 */
+	public function buildTableToBeanMap($beanNamespace)
+	{
+		$tableToBeanMap = [];
+
+		$tables = $this->schema->getTables();
+
+		foreach ($tables as $table) {
+			$tableName = $table->getName();
+			$tableToBeanMap[$tableName] = $beanNamespace.'\\'.self::getBeanNameFromTableName($tableName);
+		}
+
+		return $tableToBeanMap;
+	}
 }

src/Mouf/Database/TDBM/TDBMService.php

Indentation +1399 added lines, -1399 removed lines

@@ -41,231 +41,231 @@ 
  */
 class TDBMService
 {
-    const MODE_CURSOR = 1;
-    const MODE_ARRAY = 2;
-
-    /**
-     * The database connection.
-     *
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var MagicQuery
-     */
-    private $magicQuery;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * The default autosave mode for the objects
-     * True to automatically save the object.
-     * If false, the user must explicitly call the save() method to save the object.
-     *
-     * @var bool
-     */
-    //private $autosave_default = false;
-
-    /**
-     * Cache of table of primary keys.
-     * Primary keys are stored by tables, as an array of column.
-     * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
-     *
-     * @var string[]
-     */
-    private $primaryKeysColumns;
-
-    /**
-     * Service storing objects in memory.
-     * Access is done by table name and then by primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var StandardObjectStorage|WeakrefObjectStorage
-     */
-    private $objectStorage;
-
-    /**
-     * The fetch mode of the result sets returned by `getObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
-     * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
-     * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
-     * You can access the array by key, or using foreach, several times.
-     *
-     * @var int
-     */
-    private $mode = self::MODE_ARRAY;
-
-    /**
-     * Table of new objects not yet inserted in database or objects modified that must be saved.
-     *
-     * @var \SplObjectStorage of DbRow objects
-     */
-    private $toSaveObjects;
-
-    /// The timestamp of the script startup. Useful to stop execution before time limit is reached and display useful error message.
-    public static $script_start_up_time;
-
-    /**
-     * The content of the cache variable.
-     *
-     * @var array<string, mixed>
-     */
-    private $cache;
-
-    private $cacheKey = '__TDBM_Cache__';
-
-    /**
-     * Map associating a table name to a fully qualified Bean class name.
-     *
-     * @var array
-     */
-    private $tableToBeanMap = [];
-
-    /**
-     * @var \ReflectionClass[]
-     */
-    private $reflectionClassCache;
-
-    /**
-     * @param Connection     $connection     The DBAL DB connection to use
-     * @param Cache|null     $cache          A cache service to be used
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
-     *                                       Will be automatically created if not passed.
-     */
-    public function __construct(Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null)
-    {
-        //register_shutdown_function(array($this,"completeSaveOnExit"));
-        if (extension_loaded('weakref')) {
-            $this->objectStorage = new WeakrefObjectStorage();
-        } else {
-            $this->objectStorage = new StandardObjectStorage();
-        }
-        $this->connection = $connection;
-        if ($cache !== null) {
-            $this->cache = $cache;
-        } else {
-            $this->cache = new VoidCache();
-        }
-        if ($schemaAnalyzer) {
-            $this->schemaAnalyzer = $schemaAnalyzer;
-        } else {
-            $this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
-        }
-
-        $this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
-
-        $this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($connection, $this->cache, $this->schemaAnalyzer);
-        $this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
-
-        if (self::$script_start_up_time === null) {
-            self::$script_start_up_time = microtime(true);
-        }
-        $this->toSaveObjects = new \SplObjectStorage();
-    }
-
-    /**
-     * Returns the object used to connect to the database.
-     *
-     * @return Connection
-     */
-    public function getConnection()
-    {
-        return $this->connection;
-    }
-
-    /**
-     * Creates a unique cache key for the current connection.
-     *
-     * @return string
-     */
-    private function getConnectionUniqueId()
-    {
-        return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-    }
-
-    /**
-     * Sets the default fetch mode of the result sets returned by `getObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
-     * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
-     *
-     * @param int $mode
-     *
-     * @return $this
-     *
-     * @throws TDBMException
-     */
-    public function setFetchMode($mode)
-    {
-        if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
-        }
-        $this->mode = $mode;
-
-        return $this;
-    }
-
-    /**
-     * Returns a TDBMObject associated from table "$table_name".
-     * If the $filters parameter is an int/string, the object returned will be the object whose primary key = $filters.
-     * $filters can also be a set of TDBM_Filters (see the getObjects method for more details).
-     *
-     * For instance, if there is a table 'users', with a primary key on column 'user_id' and a column 'user_name', then
-     * 			$user = $tdbmService->getObject('users',1);
-     * 			echo $user->name;
-     * will return the name of the user whose user_id is one.
-     *
-     * If a table has a primary key over several columns, you should pass to $id an array containing the the value of the various columns.
-     * For instance:
-     * 			$group = $tdbmService->getObject('groups',array(1,2));
-     *
-     * Note that TDBMObject performs caching for you. If you get twice the same object, the reference of the object you will get
-     * will be the same.
-     *
-     * For instance:
-     * 			$user1 = $tdbmService->getObject('users',1);
-     * 			$user2 = $tdbmService->getObject('users',1);
-     * 			$user1->name = 'John Doe';
-     * 			echo $user2->name;
-     * will return 'John Doe'.
-     *
-     * You can use filters instead of passing the primary key. For instance:
-     * 			$user = $tdbmService->getObject('users',new EqualFilter('users', 'login', 'jdoe'));
-     * This will return the user whose login is 'jdoe'.
-     * Please note that if 2 users have the jdoe login in database, the method will throw a TDBM_DuplicateRowException.
-     *
-     * Also, you can specify the return class for the object (provided the return class extends TDBMObject).
-     * For instance:
-     *  	$user = $tdbmService->getObject('users',1,'User');
-     * will return an object from the "User" class. The "User" class must extend the "TDBMObject" class.
-     * Please be sure not to override any method or any property unless you perfectly know what you are doing!
-     *
-     * @param string $table_name   The name of the table we retrieve an object from.
-     * @param mixed  $filters      If the filter is a string/integer, it will be considered as the id of the object (the value of the primary key). Otherwise, it can be a filter bag (see the filterbag parameter of the getObjects method for more details about filter bags)
-     * @param string $className    Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
-     * @param bool   $lazy_loading If set to true, and if the primary key is passed in parameter of getObject, the object will not be queried in database. It will be queried when you first try to access a column. If at that time the object cannot be found in database, an exception will be thrown.
-     *
-     * @return TDBMObject
-     */
+	const MODE_CURSOR = 1;
+	const MODE_ARRAY = 2;
+
+	/**
+	 * The database connection.
+	 *
+	 * @var Connection
+	 */
+	private $connection;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var MagicQuery
+	 */
+	private $magicQuery;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * The default autosave mode for the objects
+	 * True to automatically save the object.
+	 * If false, the user must explicitly call the save() method to save the object.
+	 *
+	 * @var bool
+	 */
+	//private $autosave_default = false;
+
+	/**
+	 * Cache of table of primary keys.
+	 * Primary keys are stored by tables, as an array of column.
+	 * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
+	 *
+	 * @var string[]
+	 */
+	private $primaryKeysColumns;
+
+	/**
+	 * Service storing objects in memory.
+	 * Access is done by table name and then by primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var StandardObjectStorage|WeakrefObjectStorage
+	 */
+	private $objectStorage;
+
+	/**
+	 * The fetch mode of the result sets returned by `getObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
+	 * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
+	 * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
+	 * You can access the array by key, or using foreach, several times.
+	 *
+	 * @var int
+	 */
+	private $mode = self::MODE_ARRAY;
+
+	/**
+	 * Table of new objects not yet inserted in database or objects modified that must be saved.
+	 *
+	 * @var \SplObjectStorage of DbRow objects
+	 */
+	private $toSaveObjects;
+
+	/// The timestamp of the script startup. Useful to stop execution before time limit is reached and display useful error message.
+	public static $script_start_up_time;
+
+	/**
+	 * The content of the cache variable.
+	 *
+	 * @var array<string, mixed>
+	 */
+	private $cache;
+
+	private $cacheKey = '__TDBM_Cache__';
+
+	/**
+	 * Map associating a table name to a fully qualified Bean class name.
+	 *
+	 * @var array
+	 */
+	private $tableToBeanMap = [];
+
+	/**
+	 * @var \ReflectionClass[]
+	 */
+	private $reflectionClassCache;
+
+	/**
+	 * @param Connection     $connection     The DBAL DB connection to use
+	 * @param Cache|null     $cache          A cache service to be used
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
+	 *                                       Will be automatically created if not passed.
+	 */
+	public function __construct(Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null)
+	{
+		//register_shutdown_function(array($this,"completeSaveOnExit"));
+		if (extension_loaded('weakref')) {
+			$this->objectStorage = new WeakrefObjectStorage();
+		} else {
+			$this->objectStorage = new StandardObjectStorage();
+		}
+		$this->connection = $connection;
+		if ($cache !== null) {
+			$this->cache = $cache;
+		} else {
+			$this->cache = new VoidCache();
+		}
+		if ($schemaAnalyzer) {
+			$this->schemaAnalyzer = $schemaAnalyzer;
+		} else {
+			$this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
+		}
+
+		$this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
+
+		$this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($connection, $this->cache, $this->schemaAnalyzer);
+		$this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
+
+		if (self::$script_start_up_time === null) {
+			self::$script_start_up_time = microtime(true);
+		}
+		$this->toSaveObjects = new \SplObjectStorage();
+	}
+
+	/**
+	 * Returns the object used to connect to the database.
+	 *
+	 * @return Connection
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Creates a unique cache key for the current connection.
+	 *
+	 * @return string
+	 */
+	private function getConnectionUniqueId()
+	{
+		return hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+	}
+
+	/**
+	 * Sets the default fetch mode of the result sets returned by `getObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
+	 * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
+	 *
+	 * @param int $mode
+	 *
+	 * @return $this
+	 *
+	 * @throws TDBMException
+	 */
+	public function setFetchMode($mode)
+	{
+		if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
+		}
+		$this->mode = $mode;
+
+		return $this;
+	}
+
+	/**
+	 * Returns a TDBMObject associated from table "$table_name".
+	 * If the $filters parameter is an int/string, the object returned will be the object whose primary key = $filters.
+	 * $filters can also be a set of TDBM_Filters (see the getObjects method for more details).
+	 *
+	 * For instance, if there is a table 'users', with a primary key on column 'user_id' and a column 'user_name', then
+	 * 			$user = $tdbmService->getObject('users',1);
+	 * 			echo $user->name;
+	 * will return the name of the user whose user_id is one.
+	 *
+	 * If a table has a primary key over several columns, you should pass to $id an array containing the the value of the various columns.
+	 * For instance:
+	 * 			$group = $tdbmService->getObject('groups',array(1,2));
+	 *
+	 * Note that TDBMObject performs caching for you. If you get twice the same object, the reference of the object you will get
+	 * will be the same.
+	 *
+	 * For instance:
+	 * 			$user1 = $tdbmService->getObject('users',1);
+	 * 			$user2 = $tdbmService->getObject('users',1);
+	 * 			$user1->name = 'John Doe';
+	 * 			echo $user2->name;
+	 * will return 'John Doe'.
+	 *
+	 * You can use filters instead of passing the primary key. For instance:
+	 * 			$user = $tdbmService->getObject('users',new EqualFilter('users', 'login', 'jdoe'));
+	 * This will return the user whose login is 'jdoe'.
+	 * Please note that if 2 users have the jdoe login in database, the method will throw a TDBM_DuplicateRowException.
+	 *
+	 * Also, you can specify the return class for the object (provided the return class extends TDBMObject).
+	 * For instance:
+	 *  	$user = $tdbmService->getObject('users',1,'User');
+	 * will return an object from the "User" class. The "User" class must extend the "TDBMObject" class.
+	 * Please be sure not to override any method or any property unless you perfectly know what you are doing!
+	 *
+	 * @param string $table_name   The name of the table we retrieve an object from.
+	 * @param mixed  $filters      If the filter is a string/integer, it will be considered as the id of the object (the value of the primary key). Otherwise, it can be a filter bag (see the filterbag parameter of the getObjects method for more details about filter bags)
+	 * @param string $className    Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
+	 * @param bool   $lazy_loading If set to true, and if the primary key is passed in parameter of getObject, the object will not be queried in database. It will be queried when you first try to access a column. If at that time the object cannot be found in database, an exception will be thrown.
+	 *
+	 * @return TDBMObject
+	 */
 /*	public function getObject($table_name, $filters, $className = null, $lazy_loading = false) {
 
         if (is_array($filters) || $filters instanceof FilterInterface) {
@@ -351,215 +351,215 @@ 
         return $obj;
     }*/
 
-    /**
-     * Removes the given object from database.
-     * This cannot be called on an object that is not attached to this TDBMService
-     * (will throw a TDBMInvalidOperationException).
-     *
-     * @param AbstractTDBMObject $object the object to delete.
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function delete(AbstractTDBMObject $object)
-    {
-        switch ($object->_getStatus()) {
-            case TDBMObjectStateEnum::STATE_DELETED:
-                // Nothing to do, object already deleted.
-                return;
-            case TDBMObjectStateEnum::STATE_DETACHED:
-                throw new TDBMInvalidOperationException('Cannot delete a detached object');
-            case TDBMObjectStateEnum::STATE_NEW:
-                $this->deleteManyToManyRelationships($object);
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-                break;
-            case TDBMObjectStateEnum::STATE_DIRTY:
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-            case TDBMObjectStateEnum::STATE_NOT_LOADED:
-            case TDBMObjectStateEnum::STATE_LOADED:
-                $this->deleteManyToManyRelationships($object);
-                // Let's delete db rows, in reverse order.
-                foreach (array_reverse($object->_getDbRows()) as $dbRow) {
-                    $tableName = $dbRow->_getDbTableName();
-                    $primaryKeys = $dbRow->_getPrimaryKeys();
-                    $this->connection->delete($tableName, $primaryKeys);
-                    $this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
-                }
-                break;
-            // @codeCoverageIgnoreStart
-            default:
-                throw new TDBMInvalidOperationException('Unexpected status for bean');
-            // @codeCoverageIgnoreEnd
-        }
-
-        $object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
-    }
-
-    /**
-     * Removes all many to many relationships for this object.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    private function deleteManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getDbRows() as $tableName => $dbRow) {
-            $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
-            foreach ($pivotTables as $pivotTable) {
-                $remoteBeans = $object->_getRelationships($pivotTable);
-                foreach ($remoteBeans as $remoteBean) {
-                    $object->_removeRelationship($pivotTable, $remoteBean);
-                }
-            }
-        }
-        $this->persistManyToManyRelationships($object);
-    }
-
-    /**
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
-     * by parameter before all.
-     *
-     * Notice: if the object has a multiple primary key, the function will not work.
-     *
-     * @param AbstractTDBMObject $objToDelete
-     */
-    public function deleteCascade(AbstractTDBMObject $objToDelete)
-    {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->delete($objToDelete);
-    }
-
-    /**
-     * This function is used only in TDBMService (private function)
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
-     *
-     * @param AbstractTDBMObject $obj
-     */
-    private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
-    {
-        $dbRows = $obj->_getDbRows();
-        foreach ($dbRows as $dbRow) {
-            $tableName = $dbRow->_getDbTableName();
-            $pks = array_values($dbRow->_getPrimaryKeys());
-            if (!empty($pks)) {
-                $incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
-
-                foreach ($incomingFks as $incomingFk) {
-                    $filter = array_combine($incomingFk->getLocalColumns(), $pks);
-
-                    $results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
-
-                    foreach ($results as $bean) {
-                        $this->deleteCascade($bean);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * This function performs a save() of all the objects that have been modified.
-     */
-    public function completeSave()
-    {
-        foreach ($this->toSaveObjects as $dbRow) {
-            $this->save($dbRow->getTDBMObject());
-        }
-    }
-
-    /**
-     * Returns an array of objects of "table_name" kind filtered from the filter bag.
-     *
-     * The getObjects method should be the most used query method in TDBM if you want to query the database for objects.
-     * (Note: if you want to query the database for an object by its primary key, use the getObject method).
-     *
-     * The getObjects method takes in parameter:
-     * 	- table_name: the kinf of TDBMObject you want to retrieve. In TDBM, a TDBMObject matches a database row, so the
-     * 			$table_name parameter should be the name of an existing table in database.
-     *  - filter_bag: The filter bag is anything that you can use to filter your request. It can be a SQL Where clause,
-     * 			a series of TDBM_Filter objects, or even TDBMObjects or TDBMObjectArrays that you will use as filters.
-     *  - order_bag: The order bag is anything that will be used to order the data that is passed back to you.
-     * 			A SQL Order by clause can be used as an order bag for instance, or a OrderByColumn object
-     * 	- from (optionnal): The offset from which the query should be performed. For instance, if $from=5, the getObjects method
-     * 			will return objects from the 6th rows.
-     * 	- limit (optionnal): The maximum number of objects to return. Used together with $from, you can implement
-     * 			paging mechanisms.
-     *  - hint_path (optionnal): EXPERTS ONLY! The path the request should use if not the most obvious one. This parameter
-     * 			should be used only if you perfectly know what you are doing.
-     *
-     * The getObjects method will return a TDBMObjectArray. A TDBMObjectArray is an array of TDBMObjects that does behave as
-     * a single TDBMObject if the array has only one member. Refer to the documentation of TDBMObjectArray and TDBMObject
-     * to learn more.
-     *
-     * More about the filter bag:
-     * A filter is anything that can change the set of objects returned by getObjects.
-     * There are many kind of filters in TDBM:
-     * A filter can be:
-     * 	- A SQL WHERE clause:
-     * 		The clause is specified without the "WHERE" keyword. For instance:
-     * 			$filter = "users.first_name LIKE 'J%'";
-     *     	is a valid filter.
-     * 	   	The only difference with SQL is that when you specify a column name, it should always be fully qualified with
-     * 		the table name: "country_name='France'" is not valid, while "countries.country_name='France'" is valid (if
-     * 		"countries" is a table and "country_name" a column in that table, sure.
-     * 		For instance,
-     * 				$french_users = TDBMObject::getObjects("users", "countries.country_name='France'");
-     * 		will return all the users that are French (based on trhe assumption that TDBM can find a way to connect the users
-     * 		table to the country table using foreign keys, see the manual for that point).
-     * 	- A TDBMObject:
-     * 		An object can be used as a filter. For instance, we could get the France object and then find any users related to
-     * 		that object using:
-     * 				$france = TDBMObject::getObjects("country", "countries.country_name='France'");
-     * 				$french_users = TDBMObject::getObjects("users", $france);
-     *  - A TDBMObjectArray can be used as a filter too.
-     * 		For instance:
-     * 				$french_groups = TDBMObject::getObjects("groups", $french_users);
-     * 		might return all the groups in which french users can be found.
-     *  - Finally, TDBM_xxxFilter instances can be used.
-     * 		TDBM provides the developer a set of TDBM_xxxFilters that can be used to model a SQL Where query.
-     * 		Using the appropriate filter object, you can model the operations =,<,<=,>,>=,IN,LIKE,AND,OR, IS NULL and NOT
-     * 		For instance:
-     * 				$french_users = TDBMObject::getObjects("users", new EqualFilter('countries','country_name','France');
-     * 		Refer to the documentation of the appropriate filters for more information.
-     *
-     * The nice thing about a filter bag is that it can be any filter, or any array of filters. In that case, filters are
-     * 'ANDed' together.
-     * So a request like this is valid:
-     * 				$france = TDBMObject::getObjects("country", "countries.country_name='France'");
-     * 				$french_administrators = TDBMObject::getObjects("users", array($france,"role.role_name='Administrators'");
-     * This requests would return the users that are both French and administrators.
-     *
-     * Finally, if filter_bag is null, the whole table is returned.
-     *
-     * More about the order bag:
-     * The order bag contains anything that can be used to order the data that is passed back to you.
-     * The order bag can contain two kinds of objects:
-     * 	- A SQL ORDER BY clause:
-     * 		The clause is specified without the "ORDER BY" keyword. For instance:
-     * 			$orderby = "users.last_name ASC, users.first_name ASC";
-     *     	is a valid order bag.
-     * 		The only difference with SQL is that when you specify a column name, it should always be fully qualified with
-     * 		the table name: "country_name ASC" is not valid, while "countries.country_name ASC" is valid (if
-     * 		"countries" is a table and "country_name" a column in that table, sure.
-     * 		For instance,
-     * 				$french_users = TDBMObject::getObjects("users", null, "countries.country_name ASC");
-     * 		will return all the users sorted by country.
-     *  - A OrderByColumn object
-     * 		This object models a single column in a database.
-     *
-     * @param string       $table_name  The name of the table queried
-     * @param mixed        $filter_bag  The filter bag (see above for complete description)
-     * @param mixed        $orderby_bag The order bag (see above for complete description)
-     * @param int          $from        The offset
-     * @param int          $limit       The maximum number of rows returned
-     * @param string       $className   Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
-     * @param unknown_type $hint_path   Hints to get the path for the query (expert parameter, you should leave it to null).
-     *
-     * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
-     */
+	/**
+	 * Removes the given object from database.
+	 * This cannot be called on an object that is not attached to this TDBMService
+	 * (will throw a TDBMInvalidOperationException).
+	 *
+	 * @param AbstractTDBMObject $object the object to delete.
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function delete(AbstractTDBMObject $object)
+	{
+		switch ($object->_getStatus()) {
+			case TDBMObjectStateEnum::STATE_DELETED:
+				// Nothing to do, object already deleted.
+				return;
+			case TDBMObjectStateEnum::STATE_DETACHED:
+				throw new TDBMInvalidOperationException('Cannot delete a detached object');
+			case TDBMObjectStateEnum::STATE_NEW:
+				$this->deleteManyToManyRelationships($object);
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+				break;
+			case TDBMObjectStateEnum::STATE_DIRTY:
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+			case TDBMObjectStateEnum::STATE_NOT_LOADED:
+			case TDBMObjectStateEnum::STATE_LOADED:
+				$this->deleteManyToManyRelationships($object);
+				// Let's delete db rows, in reverse order.
+				foreach (array_reverse($object->_getDbRows()) as $dbRow) {
+					$tableName = $dbRow->_getDbTableName();
+					$primaryKeys = $dbRow->_getPrimaryKeys();
+					$this->connection->delete($tableName, $primaryKeys);
+					$this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
+				}
+				break;
+			// @codeCoverageIgnoreStart
+			default:
+				throw new TDBMInvalidOperationException('Unexpected status for bean');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
+	}
+
+	/**
+	 * Removes all many to many relationships for this object.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	private function deleteManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getDbRows() as $tableName => $dbRow) {
+			$pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
+			foreach ($pivotTables as $pivotTable) {
+				$remoteBeans = $object->_getRelationships($pivotTable);
+				foreach ($remoteBeans as $remoteBean) {
+					$object->_removeRelationship($pivotTable, $remoteBean);
+				}
+			}
+		}
+		$this->persistManyToManyRelationships($object);
+	}
+
+	/**
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
+	 * by parameter before all.
+	 *
+	 * Notice: if the object has a multiple primary key, the function will not work.
+	 *
+	 * @param AbstractTDBMObject $objToDelete
+	 */
+	public function deleteCascade(AbstractTDBMObject $objToDelete)
+	{
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->delete($objToDelete);
+	}
+
+	/**
+	 * This function is used only in TDBMService (private function)
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
+	 *
+	 * @param AbstractTDBMObject $obj
+	 */
+	private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
+	{
+		$dbRows = $obj->_getDbRows();
+		foreach ($dbRows as $dbRow) {
+			$tableName = $dbRow->_getDbTableName();
+			$pks = array_values($dbRow->_getPrimaryKeys());
+			if (!empty($pks)) {
+				$incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
+
+				foreach ($incomingFks as $incomingFk) {
+					$filter = array_combine($incomingFk->getLocalColumns(), $pks);
+
+					$results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
+
+					foreach ($results as $bean) {
+						$this->deleteCascade($bean);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This function performs a save() of all the objects that have been modified.
+	 */
+	public function completeSave()
+	{
+		foreach ($this->toSaveObjects as $dbRow) {
+			$this->save($dbRow->getTDBMObject());
+		}
+	}
+
+	/**
+	 * Returns an array of objects of "table_name" kind filtered from the filter bag.
+	 *
+	 * The getObjects method should be the most used query method in TDBM if you want to query the database for objects.
+	 * (Note: if you want to query the database for an object by its primary key, use the getObject method).
+	 *
+	 * The getObjects method takes in parameter:
+	 * 	- table_name: the kinf of TDBMObject you want to retrieve. In TDBM, a TDBMObject matches a database row, so the
+	 * 			$table_name parameter should be the name of an existing table in database.
+	 *  - filter_bag: The filter bag is anything that you can use to filter your request. It can be a SQL Where clause,
+	 * 			a series of TDBM_Filter objects, or even TDBMObjects or TDBMObjectArrays that you will use as filters.
+	 *  - order_bag: The order bag is anything that will be used to order the data that is passed back to you.
+	 * 			A SQL Order by clause can be used as an order bag for instance, or a OrderByColumn object
+	 * 	- from (optionnal): The offset from which the query should be performed. For instance, if $from=5, the getObjects method
+	 * 			will return objects from the 6th rows.
+	 * 	- limit (optionnal): The maximum number of objects to return. Used together with $from, you can implement
+	 * 			paging mechanisms.
+	 *  - hint_path (optionnal): EXPERTS ONLY! The path the request should use if not the most obvious one. This parameter
+	 * 			should be used only if you perfectly know what you are doing.
+	 *
+	 * The getObjects method will return a TDBMObjectArray. A TDBMObjectArray is an array of TDBMObjects that does behave as
+	 * a single TDBMObject if the array has only one member. Refer to the documentation of TDBMObjectArray and TDBMObject
+	 * to learn more.
+	 *
+	 * More about the filter bag:
+	 * A filter is anything that can change the set of objects returned by getObjects.
+	 * There are many kind of filters in TDBM:
+	 * A filter can be:
+	 * 	- A SQL WHERE clause:
+	 * 		The clause is specified without the "WHERE" keyword. For instance:
+	 * 			$filter = "users.first_name LIKE 'J%'";
+	 *     	is a valid filter.
+	 * 	   	The only difference with SQL is that when you specify a column name, it should always be fully qualified with
+	 * 		the table name: "country_name='France'" is not valid, while "countries.country_name='France'" is valid (if
+	 * 		"countries" is a table and "country_name" a column in that table, sure.
+	 * 		For instance,
+	 * 				$french_users = TDBMObject::getObjects("users", "countries.country_name='France'");
+	 * 		will return all the users that are French (based on trhe assumption that TDBM can find a way to connect the users
+	 * 		table to the country table using foreign keys, see the manual for that point).
+	 * 	- A TDBMObject:
+	 * 		An object can be used as a filter. For instance, we could get the France object and then find any users related to
+	 * 		that object using:
+	 * 				$france = TDBMObject::getObjects("country", "countries.country_name='France'");
+	 * 				$french_users = TDBMObject::getObjects("users", $france);
+	 *  - A TDBMObjectArray can be used as a filter too.
+	 * 		For instance:
+	 * 				$french_groups = TDBMObject::getObjects("groups", $french_users);
+	 * 		might return all the groups in which french users can be found.
+	 *  - Finally, TDBM_xxxFilter instances can be used.
+	 * 		TDBM provides the developer a set of TDBM_xxxFilters that can be used to model a SQL Where query.
+	 * 		Using the appropriate filter object, you can model the operations =,<,<=,>,>=,IN,LIKE,AND,OR, IS NULL and NOT
+	 * 		For instance:
+	 * 				$french_users = TDBMObject::getObjects("users", new EqualFilter('countries','country_name','France');
+	 * 		Refer to the documentation of the appropriate filters for more information.
+	 *
+	 * The nice thing about a filter bag is that it can be any filter, or any array of filters. In that case, filters are
+	 * 'ANDed' together.
+	 * So a request like this is valid:
+	 * 				$france = TDBMObject::getObjects("country", "countries.country_name='France'");
+	 * 				$french_administrators = TDBMObject::getObjects("users", array($france,"role.role_name='Administrators'");
+	 * This requests would return the users that are both French and administrators.
+	 *
+	 * Finally, if filter_bag is null, the whole table is returned.
+	 *
+	 * More about the order bag:
+	 * The order bag contains anything that can be used to order the data that is passed back to you.
+	 * The order bag can contain two kinds of objects:
+	 * 	- A SQL ORDER BY clause:
+	 * 		The clause is specified without the "ORDER BY" keyword. For instance:
+	 * 			$orderby = "users.last_name ASC, users.first_name ASC";
+	 *     	is a valid order bag.
+	 * 		The only difference with SQL is that when you specify a column name, it should always be fully qualified with
+	 * 		the table name: "country_name ASC" is not valid, while "countries.country_name ASC" is valid (if
+	 * 		"countries" is a table and "country_name" a column in that table, sure.
+	 * 		For instance,
+	 * 				$french_users = TDBMObject::getObjects("users", null, "countries.country_name ASC");
+	 * 		will return all the users sorted by country.
+	 *  - A OrderByColumn object
+	 * 		This object models a single column in a database.
+	 *
+	 * @param string       $table_name  The name of the table queried
+	 * @param mixed        $filter_bag  The filter bag (see above for complete description)
+	 * @param mixed        $orderby_bag The order bag (see above for complete description)
+	 * @param int          $from        The offset
+	 * @param int          $limit       The maximum number of rows returned
+	 * @param string       $className   Optional: The name of the class to instanciate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
+	 * @param unknown_type $hint_path   Hints to get the path for the query (expert parameter, you should leave it to null).
+	 *
+	 * @return TDBMObjectArray A TDBMObjectArray containing the resulting objects of the query.
+	 */
 /*	public function getObjects($table_name, $filter_bag=null, $orderby_bag=null, $from=null, $limit=null, $className=null, $hint_path=null) {
         if ($this->connection == null) {
             throw new TDBMException("Error while calling TDBMObject::getObject(): No connection has been established on the database!");
@@ -567,57 +567,57 @@ 
         return $this->getObjectsByMode('getObjects', $table_name, $filter_bag, $orderby_bag, $from, $limit, $className, $hint_path);
     }*/
 
-    /**
-     * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
-     * and gives back a proper Filter object.
-     *
-     * @param mixed $filter_bag
-     *
-     * @return array First item: filter string, second item: parameters.
-     *
-     * @throws TDBMException
-     */
-    public function buildFilterFromFilterBag($filter_bag)
-    {
-        $counter = 1;
-        if ($filter_bag === null) {
-            return ['', []];
-        } elseif (is_string($filter_bag)) {
-            return [$filter_bag, []];
-        } elseif (is_array($filter_bag)) {
-            $sqlParts = [];
-            $parameters = [];
-            foreach ($filter_bag as $column => $value) {
-                $paramName = 'tdbmparam'.$counter;
-                if (is_array($value)) {
-                    $sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
-                } else {
-                    $sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
-                }
-                $parameters[$paramName] = $value;
-                ++$counter;
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof AbstractTDBMObject) {
-            $sqlParts = [];
-            $dbRows = $filter_bag->_getDbRows();
-            $dbRow = reset($dbRows);
-            $primaryKeys = $dbRow->_getPrimaryKeys();
-
-            foreach ($primaryKeys as $column => $value) {
-                $paramName = 'tdbmparam'.$counter;
-                $sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
-                $parameters[$paramName] = $value;
-                ++$counter;
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof \Iterator) {
-            return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag));
-        } else {
-            throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
-        }
+	/**
+	 * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
+	 * and gives back a proper Filter object.
+	 *
+	 * @param mixed $filter_bag
+	 *
+	 * @return array First item: filter string, second item: parameters.
+	 *
+	 * @throws TDBMException
+	 */
+	public function buildFilterFromFilterBag($filter_bag)
+	{
+		$counter = 1;
+		if ($filter_bag === null) {
+			return ['', []];
+		} elseif (is_string($filter_bag)) {
+			return [$filter_bag, []];
+		} elseif (is_array($filter_bag)) {
+			$sqlParts = [];
+			$parameters = [];
+			foreach ($filter_bag as $column => $value) {
+				$paramName = 'tdbmparam'.$counter;
+				if (is_array($value)) {
+					$sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
+				} else {
+					$sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
+				}
+				$parameters[$paramName] = $value;
+				++$counter;
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof AbstractTDBMObject) {
+			$sqlParts = [];
+			$dbRows = $filter_bag->_getDbRows();
+			$dbRow = reset($dbRows);
+			$primaryKeys = $dbRow->_getPrimaryKeys();
+
+			foreach ($primaryKeys as $column => $value) {
+				$paramName = 'tdbmparam'.$counter;
+				$sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
+				$parameters[$paramName] = $value;
+				++$counter;
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof \Iterator) {
+			return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag));
+		} else {
+			throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
+		}
 
 //		// First filter_bag should be an array, if it is a singleton, let's put it in an array.
 //		if ($filter_bag === null) {
@@ -674,55 +674,55 @@ 
 //		$filter = new AndFilter($filter_bag2);
 //
 //		return $filter;
-    }
-
-    /**
-     * Takes in input an order_bag (which can be about anything from a string to an array of OrderByColumn objects... see above from documentation),
-     * and gives back an array of OrderByColumn / OrderBySQLString objects.
-     *
-     * @param unknown_type $orderby_bag
-     *
-     * @return array
-     */
-    public function buildOrderArrayFromOrderBag($orderby_bag)
-    {
-        // Fourth, let's apply the same steps to the orderby_bag
-        // 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array.
-
-        if (!is_array($orderby_bag)) {
-            $orderby_bag = array($orderby_bag);
-        }
-
-        // 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
-        $orderby_bag2 = array();
-        foreach ($orderby_bag as $thing) {
-            if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
-                $orderby_bag2[] = $thing;
-            } elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
-                $orderby_bag2[] = $thing;
-            } elseif (is_string($thing)) {
-                $orderby_bag2[] = new OrderBySQLString($thing);
-            } elseif ($thing !== null) {
-                throw new TDBMException('Error in orderby bag in getObjectsByFilter. An object has been passed that is neither a OrderBySQLString, nor a OrderByColumn, nor a string, nor null.');
-            }
-        }
-
-        return $orderby_bag2;
-    }
-
-    /**
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function getPrimaryKeyColumns($table)
-    {
-        if (!isset($this->primaryKeysColumns[$table])) {
-            $this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
-
-            // TODO TDBM4: See if we need to improve error reporting if table name does not exist.
-
-            /*$arr = array();
+	}
+
+	/**
+	 * Takes in input an order_bag (which can be about anything from a string to an array of OrderByColumn objects... see above from documentation),
+	 * and gives back an array of OrderByColumn / OrderBySQLString objects.
+	 *
+	 * @param unknown_type $orderby_bag
+	 *
+	 * @return array
+	 */
+	public function buildOrderArrayFromOrderBag($orderby_bag)
+	{
+		// Fourth, let's apply the same steps to the orderby_bag
+		// 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array.
+
+		if (!is_array($orderby_bag)) {
+			$orderby_bag = array($orderby_bag);
+		}
+
+		// 4-2, let's take all the objects out of the orderby bag, and let's make objects from them
+		$orderby_bag2 = array();
+		foreach ($orderby_bag as $thing) {
+			if (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderBySQLString')) {
+				$orderby_bag2[] = $thing;
+			} elseif (is_a($thing, 'Mouf\\Database\\TDBM\\Filters\\OrderByColumn')) {
+				$orderby_bag2[] = $thing;
+			} elseif (is_string($thing)) {
+				$orderby_bag2[] = new OrderBySQLString($thing);
+			} elseif ($thing !== null) {
+				throw new TDBMException('Error in orderby bag in getObjectsByFilter. An object has been passed that is neither a OrderBySQLString, nor a OrderByColumn, nor a string, nor null.');
+			}
+		}
+
+		return $orderby_bag2;
+	}
+
+	/**
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function getPrimaryKeyColumns($table)
+	{
+		if (!isset($this->primaryKeysColumns[$table])) {
+			$this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
+
+			// TODO TDBM4: See if we need to improve error reporting if table name does not exist.
+
+			/*$arr = array();
             foreach ($this->connection->getPrimaryKey($table) as $col) {
                 $arr[] = $col->name;
             }
@@ -743,128 +743,128 @@ 
                     throw new TDBMException($str);
                 }
             }*/
-        }
-
-        return $this->primaryKeysColumns[$table];
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the object cache.
-     *
-     * @param DbRow $dbRow
-     */
-    public function _addToCache(DbRow $dbRow)
-    {
-        $primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-        $hash = $this->getObjectHash($primaryKey);
-        $this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to remove the object from the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param DbRow $myObject
-     */
-    private function removeFromToSaveObjectList(DbRow $myObject)
-    {
-        unset($this->toSaveObjects[$myObject]);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param AbstractTDBMObject $myObject
-     */
-    public function _addToToSaveObjectList(DbRow $myObject)
-    {
-        $this->toSaveObjects[$myObject] = true;
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $daoFactoryClassName The classe name of the DAO factory
-     * @param string $daonamespace        The namespace for the DAOs, without trailing \
-     * @param string $beannamespace       The Namespace for the beans, without trailing \
-     * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
-     *
-     * @return \string[] the list of tables
-     */
-    public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
-    {
-        $tdbmDaoGenerator = new TDBMDaoGenerator($this->schemaAnalyzer, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
-
-        return $tdbmDaoGenerator->generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc);
-    }
-
-    /**
-     * @param array<string, string> $tableToBeanMap
-     */
-    public function setTableToBeanMap(array $tableToBeanMap)
-    {
-        $this->tableToBeanMap = $tableToBeanMap;
-    }
-
-    /**
-     * Saves $object by INSERTing or UPDAT(E)ing it in the database.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMException
-     */
-    public function save(AbstractTDBMObject $object)
-    {
-        $status = $object->_getStatus();
-
-        // Let's attach this object if it is in detached state.
-        if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $object->_attach($this);
-            $status = $object->_getStatus();
-        }
-
-        if ($status === TDBMObjectStateEnum::STATE_NEW) {
-            $dbRows = $object->_getDbRows();
-
-            $unindexedPrimaryKeys = array();
-
-            foreach ($dbRows as $dbRow) {
-                $tableName = $dbRow->_getDbTableName();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
-
-                if (empty($unindexedPrimaryKeys)) {
-                    $primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                } else {
-                    // First insert, the children must have the same primary key as the parent.
-                    $primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
-                    $dbRow->_setPrimaryKeys($primaryKeys);
-                }
-
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW or DETACHED state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    $refStatus = $reference->_getStatus();
-                    if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                        $this->save($reference);
-                    }
-                }
-
-                $dbRowData = $dbRow->_getDbRow();
-
-                // Let's see if the columns for primary key have been set before inserting.
-                // We assume that if one of the value of the PK has been set, the PK is set.
-                $isPkSet = !empty($primaryKeys);
-
-                /*if (!$isPkSet) {
+		}
+
+		return $this->primaryKeysColumns[$table];
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the object cache.
+	 *
+	 * @param DbRow $dbRow
+	 */
+	public function _addToCache(DbRow $dbRow)
+	{
+		$primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+		$hash = $this->getObjectHash($primaryKey);
+		$this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to remove the object from the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param DbRow $myObject
+	 */
+	private function removeFromToSaveObjectList(DbRow $myObject)
+	{
+		unset($this->toSaveObjects[$myObject]);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param AbstractTDBMObject $myObject
+	 */
+	public function _addToToSaveObjectList(DbRow $myObject)
+	{
+		$this->toSaveObjects[$myObject] = true;
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $daoFactoryClassName The classe name of the DAO factory
+	 * @param string $daonamespace        The namespace for the DAOs, without trailing \
+	 * @param string $beannamespace       The Namespace for the beans, without trailing \
+	 * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
+	 *
+	 * @return \string[] the list of tables
+	 */
+	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
+	{
+		$tdbmDaoGenerator = new TDBMDaoGenerator($this->schemaAnalyzer, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
+
+		return $tdbmDaoGenerator->generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc);
+	}
+
+	/**
+	 * @param array<string, string> $tableToBeanMap
+	 */
+	public function setTableToBeanMap(array $tableToBeanMap)
+	{
+		$this->tableToBeanMap = $tableToBeanMap;
+	}
+
+	/**
+	 * Saves $object by INSERTing or UPDAT(E)ing it in the database.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMException
+	 */
+	public function save(AbstractTDBMObject $object)
+	{
+		$status = $object->_getStatus();
+
+		// Let's attach this object if it is in detached state.
+		if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$object->_attach($this);
+			$status = $object->_getStatus();
+		}
+
+		if ($status === TDBMObjectStateEnum::STATE_NEW) {
+			$dbRows = $object->_getDbRows();
+
+			$unindexedPrimaryKeys = array();
+
+			foreach ($dbRows as $dbRow) {
+				$tableName = $dbRow->_getDbTableName();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
+
+				if (empty($unindexedPrimaryKeys)) {
+					$primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+				} else {
+					// First insert, the children must have the same primary key as the parent.
+					$primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
+					$dbRow->_setPrimaryKeys($primaryKeys);
+				}
+
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW or DETACHED state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					$refStatus = $reference->_getStatus();
+					if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+						$this->save($reference);
+					}
+				}
+
+				$dbRowData = $dbRow->_getDbRow();
+
+				// Let's see if the columns for primary key have been set before inserting.
+				// We assume that if one of the value of the PK has been set, the PK is set.
+				$isPkSet = !empty($primaryKeys);
+
+				/*if (!$isPkSet) {
                     // if there is no autoincrement and no pk set, let's go in error.
                     $isAutoIncrement = true;
 
@@ -882,25 +882,25 @@ 
 
                 }*/
 
-                $types = [];
+				$types = [];
 
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                }
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+				}
 
-                $this->connection->insert($tableName, $dbRowData, $types);
+				$this->connection->insert($tableName, $dbRowData, $types);
 
-                if (!$isPkSet && count($primaryKeyColumns) == 1) {
-                    $id = $this->connection->lastInsertId();
-                    $primaryKeys[$primaryKeyColumns[0]] = $id;
-                }
+				if (!$isPkSet && count($primaryKeyColumns) == 1) {
+					$id = $this->connection->lastInsertId();
+					$primaryKeys[$primaryKeyColumns[0]] = $id;
+				}
 
-                // TODO: change this to some private magic accessor in future
-                $dbRow->_setPrimaryKeys($primaryKeys);
-                $unindexedPrimaryKeys = array_values($primaryKeys);
+				// TODO: change this to some private magic accessor in future
+				$dbRow->_setPrimaryKeys($primaryKeys);
+				$unindexedPrimaryKeys = array_values($primaryKeys);
 
-                /*
+				/*
                  * When attached, on "save", we check if the column updated is part of a primary key
                  * If this is part of a primary key, we call the _update_id method that updates the id in the list of known objects.
                  * This method should first verify that the id is not already used (and is not auto-incremented)
@@ -910,7 +910,7 @@ 
                  *
                  */
 
-                /*try {
+				/*try {
                     $this->db_connection->exec($sql);
                 } catch (TDBMException $e) {
                     $this->db_onerror = true;
@@ -929,391 +929,391 @@ 
                     }
                 }*/
 
-                // Let's remove this object from the $new_objects static table.
-                $this->removeFromToSaveObjectList($dbRow);
-
-                // TODO: change this behaviour to something more sensible performance-wise
-                // Maybe a setting to trigger this globally?
-                //$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                //$this->db_modified_state = false;
-                //$dbRow = array();
-
-                // Let's add this object to the list of objects in cache.
-                $this->_addToCache($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
-            $dbRows = $object->_getDbRows();
-
-            foreach ($dbRows as $dbRow) {
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    if ($reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
-                        $this->save($reference);
-                    }
-                }
-
-                // Let's first get the primary keys
-                $tableName = $dbRow->_getDbTableName();
-                $dbRowData = $dbRow->_getDbRow();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeys = $dbRow->_getPrimaryKeys();
-
-                $types = [];
-
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                }
-                foreach ($primaryKeys as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                }
-
-                $this->connection->update($tableName, $dbRowData, $primaryKeys, $types);
-
-                // Let's check if the primary key has been updated...
-                $needsUpdatePk = false;
-                foreach ($primaryKeys as $column => $value) {
-                    if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
-                        $needsUpdatePk = true;
-                        break;
-                    }
-                }
-                if ($needsUpdatePk) {
-                    $this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
-                    $newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                    $dbRow->_setPrimaryKeys($newPrimaryKeys);
-                    $this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
-                }
-
-                // Let's remove this object from the list of objects to save.
-                $this->removeFromToSaveObjectList($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
-        }
-
-        // Finally, let's save all the many to many relationships to this bean.
-        $this->persistManyToManyRelationships($object);
-    }
-
-    private function persistManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
-            $tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
-            list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
-
-            foreach ($storage as $remoteBean) {
-                /* @var $remoteBean AbstractTDBMObject */
-                $statusArr = $storage[$remoteBean];
-                $status = $statusArr['status'];
-                $reverse = $statusArr['reverse'];
-                if ($reverse) {
-                    continue;
-                }
-
-                if ($status === 'new') {
-                    $remoteBeanStatus = $remoteBean->_getStatus();
-                    if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                        // Let's save remote bean if needed.
-                        $this->save($remoteBean);
-                    }
-
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
-
-                    $this->connection->insert($pivotTableName, $filters, $types);
-
-                    // Finally, let's mark relationships as saved.
-                    $statusArr['status'] = 'loaded';
-                    $storage[$remoteBean] = $statusArr;
-                    $remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
-                    $remoteStatusArr = $remoteStorage[$object];
-                    $remoteStatusArr['status'] = 'loaded';
-                    $remoteStorage[$object] = $remoteStatusArr;
-                } elseif ($status === 'delete') {
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
-
-                    $this->connection->delete($pivotTableName, $filters, $types);
-
-                    // Finally, let's remove relationships completely from bean.
-                    $storage->detach($remoteBean);
-                    $remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
-                }
-            }
-        }
-    }
-
-    private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
-    {
-        $localBeanPk = $this->getPrimaryKeyValues($localBean);
-        $remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
-        $localColumns = $localFk->getLocalColumns();
-        $remoteColumns = $remoteFk->getLocalColumns();
-
-        $localFilters = array_combine($localColumns, $localBeanPk);
-        $remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
-
-        return array_merge($localFilters, $remoteFilters);
-    }
-
-    /**
-     * Returns the "values" of the primary key.
-     * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return array numerically indexed array of values.
-     */
-    private function getPrimaryKeyValues(AbstractTDBMObject $bean)
-    {
-        $dbRows = $bean->_getDbRows();
-        $dbRow = reset($dbRows);
-
-        return array_values($dbRow->_getPrimaryKeys());
-    }
-
-    /**
-     * Returns a unique hash used to store the object based on its primary key.
-     * If the array contains only one value, then the value is returned.
-     * Otherwise, a hash representing the array is returned.
-     *
-     * @param array $primaryKeys An array of columns => values forming the primary key
-     *
-     * @return string
-     */
-    public function getObjectHash(array $primaryKeys)
-    {
-        if (count($primaryKeys) === 1) {
-            return reset($primaryKeys);
-        } else {
-            ksort($primaryKeys);
-
-            return md5(json_encode($primaryKeys));
-        }
-    }
-
-    /**
-     * Returns an array of primary keys from the object.
-     * The primary keys are extracted from the object columns and not from the primary keys stored in the
-     * $primaryKeys variable of the object.
-     *
-     * @param DbRow $dbRow
-     *
-     * @return array Returns an array of column => value
-     */
-    public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
-    {
-        $table = $dbRow->_getDbTableName();
-        $dbRowData = $dbRow->_getDbRow();
-
-        return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
-    }
-
-    /**
-     * Returns an array of primary keys for the given row.
-     * The primary keys are extracted from the object columns.
-     *
-     * @param $table
-     * @param array $columns
-     *
-     * @return array
-     */
-    public function _getPrimaryKeysFromObjectData($table, array $columns)
-    {
-        $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-        $values = array();
-        foreach ($primaryKeyColumns as $column) {
-            if (isset($columns[$column])) {
-                $values[$column] = $columns[$column];
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Attaches $object to this TDBMService.
-     * The $object must be in DETACHED state and will pass in NEW state.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMInvalidOperationException
-     */
-    public function attach(AbstractTDBMObject $object)
-    {
-        $object->_attach($this);
-    }
-
-    /**
-     * Returns an associative array (column => value) for the primary keys from the table name and an
-     * indexed array of primary key values.
-     *
-     * @param string $tableName
-     * @param array  $indexedPrimaryKeys
-     */
-    public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
-    {
-        $primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
-
-        if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
-            throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
+				// Let's remove this object from the $new_objects static table.
+				$this->removeFromToSaveObjectList($dbRow);
+
+				// TODO: change this behaviour to something more sensible performance-wise
+				// Maybe a setting to trigger this globally?
+				//$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				//$this->db_modified_state = false;
+				//$dbRow = array();
+
+				// Let's add this object to the list of objects in cache.
+				$this->_addToCache($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
+			$dbRows = $object->_getDbRows();
+
+			foreach ($dbRows as $dbRow) {
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					if ($reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
+						$this->save($reference);
+					}
+				}
+
+				// Let's first get the primary keys
+				$tableName = $dbRow->_getDbTableName();
+				$dbRowData = $dbRow->_getDbRow();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeys = $dbRow->_getPrimaryKeys();
+
+				$types = [];
+
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+				}
+				foreach ($primaryKeys as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+				}
+
+				$this->connection->update($tableName, $dbRowData, $primaryKeys, $types);
+
+				// Let's check if the primary key has been updated...
+				$needsUpdatePk = false;
+				foreach ($primaryKeys as $column => $value) {
+					if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
+						$needsUpdatePk = true;
+						break;
+					}
+				}
+				if ($needsUpdatePk) {
+					$this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
+					$newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+					$dbRow->_setPrimaryKeys($newPrimaryKeys);
+					$this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
+				}
+
+				// Let's remove this object from the list of objects to save.
+				$this->removeFromToSaveObjectList($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
+		}
+
+		// Finally, let's save all the many to many relationships to this bean.
+		$this->persistManyToManyRelationships($object);
+	}
+
+	private function persistManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
+			$tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
+			list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
+
+			foreach ($storage as $remoteBean) {
+				/* @var $remoteBean AbstractTDBMObject */
+				$statusArr = $storage[$remoteBean];
+				$status = $statusArr['status'];
+				$reverse = $statusArr['reverse'];
+				if ($reverse) {
+					continue;
+				}
+
+				if ($status === 'new') {
+					$remoteBeanStatus = $remoteBean->_getStatus();
+					if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+						// Let's save remote bean if needed.
+						$this->save($remoteBean);
+					}
+
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
+
+					$this->connection->insert($pivotTableName, $filters, $types);
+
+					// Finally, let's mark relationships as saved.
+					$statusArr['status'] = 'loaded';
+					$storage[$remoteBean] = $statusArr;
+					$remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
+					$remoteStatusArr = $remoteStorage[$object];
+					$remoteStatusArr['status'] = 'loaded';
+					$remoteStorage[$object] = $remoteStatusArr;
+				} elseif ($status === 'delete') {
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
+
+					$this->connection->delete($pivotTableName, $filters, $types);
+
+					// Finally, let's remove relationships completely from bean.
+					$storage->detach($remoteBean);
+					$remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
+				}
+			}
+		}
+	}
+
+	private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
+	{
+		$localBeanPk = $this->getPrimaryKeyValues($localBean);
+		$remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
+		$localColumns = $localFk->getLocalColumns();
+		$remoteColumns = $remoteFk->getLocalColumns();
+
+		$localFilters = array_combine($localColumns, $localBeanPk);
+		$remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
+
+		return array_merge($localFilters, $remoteFilters);
+	}
+
+	/**
+	 * Returns the "values" of the primary key.
+	 * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return array numerically indexed array of values.
+	 */
+	private function getPrimaryKeyValues(AbstractTDBMObject $bean)
+	{
+		$dbRows = $bean->_getDbRows();
+		$dbRow = reset($dbRows);
+
+		return array_values($dbRow->_getPrimaryKeys());
+	}
+
+	/**
+	 * Returns a unique hash used to store the object based on its primary key.
+	 * If the array contains only one value, then the value is returned.
+	 * Otherwise, a hash representing the array is returned.
+	 *
+	 * @param array $primaryKeys An array of columns => values forming the primary key
+	 *
+	 * @return string
+	 */
+	public function getObjectHash(array $primaryKeys)
+	{
+		if (count($primaryKeys) === 1) {
+			return reset($primaryKeys);
+		} else {
+			ksort($primaryKeys);
+
+			return md5(json_encode($primaryKeys));
+		}
+	}
+
+	/**
+	 * Returns an array of primary keys from the object.
+	 * The primary keys are extracted from the object columns and not from the primary keys stored in the
+	 * $primaryKeys variable of the object.
+	 *
+	 * @param DbRow $dbRow
+	 *
+	 * @return array Returns an array of column => value
+	 */
+	public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
+	{
+		$table = $dbRow->_getDbTableName();
+		$dbRowData = $dbRow->_getDbRow();
+
+		return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
+	}
+
+	/**
+	 * Returns an array of primary keys for the given row.
+	 * The primary keys are extracted from the object columns.
+	 *
+	 * @param $table
+	 * @param array $columns
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeysFromObjectData($table, array $columns)
+	{
+		$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+		$values = array();
+		foreach ($primaryKeyColumns as $column) {
+			if (isset($columns[$column])) {
+				$values[$column] = $columns[$column];
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Attaches $object to this TDBMService.
+	 * The $object must be in DETACHED state and will pass in NEW state.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function attach(AbstractTDBMObject $object)
+	{
+		$object->_attach($this);
+	}
+
+	/**
+	 * Returns an associative array (column => value) for the primary keys from the table name and an
+	 * indexed array of primary key values.
+	 *
+	 * @param string $tableName
+	 * @param array  $indexedPrimaryKeys
+	 */
+	public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
+	{
+		$primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
+
+		if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
+			throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
 			got %s instead.', count($primaryKeyColumns), $tableName, count($indexedPrimaryKeys)));
-        }
-
-        return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    public function _getLinkBetweenInheritedTables(array $tables)
-    {
-        sort($tables);
-
-        return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
-                return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
-            });
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        foreach ($tables as $currentTable) {
-            $allParents = [$currentTable];
-            $currentFk = null;
-            while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-                $currentTable = $currentFk->getForeignTableName();
-                $allParents[] = $currentTable;
-            };
-
-            // Now, does the $allParents contain all the tables we want?
-            $notFoundTables = array_diff($tables, $allParents);
-            if (empty($notFoundTables)) {
-                // We have a winner!
-                return $allParents;
-            }
-        }
-
-        throw new TDBMException(sprintf('The tables (%s) cannot be linked by an inheritance relationship.', implode(', ', $tables)));
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function _getRelatedTablesByInheritance($table)
-    {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
-            return $this->_getRelatedTablesByInheritanceWithoutCache($table);
-        });
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function _getRelatedTablesByInheritanceWithoutCache($table)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        // Let's scan the parent tables
-        $currentTable = $table;
-
-        $parentTables = [];
-
-        // Get parent relationship
-        while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentTables[] = $currentTable;
-        };
-
-        // Let's recurse in children
-        $childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
-
-        return array_merge(array_reverse($parentTables), $childrenTables);
-    }
-
-    /**
-     * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
-    {
-        $tables = [$table];
-        $keys = $schemaAnalyzer->getChildrenRelationships($table);
-
-        foreach ($keys as $key) {
-            $tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
-        }
-
-        return $tables;
-    }
-
-    /**
-     * Casts a foreign key into SQL, assuming table name is used with no alias.
-     * The returned value does contain only one table. For instance:.
-     *
-     * " LEFT JOIN table2 ON table1.id = table2.table1_id"
-     *
-     * @param ForeignKeyConstraint $fk
-     * @param bool                 $leftTableIsLocal
-     *
-     * @return string
-     */
-    /*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
+		}
+
+		return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	public function _getLinkBetweenInheritedTables(array $tables)
+	{
+		sort($tables);
+
+		return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
+			function () use ($tables) {
+				return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
+			});
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		foreach ($tables as $currentTable) {
+			$allParents = [$currentTable];
+			$currentFk = null;
+			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+				$currentTable = $currentFk->getForeignTableName();
+				$allParents[] = $currentTable;
+			};
+
+			// Now, does the $allParents contain all the tables we want?
+			$notFoundTables = array_diff($tables, $allParents);
+			if (empty($notFoundTables)) {
+				// We have a winner!
+				return $allParents;
+			}
+		}
+
+		throw new TDBMException(sprintf('The tables (%s) cannot be linked by an inheritance relationship.', implode(', ', $tables)));
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function _getRelatedTablesByInheritance($table)
+	{
+		return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+			return $this->_getRelatedTablesByInheritanceWithoutCache($table);
+		});
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function _getRelatedTablesByInheritanceWithoutCache($table)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		// Let's scan the parent tables
+		$currentTable = $table;
+
+		$parentTables = [];
+
+		// Get parent relationship
+		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentTables[] = $currentTable;
+		};
+
+		// Let's recurse in children
+		$childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
+
+		return array_merge(array_reverse($parentTables), $childrenTables);
+	}
+
+	/**
+	 * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
+	{
+		$tables = [$table];
+		$keys = $schemaAnalyzer->getChildrenRelationships($table);
+
+		foreach ($keys as $key) {
+			$tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
+		}
+
+		return $tables;
+	}
+
+	/**
+	 * Casts a foreign key into SQL, assuming table name is used with no alias.
+	 * The returned value does contain only one table. For instance:.
+	 *
+	 * " LEFT JOIN table2 ON table1.id = table2.table1_id"
+	 *
+	 * @param ForeignKeyConstraint $fk
+	 * @param bool                 $leftTableIsLocal
+	 *
+	 * @return string
+	 */
+	/*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
         $onClauses = [];
         $foreignTableName = $this->connection->quoteIdentifier($fk->getForeignTableName());
         $foreignColumns = $fk->getForeignColumns();
@@ -1339,348 +1339,348 @@ 
         }
     }*/
 
-    /**
-     * Returns an identifier for the group of tables passed in parameter.
-     *
-     * @param string[] $relatedTables
-     *
-     * @return string
-     */
-    private function getTableGroupName(array $relatedTables)
-    {
-        sort($relatedTables);
-
-        return implode('_``_', $relatedTables);
-    }
-
-    /**
-     * @param string            $mainTable             The name of the table queried
-     * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param string|null       $orderString           The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $additionalTablesFetch
-     * @param string            $mode
-     * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
-     *
-     * @return ResultIterator An object representing an array of results.
-     *
-     * @throws TDBMException
-     */
-    public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null)
-    {
-        // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
-        if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
-            throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
-        }
-
-        list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
-
-        $parameters = array_merge($parameters, $additionalParameters);
-
-        // From the table name and the additional tables we want to fetch, let's build a list of all tables
-        // that must be part of the select columns.
-
-        $tableGroups = [];
-        $allFetchedTables = $this->_getRelatedTablesByInheritance($mainTable);
-        $tableGroupName = $this->getTableGroupName($allFetchedTables);
-        foreach ($allFetchedTables as $table) {
-            $tableGroups[$table] = $tableGroupName;
-        }
-
-        foreach ($additionalTablesFetch as $additionalTable) {
-            $relatedTables = $this->_getRelatedTablesByInheritance($additionalTable);
-            $tableGroupName = $this->getTableGroupName($relatedTables);
-            foreach ($relatedTables as $table) {
-                $tableGroups[$table] = $tableGroupName;
-            }
-            $allFetchedTables = array_merge($allFetchedTables, $relatedTables);
-        }
-
-        // Let's remove any duplicate
-        $allFetchedTables = array_flip(array_flip($allFetchedTables));
-
-        $columnsList = [];
-        $columnDescList = [];
-        $schema = $this->tdbmSchemaAnalyzer->getSchema();
-
-        // Now, let's build the column list
-        foreach ($allFetchedTables as $table) {
-            foreach ($schema->getTable($table)->getColumns() as $column) {
-                $columnName = $column->getName();
-                $columnDescList[] = [
-                    'as' => $table.'____'.$columnName,
-                    'table' => $table,
-                    'column' => $columnName,
-                    'type' => $column->getType(),
-                    'tableGroup' => $tableGroups[$table],
-                ];
-                $columnsList[] = $this->connection->quoteIdentifier($table).'.'.$this->connection->quoteIdentifier($columnName).' as '.
-                    $this->connection->quoteIdentifier($table.'____'.$columnName);
-            }
-        }
-
-        $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$mainTable.')';
-        $countSql = 'SELECT COUNT(1) FROM MAGICJOIN('.$mainTable.')';
-
-        if (!empty($filterString)) {
-            $sql .= ' WHERE '.$filterString;
-            $countSql .= ' WHERE '.$filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-            $countSql .= ' ORDER BY '.$orderString;
-        }
-
-        if ($mode !== null && $mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
-        }
-
-        $mode = $mode ?: $this->mode;
-
-        return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode);
-    }
-
-    /**
-     * @param $table
-     * @param array  $primaryKeys
-     * @param array  $additionalTablesFetch
-     * @param bool   $lazy                  Whether to perform lazy loading on this object or not.
-     * @param string $className
-     *
-     * @return AbstractTDBMObject
-     *
-     * @throws TDBMException
-     */
-    public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null)
-    {
-        $primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
-        $hash = $this->getObjectHash($primaryKeys);
-
-        if ($this->objectStorage->has($table, $hash)) {
-            $dbRow = $this->objectStorage->get($table, $hash);
-            $bean = $dbRow->getTDBMObject();
-            if ($className !== null && !is_a($bean, $className)) {
-                throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
-            }
-
-            return $bean;
-        }
-
-        // Are we performing lazy fetching?
-        if ($lazy === true) {
-            // Can we perform lazy fetching?
-            $tables = $this->_getRelatedTablesByInheritance($table);
-            // Only allowed if no inheritance.
-            if (count($tables) === 1) {
-                if ($className === null) {
-                    $className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : 'Mouf\\Database\\TDBM\\TDBMObject';
-                }
-
-                // Let's construct the bean
-                if (!isset($reflectionClassCache[$className])) {
-                    $reflectionClassCache[$className] = new \ReflectionClass($className);
-                }
-                // Let's bypass the constructor when creating the bean!
-                $bean = $reflectionClassCache[$className]->newInstanceWithoutConstructor();
-                /* @var $bean AbstractTDBMObject */
-                $bean->_constructLazy($table, $primaryKeys, $this);
-            }
-        }
-
-        // Did not find the object in cache? Let's query it!
-        return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
-    }
-
-    /**
-     * Returns a unique bean (or null) according to the filters passed in parameter.
-     *
-     * @param string      $mainTable             The name of the table queried
-     * @param string|null $filterString          The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array       $parameters
-     * @param array       $additionalTablesFetch
-     * @param string      $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
-     *
-     * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters.
-     *
-     * @throws TDBMException
-     */
-    public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null)
-    {
-        $objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
-        $page = $objects->take(0, 2);
-        $count = $page->count();
-        if ($count > 1) {
-            throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
-        } elseif ($count === 0) {
-            return;
-        }
-
-        return $objects[0];
-    }
-
-    /**
-     * Returns a unique bean according to the filters passed in parameter.
-     * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
-     *
-     * @param string      $mainTable             The name of the table queried
-     * @param string|null $filterString          The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array       $parameters
-     * @param array       $additionalTablesFetch
-     * @param string      $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
-     *
-     * @return AbstractTDBMObject The object we want
-     *
-     * @throws TDBMException
-     */
-    public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null)
-    {
-        $bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className);
-        if ($bean === null) {
-            throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
-        }
-
-        return $bean;
-    }
-
-    /**
-     * @param array $beanData An array of data: array<table, array<column, value>>
-     *
-     * @return array an array with first item = class name and second item = table name
-     */
-    public function _getClassNameFromBeanData(array $beanData)
-    {
-        if (count($beanData) === 1) {
-            $tableName = array_keys($beanData)[0];
-        } else {
-            foreach ($beanData as $table => $row) {
-                $tables = [];
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-                $pkSet = false;
-                foreach ($primaryKeyColumns as $columnName) {
-                    if ($row[$columnName] !== null) {
-                        $pkSet = true;
-                        break;
-                    }
-                }
-                if ($pkSet) {
-                    $tables[] = $table;
-                }
-            }
-
-            // $tables contains the tables for this bean. Let's view the top most part of the hierarchy
-            $allTables = $this->_getLinkBetweenInheritedTables($tables);
-            $tableName = $allTables[0];
-        }
-
-        // Only one table in this bean. Life is sweat, let's look at its type:
-        if (isset($this->tableToBeanMap[$tableName])) {
-            return [$this->tableToBeanMap[$tableName], $tableName];
-        } else {
-            return ['Mouf\\Database\\TDBM\\TDBMObject', $tableName];
-        }
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    private function fromCache($key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
-
-    /**
-     * Returns the foreign key object.
-     *
-     * @param string $table
-     * @param string $fkName
-     *
-     * @return ForeignKeyConstraint
-     */
-    public function _getForeignKeyByName($table, $fkName)
-    {
-        return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean)
-    {
-        list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
-        /* @var $localFk ForeignKeyConstraint */
-        /* @var $remoteFk ForeignKeyConstraint */
-        $remoteTable = $remoteFk->getForeignTableName();
-
-        $primaryKeys = $this->getPrimaryKeyValues($bean);
-        $columnNames = array_map(function ($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
-
-        $filter = array_combine($columnNames, $primaryKeys);
-
-        return $this->findObjects($remoteTable, $filter);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean The LOCAL bean
-     *
-     * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
-     *
-     * @throws TDBMException
-     */
-    private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean)
-    {
-        $fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
-        $table1 = $fks[0]->getForeignTableName();
-        $table2 = $fks[1]->getForeignTableName();
-
-        $beanTables = array_map(function (DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
-
-        if (in_array($table1, $beanTables)) {
-            return [$fks[0], $fks[1]];
-        } elseif (in_array($table2, $beanTables)) {
-            return [$fks[1], $fks[0]];
-        } else {
-            throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
-        }
-    }
-
-    /**
-     * Returns a list of pivot tables linked to $bean.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return string[]
-     */
-    public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
-    {
-        $junctionTables = [];
-        $allJunctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        foreach ($bean->_getDbRows() as $dbRow) {
-            foreach ($allJunctionTables as $table) {
-                // There are exactly 2 FKs since this is a pivot table.
-                $fks = array_values($table->getForeignKeys());
-
-                if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
-                    $junctionTables[] = $table->getName();
-                }
-            }
-        }
-
-        return $junctionTables;
-    }
+	/**
+	 * Returns an identifier for the group of tables passed in parameter.
+	 *
+	 * @param string[] $relatedTables
+	 *
+	 * @return string
+	 */
+	private function getTableGroupName(array $relatedTables)
+	{
+		sort($relatedTables);
+
+		return implode('_``_', $relatedTables);
+	}
+
+	/**
+	 * @param string            $mainTable             The name of the table queried
+	 * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param string|null       $orderString           The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $additionalTablesFetch
+	 * @param string            $mode
+	 * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
+	 *
+	 * @return ResultIterator An object representing an array of results.
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjects($mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, $className = null)
+	{
+		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
+		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
+			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
+		}
+
+		list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
+
+		$parameters = array_merge($parameters, $additionalParameters);
+
+		// From the table name and the additional tables we want to fetch, let's build a list of all tables
+		// that must be part of the select columns.
+
+		$tableGroups = [];
+		$allFetchedTables = $this->_getRelatedTablesByInheritance($mainTable);
+		$tableGroupName = $this->getTableGroupName($allFetchedTables);
+		foreach ($allFetchedTables as $table) {
+			$tableGroups[$table] = $tableGroupName;
+		}
+
+		foreach ($additionalTablesFetch as $additionalTable) {
+			$relatedTables = $this->_getRelatedTablesByInheritance($additionalTable);
+			$tableGroupName = $this->getTableGroupName($relatedTables);
+			foreach ($relatedTables as $table) {
+				$tableGroups[$table] = $tableGroupName;
+			}
+			$allFetchedTables = array_merge($allFetchedTables, $relatedTables);
+		}
+
+		// Let's remove any duplicate
+		$allFetchedTables = array_flip(array_flip($allFetchedTables));
+
+		$columnsList = [];
+		$columnDescList = [];
+		$schema = $this->tdbmSchemaAnalyzer->getSchema();
+
+		// Now, let's build the column list
+		foreach ($allFetchedTables as $table) {
+			foreach ($schema->getTable($table)->getColumns() as $column) {
+				$columnName = $column->getName();
+				$columnDescList[] = [
+					'as' => $table.'____'.$columnName,
+					'table' => $table,
+					'column' => $columnName,
+					'type' => $column->getType(),
+					'tableGroup' => $tableGroups[$table],
+				];
+				$columnsList[] = $this->connection->quoteIdentifier($table).'.'.$this->connection->quoteIdentifier($columnName).' as '.
+					$this->connection->quoteIdentifier($table.'____'.$columnName);
+			}
+		}
+
+		$sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$mainTable.')';
+		$countSql = 'SELECT COUNT(1) FROM MAGICJOIN('.$mainTable.')';
+
+		if (!empty($filterString)) {
+			$sql .= ' WHERE '.$filterString;
+			$countSql .= ' WHERE '.$filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+			$countSql .= ' ORDER BY '.$orderString;
+		}
+
+		if ($mode !== null && $mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
+		}
+
+		$mode = $mode ?: $this->mode;
+
+		return new ResultIterator($sql, $countSql, $parameters, $columnDescList, $this->objectStorage, $className, $this, $this->magicQuery, $mode);
+	}
+
+	/**
+	 * @param $table
+	 * @param array  $primaryKeys
+	 * @param array  $additionalTablesFetch
+	 * @param bool   $lazy                  Whether to perform lazy loading on this object or not.
+	 * @param string $className
+	 *
+	 * @return AbstractTDBMObject
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectByPk($table, array $primaryKeys, array $additionalTablesFetch = array(), $lazy = false, $className = null)
+	{
+		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
+		$hash = $this->getObjectHash($primaryKeys);
+
+		if ($this->objectStorage->has($table, $hash)) {
+			$dbRow = $this->objectStorage->get($table, $hash);
+			$bean = $dbRow->getTDBMObject();
+			if ($className !== null && !is_a($bean, $className)) {
+				throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
+			}
+
+			return $bean;
+		}
+
+		// Are we performing lazy fetching?
+		if ($lazy === true) {
+			// Can we perform lazy fetching?
+			$tables = $this->_getRelatedTablesByInheritance($table);
+			// Only allowed if no inheritance.
+			if (count($tables) === 1) {
+				if ($className === null) {
+					$className = isset($this->tableToBeanMap[$table]) ? $this->tableToBeanMap[$table] : 'Mouf\\Database\\TDBM\\TDBMObject';
+				}
+
+				// Let's construct the bean
+				if (!isset($reflectionClassCache[$className])) {
+					$reflectionClassCache[$className] = new \ReflectionClass($className);
+				}
+				// Let's bypass the constructor when creating the bean!
+				$bean = $reflectionClassCache[$className]->newInstanceWithoutConstructor();
+				/* @var $bean AbstractTDBMObject */
+				$bean->_constructLazy($table, $primaryKeys, $this);
+			}
+		}
+
+		// Did not find the object in cache? Let's query it!
+		return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
+	}
+
+	/**
+	 * Returns a unique bean (or null) according to the filters passed in parameter.
+	 *
+	 * @param string      $mainTable             The name of the table queried
+	 * @param string|null $filterString          The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array       $parameters
+	 * @param array       $additionalTablesFetch
+	 * @param string      $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
+	 *
+	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters.
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObject($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null)
+	{
+		$objects = $this->findObjects($mainTable, $filterString, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
+		$page = $objects->take(0, 2);
+		$count = $page->count();
+		if ($count > 1) {
+			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
+		} elseif ($count === 0) {
+			return;
+		}
+
+		return $objects[0];
+	}
+
+	/**
+	 * Returns a unique bean according to the filters passed in parameter.
+	 * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
+	 *
+	 * @param string      $mainTable             The name of the table queried
+	 * @param string|null $filterString          The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array       $parameters
+	 * @param array       $additionalTablesFetch
+	 * @param string      $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned.
+	 *
+	 * @return AbstractTDBMObject The object we want
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectOrFail($mainTable, $filterString = null, array $parameters = array(), array $additionalTablesFetch = array(), $className = null)
+	{
+		$bean = $this->findObject($mainTable, $filterString, $parameters, $additionalTablesFetch, $className);
+		if ($bean === null) {
+			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
+		}
+
+		return $bean;
+	}
+
+	/**
+	 * @param array $beanData An array of data: array<table, array<column, value>>
+	 *
+	 * @return array an array with first item = class name and second item = table name
+	 */
+	public function _getClassNameFromBeanData(array $beanData)
+	{
+		if (count($beanData) === 1) {
+			$tableName = array_keys($beanData)[0];
+		} else {
+			foreach ($beanData as $table => $row) {
+				$tables = [];
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+				$pkSet = false;
+				foreach ($primaryKeyColumns as $columnName) {
+					if ($row[$columnName] !== null) {
+						$pkSet = true;
+						break;
+					}
+				}
+				if ($pkSet) {
+					$tables[] = $table;
+				}
+			}
+
+			// $tables contains the tables for this bean. Let's view the top most part of the hierarchy
+			$allTables = $this->_getLinkBetweenInheritedTables($tables);
+			$tableName = $allTables[0];
+		}
+
+		// Only one table in this bean. Life is sweat, let's look at its type:
+		if (isset($this->tableToBeanMap[$tableName])) {
+			return [$this->tableToBeanMap[$tableName], $tableName];
+		} else {
+			return ['Mouf\\Database\\TDBM\\TDBMObject', $tableName];
+		}
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	private function fromCache($key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Returns the foreign key object.
+	 *
+	 * @param string $table
+	 * @param string $fkName
+	 *
+	 * @return ForeignKeyConstraint
+	 */
+	public function _getForeignKeyByName($table, $fkName)
+	{
+		return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelatedBeans($pivotTableName, AbstractTDBMObject $bean)
+	{
+		list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
+		/* @var $localFk ForeignKeyConstraint */
+		/* @var $remoteFk ForeignKeyConstraint */
+		$remoteTable = $remoteFk->getForeignTableName();
+
+		$primaryKeys = $this->getPrimaryKeyValues($bean);
+		$columnNames = array_map(function ($name) use ($pivotTableName) { return $pivotTableName.'.'.$name; }, $localFk->getLocalColumns());
+
+		$filter = array_combine($columnNames, $primaryKeys);
+
+		return $this->findObjects($remoteTable, $filter);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean The LOCAL bean
+	 *
+	 * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean.
+	 *
+	 * @throws TDBMException
+	 */
+	private function getPivotTableForeignKeys($pivotTableName, AbstractTDBMObject $bean)
+	{
+		$fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
+		$table1 = $fks[0]->getForeignTableName();
+		$table2 = $fks[1]->getForeignTableName();
+
+		$beanTables = array_map(function (DbRow $dbRow) { return $dbRow->_getDbTableName(); }, $bean->_getDbRows());
+
+		if (in_array($table1, $beanTables)) {
+			return [$fks[0], $fks[1]];
+		} elseif (in_array($table2, $beanTables)) {
+			return [$fks[1], $fks[0]];
+		} else {
+			throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
+		}
+	}
+
+	/**
+	 * Returns a list of pivot tables linked to $bean.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return string[]
+	 */
+	public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
+	{
+		$junctionTables = [];
+		$allJunctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		foreach ($bean->_getDbRows() as $dbRow) {
+			foreach ($allJunctionTables as $table) {
+				// There are exactly 2 FKs since this is a pivot table.
+				$fks = array_values($table->getForeignKeys());
+
+				if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
+					$junctionTables[] = $table->getName();
+				}
+			}
+		}
+
+		return $junctionTables;
+	}
 }