thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/QueryFactory/FindObjectsQueryFactory.php

Indentation +38 added lines, -38 removed lines

@@ -11,44 +11,44 @@
  */
 class FindObjectsQueryFactory extends AbstractQueryFactory
 {
-    private $mainTable;
-    private $additionalTablesFetch;
-    private $filterString;
-
-    public function __construct(string $mainTable, array $additionalTablesFetch, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer)
-    {
-        parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
-        $this->mainTable = $mainTable;
-        $this->additionalTablesFetch = $additionalTablesFetch;
-        $this->filterString = $filterString;
-    }
-
-    protected function compute()
-    {
-        list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, $this->additionalTablesFetch, $this->orderBy);
-
-        $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
-
-        $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
-        }, $pkColumnNames);
-
-        $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM MAGICJOIN('.$this->mainTable.')';
-
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-        }
-
-        $this->magicSql = $sql;
-        $this->magicSqlCount = $countSql;
-        $this->columnDescList = $columnDescList;
-    }
+	private $mainTable;
+	private $additionalTablesFetch;
+	private $filterString;
+
+	public function __construct(string $mainTable, array $additionalTablesFetch, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer)
+	{
+		parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
+		$this->mainTable = $mainTable;
+		$this->additionalTablesFetch = $additionalTablesFetch;
+		$this->filterString = $filterString;
+	}
+
+	protected function compute()
+	{
+		list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, $this->additionalTablesFetch, $this->orderBy);
+
+		$sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
+
+		$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
+		$pkColumnNames = array_map(function ($pkColumn) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
+		}, $pkColumnNames);
+
+		$countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM MAGICJOIN('.$this->mainTable.')';
+
+		if (!empty($this->filterString)) {
+			$sql .= ' WHERE '.$this->filterString;
+			$countSql .= ' WHERE '.$this->filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+		}
+
+		$this->magicSql = $sql;
+		$this->magicSqlCount = $countSql;
+		$this->columnDescList = $columnDescList;
+	}
 
 
 }

src/Mouf/Database/TDBM/QueryFactory/QueryFactory.php

Indentation +18 added lines, -18 removed lines

@@ -9,25 +9,25 @@
  */
 interface QueryFactory
 {
-    /**
-     * Sets the ORDER BY directive executed in SQL.
-     *
-     * For instance:
-     *
-     *  $queryFactory->sort('label ASC, status DESC');
-     *
-     * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
-     * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
-     *
-     *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     */
-    public function sort($orderBy);
+	/**
+	 * Sets the ORDER BY directive executed in SQL.
+	 *
+	 * For instance:
+	 *
+	 *  $queryFactory->sort('label ASC, status DESC');
+	 *
+	 * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
+	 * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
+	 *
+	 *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 */
+	public function sort($orderBy);
 
-    public function getMagicSql() : string;
+	public function getMagicSql() : string;
 
-    public function getMagicSqlCount() : string;
+	public function getMagicSqlCount() : string;
 
-    public function getColumnDescriptors() : array;
+	public function getColumnDescriptors() : array;
 }

src/Mouf/Database/TDBM/ResultIterator.php

Indentation +281 added lines, -281 removed lines

@@ -32,285 +32,285 @@
  */
 class ResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $parameters;
-    private $magicQuery;
-
-    /**
-     * @var QueryFactory
-     */
-    private $queryFactory;
-
-    /**
-     * @var InnerResultIterator
-     */
-    private $innerResultIterator;
-
-    private $databasePlatform;
-
-    private $totalCount;
-
-    private $mode;
-
-    private $logger;
-
-    public function __construct(QueryFactory $queryFactory, array $parameters, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
-    {
-        if ($mode !== null && $mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$mode."'");
-        }
-
-        $this->queryFactory = $queryFactory;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-        $this->mode = $mode;
-        $this->logger = $logger;
-    }
-
-    protected function executeCountQuery()
-    {
-        $sql = $this->magicQuery->build($this->queryFactory->getMagicSqlCount(), $this->parameters);
-        $this->logger->debug('Running count query: '.$sql);
-        $this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
-    }
-
-    /**
-     * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if ($this->totalCount === null) {
-            $this->executeCountQuery();
-        }
-
-        return $this->totalCount;
-    }
-
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return iterator_to_array($this->getIterator());
-    }
-
-    /**
-     * Returns a new iterator mapping any call using the $callable function.
-     *
-     * @param callable $callable
-     *
-     * @return MapIterator
-     */
-    public function map(callable $callable)
-    {
-        return new MapIterator($this->getIterator(), $callable);
-    }
-
-    /**
-     * Retrieve an external iterator.
-     *
-     * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
-     *
-     * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
-     *                             <b>Traversable</b>
-     *
-     * @since 5.0.0
-     */
-    public function getIterator()
-    {
-        if ($this->innerResultIterator === null) {
-            if ($this->mode === TDBMService::MODE_CURSOR) {
-                $this->innerResultIterator = new InnerResultIterator($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
-            } else {
-                $this->innerResultIterator = new InnerResultArray($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
-            }
-        }
-
-        return $this->innerResultIterator;
-    }
-
-    /**
-     * @param int $offset
-     * @param int $limit
-     *
-     * @return PageIterator
-     */
-    public function take($offset, $limit)
-    {
-        return new PageIterator($this, $this->queryFactory->getMagicSql(), $this->parameters, $limit, $offset, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode, $this->logger);
-    }
-
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        return $this->getIterator()->offsetExists($offset);
-    }
-
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getIterator()->offsetGet($offset);
-    }
-
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        return $this->getIterator()->offsetSet($offset, $value);
-    }
-
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        return $this->getIterator()->offsetUnset($offset);
-    }
-
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @param bool $stopRecursion Parameter used internally by TDBM to
-     *                            stop embedded objects from embedding
-     *                            other objects
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize($stopRecursion = false)
-    {
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
-            return $item->jsonSerialize($stopRecursion);
-        }, $this->toArray());
-    }
-
-    /**
-     * Returns only one value (the first) of the result set.
-     * Returns null if no value exists.
-     *
-     * @return mixed|null
-     */
-    public function first()
-    {
-        $page = $this->take(0, 1);
-        foreach ($page as $bean) {
-            return $bean;
-        }
-
-        return;
-    }
-
-    /**
-     * Sets the ORDER BY directive executed in SQL and returns a NEW ResultIterator.
-     *
-     * For instance:
-     *
-     *  $resultSet = $resultSet->withOrder('label ASC, status DESC');
-     *
-     * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
-     * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
-     *
-     *  $resultSet->withOrder(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return ResultIterator
-     */
-    public function withOrder($orderBy) : ResultIterator
-    {
-        $clone = clone $this;
-        $clone->queryFactory = clone $this->queryFactory;
-        $clone->queryFactory->sort($orderBy);
-        $clone->innerResultIterator = null;
-
-        return $clone;
-    }
-
-    /**
-     * Sets new parameters for the SQL query and returns a NEW ResultIterator.
-     *
-     * For instance:
-     *
-     *  $resultSet = $resultSet->withParameters('label ASC, status DESC');
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return ResultIterator
-     */
-    public function withParameters(array $parameters) : ResultIterator
-    {
-        $clone = clone $this;
-        $clone->parameters = $parameters;
-        $clone->innerResultIterator = null;
-        $clone->totalCount = null;
-
-        return $clone;
-    }
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $parameters;
+	private $magicQuery;
+
+	/**
+	 * @var QueryFactory
+	 */
+	private $queryFactory;
+
+	/**
+	 * @var InnerResultIterator
+	 */
+	private $innerResultIterator;
+
+	private $databasePlatform;
+
+	private $totalCount;
+
+	private $mode;
+
+	private $logger;
+
+	public function __construct(QueryFactory $queryFactory, array $parameters, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
+	{
+		if ($mode !== null && $mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$mode."'");
+		}
+
+		$this->queryFactory = $queryFactory;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+		$this->mode = $mode;
+		$this->logger = $logger;
+	}
+
+	protected function executeCountQuery()
+	{
+		$sql = $this->magicQuery->build($this->queryFactory->getMagicSqlCount(), $this->parameters);
+		$this->logger->debug('Running count query: '.$sql);
+		$this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
+	}
+
+	/**
+	 * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		if ($this->totalCount === null) {
+			$this->executeCountQuery();
+		}
+
+		return $this->totalCount;
+	}
+
+	/**
+	 * Casts the result set to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return iterator_to_array($this->getIterator());
+	}
+
+	/**
+	 * Returns a new iterator mapping any call using the $callable function.
+	 *
+	 * @param callable $callable
+	 *
+	 * @return MapIterator
+	 */
+	public function map(callable $callable)
+	{
+		return new MapIterator($this->getIterator(), $callable);
+	}
+
+	/**
+	 * Retrieve an external iterator.
+	 *
+	 * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
+	 *
+	 * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
+	 *                             <b>Traversable</b>
+	 *
+	 * @since 5.0.0
+	 */
+	public function getIterator()
+	{
+		if ($this->innerResultIterator === null) {
+			if ($this->mode === TDBMService::MODE_CURSOR) {
+				$this->innerResultIterator = new InnerResultIterator($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
+			} else {
+				$this->innerResultIterator = new InnerResultArray($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
+			}
+		}
+
+		return $this->innerResultIterator;
+	}
+
+	/**
+	 * @param int $offset
+	 * @param int $limit
+	 *
+	 * @return PageIterator
+	 */
+	public function take($offset, $limit)
+	{
+		return new PageIterator($this, $this->queryFactory->getMagicSql(), $this->parameters, $limit, $offset, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode, $this->logger);
+	}
+
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->getIterator()->offsetExists($offset);
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getIterator()->offsetGet($offset);
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		return $this->getIterator()->offsetSet($offset, $value);
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		return $this->getIterator()->offsetUnset($offset);
+	}
+
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @param bool $stopRecursion Parameter used internally by TDBM to
+	 *                            stop embedded objects from embedding
+	 *                            other objects
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize($stopRecursion = false)
+	{
+		return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
+			return $item->jsonSerialize($stopRecursion);
+		}, $this->toArray());
+	}
+
+	/**
+	 * Returns only one value (the first) of the result set.
+	 * Returns null if no value exists.
+	 *
+	 * @return mixed|null
+	 */
+	public function first()
+	{
+		$page = $this->take(0, 1);
+		foreach ($page as $bean) {
+			return $bean;
+		}
+
+		return;
+	}
+
+	/**
+	 * Sets the ORDER BY directive executed in SQL and returns a NEW ResultIterator.
+	 *
+	 * For instance:
+	 *
+	 *  $resultSet = $resultSet->withOrder('label ASC, status DESC');
+	 *
+	 * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
+	 * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
+	 *
+	 *  $resultSet->withOrder(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return ResultIterator
+	 */
+	public function withOrder($orderBy) : ResultIterator
+	{
+		$clone = clone $this;
+		$clone->queryFactory = clone $this->queryFactory;
+		$clone->queryFactory->sort($orderBy);
+		$clone->innerResultIterator = null;
+
+		return $clone;
+	}
+
+	/**
+	 * Sets new parameters for the SQL query and returns a NEW ResultIterator.
+	 *
+	 * For instance:
+	 *
+	 *  $resultSet = $resultSet->withParameters('label ASC, status DESC');
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return ResultIterator
+	 */
+	public function withParameters(array $parameters) : ResultIterator
+	{
+		$clone = clone $this;
+		$clone->parameters = $parameters;
+		$clone->innerResultIterator = null;
+		$clone->totalCount = null;
+
+		return $clone;
+	}
 }

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

Indentation +167 added lines, -167 removed lines

@@ -11,125 +11,125 @@ 
  */
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Column
-     */
-    private $column;
-
-    public function __construct(Table $table, Column $column)
-    {
-        parent::__construct($table);
-        $this->table = $table;
-        $this->column = $column;
-    }
-
-    /**
-     * Returns the foreign-key the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $className = $this->getClassName();
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
-
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $paramType, $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    public function getClassName()
-    {
-        return;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
-    }
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return $this->column->getDefault() !== null;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     */
-    public function assignToDefaultCode()
-    {
-        $str = '        $this->%s(%s);';
-
-        $default = $this->column->getDefault();
-
-        if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
-            $defaultCode = 'new \DateTimeImmutable()';
-        } else {
-            $defaultCode = var_export($this->column->getDefault(), true);
-        }
-
-        return sprintf($str, $this->getSetterName(), $defaultCode);
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        $columnGetterName = $this->getGetterName();
-        $columnSetterName = $this->getSetterName();
-
-        // A column type can be forced if it is not nullable and not auto-incrmentable (for auto-increment columns, we can get "null" as long as the bean is not saved).
-        $canForceGetterReturnType = $this->column->getNotnull() && !$this->column->getAutoincrement();
-
-        $getterAndSetterCode = '    /**
+	/**
+	 * @var Column
+	 */
+	private $column;
+
+	public function __construct(Table $table, Column $column)
+	{
+		parent::__construct($table);
+		$this->table = $table;
+		$this->column = $column;
+	}
+
+	/**
+	 * Returns the foreign-key the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$className = $this->getClassName();
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
+
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $paramType, $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	public function getClassName()
+	{
+		return;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		return $this->column->getNotnull() && !$this->column->getAutoincrement() && $this->column->getDefault() === null;
+	}
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return $this->column->getDefault() !== null;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 */
+	public function assignToDefaultCode()
+	{
+		$str = '        $this->%s(%s);';
+
+		$default = $this->column->getDefault();
+
+		if (strtoupper($default) === 'CURRENT_TIMESTAMP') {
+			$defaultCode = 'new \DateTimeImmutable()';
+		} else {
+			$defaultCode = var_export($this->column->getDefault(), true);
+		}
+
+		return sprintf($str, $this->getSetterName(), $defaultCode);
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		$columnGetterName = $this->getGetterName();
+		$columnSetterName = $this->getSetterName();
+
+		// A column type can be forced if it is not nullable and not auto-incrmentable (for auto-increment columns, we can get "null" as long as the bean is not saved).
+		$canForceGetterReturnType = $this->column->getNotnull() && !$this->column->getAutoincrement();
+
+		$getterAndSetterCode = '    /**
      * The getter for the "%s" column.
      *
      * @return %s
@@ -151,52 +151,52 @@ 
 
 ';
 
-        return sprintf($getterAndSetterCode,
-            // Getter
-            $this->column->getName(),
-            $normalizedType.($canForceGetterReturnType ? '' : '|null'),
-            $columnGetterName,
-            ($canForceGetterReturnType ? ' : '.$normalizedType : ''),
-            var_export($this->column->getName(), true),
-            var_export($this->table->getName(), true),
-            // Setter
-            $this->column->getName(),
-            $normalizedType,
-            $this->column->getName(),
-            $columnSetterName,
-            $normalizedType,
-            //$castTo,
-            $this->column->getName().($this->column->getNotnull() ? '' : ' = null'),
-            var_export($this->column->getName(), true),
-            $this->column->getName(),
-            var_export($this->table->getName(), true)
-        );
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null) ? null : $this->'.$this->getGetterName()."()->format('c');\n";
-        } else {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
-        }
-    }
-
-    /**
-     * Returns the column name.
-     *
-     * @return string
-     */
-    public function getColumnName()
-    {
-        return $this->column->getName();
-    }
+		return sprintf($getterAndSetterCode,
+			// Getter
+			$this->column->getName(),
+			$normalizedType.($canForceGetterReturnType ? '' : '|null'),
+			$columnGetterName,
+			($canForceGetterReturnType ? ' : '.$normalizedType : ''),
+			var_export($this->column->getName(), true),
+			var_export($this->table->getName(), true),
+			// Setter
+			$this->column->getName(),
+			$normalizedType,
+			$this->column->getName(),
+			$columnSetterName,
+			$normalizedType,
+			//$castTo,
+			$this->column->getName().($this->column->getNotnull() ? '' : ' = null'),
+			var_export($this->column->getName(), true),
+			$this->column->getName(),
+			var_export($this->table->getName(), true)
+		);
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = ($this->'.$this->getGetterName().'() === null) ? null : $this->'.$this->getGetterName()."()->format('c');\n";
+		} else {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
+		}
+	}
+
+	/**
+	 * Returns the column name.
+	 *
+	 * @return string
+	 */
+	public function getColumnName()
+	{
+		return $this->column->getName();
+	}
 }

src/Mouf/Database/TDBM/QueryFactory/AbstractQueryFactory.php

Indentation +210 added lines, -210 removed lines

@@ -10,214 +10,214 @@
 
 abstract class AbstractQueryFactory implements QueryFactory
 {
-    /**
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * @var Schema
-     */
-    protected $schema;
-
-    /**
-     * @var OrderByAnalyzer
-     */
-    protected $orderByAnalyzer;
-
-    /**
-     * @var string|UncheckedOrderBy|null
-     */
-    protected $orderBy;
-
-    protected $magicSql;
-    protected $magicSqlCount;
-    protected $columnDescList;
-
-    /**
-     * @param TDBMService $tdbmService
-     */
-    public function __construct(TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, $orderBy)
-    {
-        $this->tdbmService = $tdbmService;
-        $this->schema = $schema;
-        $this->orderByAnalyzer = $orderByAnalyzer;
-        $this->orderBy = $orderBy;
-    }
-
-    /**
-     * Returns the column list that must be fetched for the SQL request.
-     *
-     * Note: MySQL dictates that ORDER BYed columns should appear in the SELECT clause.
-     *
-     * @param string                       $mainTable
-     * @param array                        $additionalTablesFetch
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return array
-     *
-     * @throws \Doctrine\DBAL\Schema\SchemaException
-     */
-    protected function getColumnsList(string $mainTable, array $additionalTablesFetch = array(), $orderBy = null)
-    {
-        // 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.
-
-        $connection = $this->tdbmService->getConnection();
-
-        $tableGroups = [];
-        $allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($mainTable);
-        $tableGroupName = $this->getTableGroupName($allFetchedTables);
-        foreach ($allFetchedTables as $table) {
-            $tableGroups[$table] = $tableGroupName;
-        }
-
-        $columnsList = [];
-        $columnDescList = [];
-        $sortColumn = 0;
-        $reconstructedOrderBy = null;
-
-        if (is_string($orderBy)) {
-            $orderBy = trim($orderBy);
-            if ($orderBy === '') {
-                $orderBy = null;
-            }
-        }
-
-        // Now, let's deal with "order by columns"
-        if ($orderBy !== null) {
-            if ($orderBy instanceof UncheckedOrderBy) {
-                $securedOrderBy = false;
-                $orderBy = $orderBy->getOrderBy();
-                $reconstructedOrderBy = $orderBy;
-            } else {
-                $securedOrderBy = true;
-                $reconstructedOrderBys = [];
-            }
-            $orderByColumns = $this->orderByAnalyzer->analyzeOrderBy($orderBy);
-
-            // If we sort by a column, there is a high chance we will fetch the bean containing this column.
-            // Hence, we should add the table to the $additionalTablesFetch
-            foreach ($orderByColumns as $orderByColumn) {
-                if ($orderByColumn['type'] === 'colref') {
-                    if ($orderByColumn['table'] !== null) {
-                        $additionalTablesFetch[] = $orderByColumn['table'];
-                    }
-                    if ($securedOrderBy) {
-                        $reconstructedOrderBys[] = ($orderByColumn['table'] !== null ? $connection->quoteIdentifier($orderByColumn['table']).'.' : '').$connection->quoteIdentifier($orderByColumn['column']).' '.$orderByColumn['direction'];
-                    }
-                } elseif ($orderByColumn['type'] === 'expr') {
-                    $sortColumnName = 'sort_column_'.$sortColumn;
-                    $columnsList[] = $orderByColumn['expr'].' as '.$sortColumnName;
-                    $columnDescList[] = [
-                        'tableGroup' => null,
-                    ];
-                    ++$sortColumn;
-
-                    if ($securedOrderBy) {
-                        throw new TDBMInvalidArgumentException('Invalid ORDER BY column: "'.$orderByColumn['expr'].'". If you want to use expression in your ORDER BY clause, you must wrap them in a UncheckedOrderBy object. For instance: new UncheckedOrderBy("col1 + col2 DESC")');
-                    }
-                }
-            }
-
-            if ($reconstructedOrderBy === null) {
-                $reconstructedOrderBy = implode(', ', $reconstructedOrderBys);
-            }
-        }
-
-        foreach ($additionalTablesFetch as $additionalTable) {
-            $relatedTables = $this->tdbmService->_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));
-
-        // Now, let's build the column list
-        foreach ($allFetchedTables as $table) {
-            foreach ($this->schema->getTable($table)->getColumns() as $column) {
-                $columnName = $column->getName();
-                $columnDescList[] = [
-                    'as' => $table.'____'.$columnName,
-                    'table' => $table,
-                    'column' => $columnName,
-                    'type' => $column->getType(),
-                    'tableGroup' => $tableGroups[$table],
-                ];
-                $columnsList[] = $connection->quoteIdentifier($table).'.'.$connection->quoteIdentifier($columnName).' as '.
-                    $connection->quoteIdentifier($table.'____'.$columnName);
-            }
-        }
-
-        return [$columnDescList, $columnsList, $reconstructedOrderBy];
-    }
-
-    abstract protected function compute();
-
-    /**
-     * Returns an identifier for the group of tables passed in parameter.
-     *
-     * @param string[] $relatedTables
-     *
-     * @return string
-     */
-    protected function getTableGroupName(array $relatedTables)
-    {
-        sort($relatedTables);
-
-        return implode('_``_', $relatedTables);
-    }
-
-    public function getMagicSql() : string
-    {
-        if ($this->magicSql === null) {
-            $this->compute();
-        }
-
-        return $this->magicSql;
-    }
-
-    public function getMagicSqlCount() : string
-    {
-        if ($this->magicSqlCount === null) {
-            $this->compute();
-        }
-
-        return $this->magicSqlCount;
-    }
-
-    public function getColumnDescriptors() : array
-    {
-        if ($this->columnDescList === null) {
-            $this->compute();
-        }
-
-        return $this->columnDescList;
-    }
-
-    /**
-     * Sets the ORDER BY directive executed in SQL.
-     *
-     * For instance:
-     *
-     *  $queryFactory->sort('label ASC, status DESC');
-     *
-     * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
-     * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
-     *
-     *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     */
-    public function sort($orderBy)
-    {
-        $this->orderBy = $orderBy;
-        $this->magicSql = null;
-        $this->magicSqlCount = null;
-        $this->columnDescList = null;
-    }
+	/**
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * @var Schema
+	 */
+	protected $schema;
+
+	/**
+	 * @var OrderByAnalyzer
+	 */
+	protected $orderByAnalyzer;
+
+	/**
+	 * @var string|UncheckedOrderBy|null
+	 */
+	protected $orderBy;
+
+	protected $magicSql;
+	protected $magicSqlCount;
+	protected $columnDescList;
+
+	/**
+	 * @param TDBMService $tdbmService
+	 */
+	public function __construct(TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, $orderBy)
+	{
+		$this->tdbmService = $tdbmService;
+		$this->schema = $schema;
+		$this->orderByAnalyzer = $orderByAnalyzer;
+		$this->orderBy = $orderBy;
+	}
+
+	/**
+	 * Returns the column list that must be fetched for the SQL request.
+	 *
+	 * Note: MySQL dictates that ORDER BYed columns should appear in the SELECT clause.
+	 *
+	 * @param string                       $mainTable
+	 * @param array                        $additionalTablesFetch
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return array
+	 *
+	 * @throws \Doctrine\DBAL\Schema\SchemaException
+	 */
+	protected function getColumnsList(string $mainTable, array $additionalTablesFetch = array(), $orderBy = null)
+	{
+		// 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.
+
+		$connection = $this->tdbmService->getConnection();
+
+		$tableGroups = [];
+		$allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($mainTable);
+		$tableGroupName = $this->getTableGroupName($allFetchedTables);
+		foreach ($allFetchedTables as $table) {
+			$tableGroups[$table] = $tableGroupName;
+		}
+
+		$columnsList = [];
+		$columnDescList = [];
+		$sortColumn = 0;
+		$reconstructedOrderBy = null;
+
+		if (is_string($orderBy)) {
+			$orderBy = trim($orderBy);
+			if ($orderBy === '') {
+				$orderBy = null;
+			}
+		}
+
+		// Now, let's deal with "order by columns"
+		if ($orderBy !== null) {
+			if ($orderBy instanceof UncheckedOrderBy) {
+				$securedOrderBy = false;
+				$orderBy = $orderBy->getOrderBy();
+				$reconstructedOrderBy = $orderBy;
+			} else {
+				$securedOrderBy = true;
+				$reconstructedOrderBys = [];
+			}
+			$orderByColumns = $this->orderByAnalyzer->analyzeOrderBy($orderBy);
+
+			// If we sort by a column, there is a high chance we will fetch the bean containing this column.
+			// Hence, we should add the table to the $additionalTablesFetch
+			foreach ($orderByColumns as $orderByColumn) {
+				if ($orderByColumn['type'] === 'colref') {
+					if ($orderByColumn['table'] !== null) {
+						$additionalTablesFetch[] = $orderByColumn['table'];
+					}
+					if ($securedOrderBy) {
+						$reconstructedOrderBys[] = ($orderByColumn['table'] !== null ? $connection->quoteIdentifier($orderByColumn['table']).'.' : '').$connection->quoteIdentifier($orderByColumn['column']).' '.$orderByColumn['direction'];
+					}
+				} elseif ($orderByColumn['type'] === 'expr') {
+					$sortColumnName = 'sort_column_'.$sortColumn;
+					$columnsList[] = $orderByColumn['expr'].' as '.$sortColumnName;
+					$columnDescList[] = [
+						'tableGroup' => null,
+					];
+					++$sortColumn;
+
+					if ($securedOrderBy) {
+						throw new TDBMInvalidArgumentException('Invalid ORDER BY column: "'.$orderByColumn['expr'].'". If you want to use expression in your ORDER BY clause, you must wrap them in a UncheckedOrderBy object. For instance: new UncheckedOrderBy("col1 + col2 DESC")');
+					}
+				}
+			}
+
+			if ($reconstructedOrderBy === null) {
+				$reconstructedOrderBy = implode(', ', $reconstructedOrderBys);
+			}
+		}
+
+		foreach ($additionalTablesFetch as $additionalTable) {
+			$relatedTables = $this->tdbmService->_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));
+
+		// Now, let's build the column list
+		foreach ($allFetchedTables as $table) {
+			foreach ($this->schema->getTable($table)->getColumns() as $column) {
+				$columnName = $column->getName();
+				$columnDescList[] = [
+					'as' => $table.'____'.$columnName,
+					'table' => $table,
+					'column' => $columnName,
+					'type' => $column->getType(),
+					'tableGroup' => $tableGroups[$table],
+				];
+				$columnsList[] = $connection->quoteIdentifier($table).'.'.$connection->quoteIdentifier($columnName).' as '.
+					$connection->quoteIdentifier($table.'____'.$columnName);
+			}
+		}
+
+		return [$columnDescList, $columnsList, $reconstructedOrderBy];
+	}
+
+	abstract protected function compute();
+
+	/**
+	 * Returns an identifier for the group of tables passed in parameter.
+	 *
+	 * @param string[] $relatedTables
+	 *
+	 * @return string
+	 */
+	protected function getTableGroupName(array $relatedTables)
+	{
+		sort($relatedTables);
+
+		return implode('_``_', $relatedTables);
+	}
+
+	public function getMagicSql() : string
+	{
+		if ($this->magicSql === null) {
+			$this->compute();
+		}
+
+		return $this->magicSql;
+	}
+
+	public function getMagicSqlCount() : string
+	{
+		if ($this->magicSqlCount === null) {
+			$this->compute();
+		}
+
+		return $this->magicSqlCount;
+	}
+
+	public function getColumnDescriptors() : array
+	{
+		if ($this->columnDescList === null) {
+			$this->compute();
+		}
+
+		return $this->columnDescList;
+	}
+
+	/**
+	 * Sets the ORDER BY directive executed in SQL.
+	 *
+	 * For instance:
+	 *
+	 *  $queryFactory->sort('label ASC, status DESC');
+	 *
+	 * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
+	 * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
+	 *
+	 *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 */
+	public function sort($orderBy)
+	{
+		$this->orderBy = $orderBy;
+		$this->magicSql = null;
+		$this->magicSqlCount = null;
+		$this->columnDescList = null;
+	}
 }

src/Mouf/Database/TDBM/QueryFactory/FindObjectsFromSqlQueryFactory.php

Indentation +187 added lines, -187 removed lines

@@ -15,191 +15,191 @@
  */
 class FindObjectsFromSqlQueryFactory extends AbstractQueryFactory
 {
-    private $mainTable;
-    private $from;
-    private $filterString;
-    private $cache;
-    private $cachePrefix;
-
-    public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
-    {
-        parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
-        $this->mainTable = $mainTable;
-        $this->from = $from;
-        $this->filterString = $filterString;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->cache = $cache;
-        $this->cachePrefix = $cachePrefix;
-    }
-
-    protected function compute()
-    {
-        $connection = $this->tdbmService->getConnection();
-
-        $columnsList = null;
-
-        $allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
-
-        $columnDescList = [];
-
-        $tableGroupName = $this->getTableGroupName($allFetchedTables);
-
-        foreach ($this->schema->getTable($this->mainTable)->getColumns() as $column) {
-            $columnName = $column->getName();
-            $columnDescList[] = [
-                'as' => $columnName,
-                'table' => $this->mainTable,
-                'column' => $columnName,
-                'type' => $column->getType(),
-                'tableGroup' => $tableGroupName,
-            ];
-        }
-
-        $sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']);
-        }, $columnDescList)).' FROM '.$this->from;
-
-        if (count($allFetchedTables) > 1) {
-            list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
-        } elseif ($this->orderBy) {
-            list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
-        }
-
-        // Let's compute the COUNT.
-        $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
-        }, $pkColumnNames);
-
-        $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
-
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-        }
-
-        if (stripos($countSql, 'GROUP BY') !== false) {
-            throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
-        }
-
-        if ($columnsList !== null) {
-            $joinSql = '';
-            $parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
-            foreach ($parentFks as $fk) {
-                $joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0]),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0])
-                );
-            }
-
-            $childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
-            foreach ($childrenFks as $fk) {
-                $joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0]),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0])
-                );
-            }
-
-            $sql = 'SELECT '.implode(', ', $columnsList).' FROM ('.$sql.') AS '.$this->mainTable.' '.$joinSql;
-            if (!empty($orderString)) {
-                $sql .= ' ORDER BY '.$orderString;
-            }
-        }
-
-        $this->magicSql = $sql;
-        $this->magicSqlCount = $countSql;
-        $this->columnDescList = $columnDescList;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeys($tableName)
-    {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeysWithoutCache($tableName)
-    {
-        $parentFks = [];
-        $currentTable = $tableName;
-        while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentFks[] = $currentFk;
-        }
-
-        return $parentFks;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeys(string $tableName) : array
-    {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
-    {
-        $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
-
-        if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
-                return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
-            }, $children);
-
-            $fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
-
-            return $fks;
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    protected function fromCache(string $key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
+	private $mainTable;
+	private $from;
+	private $filterString;
+	private $cache;
+	private $cachePrefix;
+
+	public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
+	{
+		parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
+		$this->mainTable = $mainTable;
+		$this->from = $from;
+		$this->filterString = $filterString;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->cache = $cache;
+		$this->cachePrefix = $cachePrefix;
+	}
+
+	protected function compute()
+	{
+		$connection = $this->tdbmService->getConnection();
+
+		$columnsList = null;
+
+		$allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
+
+		$columnDescList = [];
+
+		$tableGroupName = $this->getTableGroupName($allFetchedTables);
+
+		foreach ($this->schema->getTable($this->mainTable)->getColumns() as $column) {
+			$columnName = $column->getName();
+			$columnDescList[] = [
+				'as' => $columnName,
+				'table' => $this->mainTable,
+				'column' => $columnName,
+				'type' => $column->getType(),
+				'tableGroup' => $tableGroupName,
+			];
+		}
+
+		$sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']);
+		}, $columnDescList)).' FROM '.$this->from;
+
+		if (count($allFetchedTables) > 1) {
+			list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+		} elseif ($this->orderBy) {
+			list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+		}
+
+		// Let's compute the COUNT.
+		$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
+		$pkColumnNames = array_map(function ($pkColumn) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
+		}, $pkColumnNames);
+
+		$countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
+
+		if (!empty($this->filterString)) {
+			$sql .= ' WHERE '.$this->filterString;
+			$countSql .= ' WHERE '.$this->filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+		}
+
+		if (stripos($countSql, 'GROUP BY') !== false) {
+			throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
+		}
+
+		if ($columnsList !== null) {
+			$joinSql = '';
+			$parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
+			foreach ($parentFks as $fk) {
+				$joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0]),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0])
+				);
+			}
+
+			$childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
+			foreach ($childrenFks as $fk) {
+				$joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0]),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0])
+				);
+			}
+
+			$sql = 'SELECT '.implode(', ', $columnsList).' FROM ('.$sql.') AS '.$this->mainTable.' '.$joinSql;
+			if (!empty($orderString)) {
+				$sql .= ' ORDER BY '.$orderString;
+			}
+		}
+
+		$this->magicSql = $sql;
+		$this->magicSqlCount = $countSql;
+		$this->columnDescList = $columnDescList;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeys($tableName)
+	{
+		return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeysWithoutCache($tableName)
+	{
+		$parentFks = [];
+		$currentTable = $tableName;
+		while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentFks[] = $currentFk;
+		}
+
+		return $parentFks;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeys(string $tableName) : array
+	{
+		return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
+	{
+		$children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
+
+		if (!empty($children)) {
+			$fksTables = array_map(function (ForeignKeyConstraint $fk) {
+				return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
+			}, $children);
+
+			$fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
+
+			return $fks;
+		} else {
+			return [];
+		}
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	protected function fromCache(string $key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
 }

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Indentation +606 added lines, -606 removed lines

@@ -31,615 +31,615 @@
  */
 abstract class AbstractTDBMObject implements JsonSerializable
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * An array of DbRow, indexed by table name.
-     *
-     * @var DbRow[]
-     */
-    protected $dbRows = [];
-
-    /**
-     * 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;
-
-    /**
-     * Array storing beans related via many to many relationships (pivot tables).
-     *
-     * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
-     */
-    private $relationships = [];
-
-    /**
-     * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
-     */
-    private $loadedRelationships = [];
-
-    /**
-     * Array storing beans related via many to one relationships (this bean is pointed by external beans).
-     *
-     * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
-     */
-    private $manyToOneRelationships = [];
-
-    /**
-     * Used with $primaryKeys when we want to retrieve an existing object
-     * and $primaryKeys=[] if we want a new object.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
-    {
-        // FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
-        if (!empty($tableName)) {
-            $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-        }
-
-        if ($tdbmService === null) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
-        } else {
-            $this->_attach($tdbmService);
-            if (!empty($primaryKeys)) {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-            } else {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
-            }
-        }
-    }
-
-    /**
-     * Alternative constructor called when data is fetched from database via a SELECT.
-     *
-     * @param array       $beanData    array<table, array<column, value>>
-     * @param TDBMService $tdbmService
-     */
-    public function _constructFromData(array $beanData, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        foreach ($beanData as $table => $columns) {
-            $this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
-        }
-
-        $this->status = TDBMObjectStateEnum::STATE_LOADED;
-    }
-
-    /**
-     * Alternative constructor called when bean is lazily loaded.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     */
-    public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-
-        $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-    }
-
-    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;
-
-        // If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
-        $tableNames = $this->getUsedTables();
-
-        $newDbRows = [];
-
-        foreach ($tableNames as $table) {
-            if (!isset($this->dbRows[$table])) {
-                $this->registerTable($table);
-            }
-            $newDbRows[$table] = $this->dbRows[$table];
-        }
-        $this->dbRows = $newDbRows;
-
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_attach($tdbmService);
-        }
-    }
-
-    /**
-     * 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;
-
-        // TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_setStatus($state);
-        }
-
-        if ($state === TDBMObjectStateEnum::STATE_DELETED) {
-            $this->onDelete();
-        }
-    }
-
-    /**
-     * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
-     * or throws an error.
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    private function checkTableName($tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            }
-        }
-
-        return $tableName;
-    }
-
-    protected function get($var, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->get($var);
-    }
-
-    protected function set($var, $value, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $this->dbRows[$tableName]->set($var, $value);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
-        if ($oldLinkedBean !== null) {
-            $oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-
-        $this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-
-        if ($bean !== null) {
-            $bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    protected function getRef($foreignKeyName, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        if (!isset($this->dbRows[$tableName])) {
-            return;
-        }
-
-        return $this->dbRows[$tableName]->getRef($foreignKeyName);
-    }
-
-    /**
-     * Adds a many to many relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $this->setRelationship($pivotTableName, $remoteBean, 'new');
-    }
-
-    /**
-     * Returns true if there is a relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     *
-     * @return bool
-     */
-    protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        if ($storage->contains($remoteBean)) {
-            if ($storage[$remoteBean]['status'] !== 'delete') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal TDBM method. Removes a many to many relationship from this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
-            unset($this->relationships[$pivotTableName][$remoteBean]);
-            unset($remoteBean->relationships[$pivotTableName][$this]);
-        } else {
-            $this->setRelationship($pivotTableName, $remoteBean, 'delete');
-        }
-    }
-
-    /**
-     * Sets many to many relationships for this bean.
-     * Adds new relationships and removes unused ones.
-     *
-     * @param $pivotTableName
-     * @param array $remoteBeans
-     */
-    protected function setRelationships($pivotTableName, array $remoteBeans)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        foreach ($storage as $oldRemoteBean) {
-            if (!in_array($oldRemoteBean, $remoteBeans, true)) {
-                // $oldRemoteBean must be removed
-                $this->_removeRelationship($pivotTableName, $oldRemoteBean);
-            }
-        }
-
-        foreach ($remoteBeans as $remoteBean) {
-            if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
-                // $remoteBean must be added
-                $this->addRelationship($pivotTableName, $remoteBean);
-            }
-        }
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function retrieveRelationshipsStorage($pivotTableName)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
-            return $storage;
-        }
-
-        $beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
-        $this->loadedRelationships[$pivotTableName] = true;
-
-        foreach ($beans as $bean) {
-            if (isset($storage[$bean])) {
-                $oldStatus = $storage[$bean]['status'];
-                if ($oldStatus === 'delete') {
-                    // Keep deleted things deleted
-                    continue;
-                }
-            }
-            $this->setRelationship($pivotTableName, $bean, 'loaded');
-        }
-
-        return $storage;
-    }
-
-    /**
-     * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelationships($pivotTableName)
-    {
-        return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
-    }
-
-    private function relationshipStorageToArray(\SplObjectStorage $storage)
-    {
-        $beans = [];
-        foreach ($storage as $bean) {
-            $statusArr = $storage[$bean];
-            if ($statusArr['status'] !== 'delete') {
-                $beans[] = $bean;
-            }
-        }
-
-        return $beans;
-    }
-
-    /**
-     * Declares a relationship between.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     * @param string             $status
-     */
-    private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        $storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
-        if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
-        }
-
-        $remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-        $remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
-    {
-        return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     *
-     * @return AlterableResultIterator
-     */
-    private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-
-        return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->add($remoteBean);
-    }
-
-    /**
-     * Declares a relationship between this bean and the bean pointing to it.
-     *
-     * @param string             $tableName
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
-    {
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        $alterableResultIterator->remove($remoteBean);
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via a given foreign key.
-     *
-     * @param string $tableName
-     * @param string $foreignKeyName
-     * @param string $searchTableName
-     * @param array  $searchFilter
-     * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
-     *
-     * @return AlterableResultIterator
-     */
-    protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
-    {
-        $key = $tableName.'___'.$foreignKeyName;
-        $alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
-            return $alterableResultIterator;
-        }
-
-        $unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
-
-        $alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
-
-        return $alterableResultIterator;
-    }
-
-    /**
-     * Reverts any changes made to the object and resumes it to its DB state.
-     * This can only be called on objects that come from database and that have not been deleted.
-     * Otherwise, this will throw an exception.
-     *
-     * @throws TDBMException
-     */
-    public function discardChanges()
-    {
-        if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
-        }
-
-        if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
-        }
-
-        $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-    }
-
-    /**
-     * 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 clone the many to many relationships
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $pivotTableList = array_keys($this->relationships);
-        } else {
-            $pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
-        }
-
-        foreach ($pivotTableList as $pivotTable) {
-            $storage = $this->retrieveRelationshipsStorage($pivotTable);
-
-            // Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
-            /*foreach ($storage as $remoteBean) {
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * An array of DbRow, indexed by table name.
+	 *
+	 * @var DbRow[]
+	 */
+	protected $dbRows = [];
+
+	/**
+	 * 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;
+
+	/**
+	 * Array storing beans related via many to many relationships (pivot tables).
+	 *
+	 * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
+	 */
+	private $relationships = [];
+
+	/**
+	 * @var bool[] Key: pivot table name, value: whether a query was performed to load the data
+	 */
+	private $loadedRelationships = [];
+
+	/**
+	 * Array storing beans related via many to one relationships (this bean is pointed by external beans).
+	 *
+	 * @var AlterableResultIterator[] Key: [external_table]___[external_column], value: SplObjectStorage
+	 */
+	private $manyToOneRelationships = [];
+
+	/**
+	 * Used with $primaryKeys when we want to retrieve an existing object
+	 * and $primaryKeys=[] if we want a new object.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct($tableName = null, array $primaryKeys = [], TDBMService $tdbmService = null)
+	{
+		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
+		if (!empty($tableName)) {
+			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+		}
+
+		if ($tdbmService === null) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
+		} else {
+			$this->_attach($tdbmService);
+			if (!empty($primaryKeys)) {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+			} else {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
+			}
+		}
+	}
+
+	/**
+	 * Alternative constructor called when data is fetched from database via a SELECT.
+	 *
+	 * @param array       $beanData    array<table, array<column, value>>
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructFromData(array $beanData, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		foreach ($beanData as $table => $columns) {
+			$this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
+		}
+
+		$this->status = TDBMObjectStateEnum::STATE_LOADED;
+	}
+
+	/**
+	 * Alternative constructor called when bean is lazily loaded.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+
+		$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+	}
+
+	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;
+
+		// If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
+		$tableNames = $this->getUsedTables();
+
+		$newDbRows = [];
+
+		foreach ($tableNames as $table) {
+			if (!isset($this->dbRows[$table])) {
+				$this->registerTable($table);
+			}
+			$newDbRows[$table] = $this->dbRows[$table];
+		}
+		$this->dbRows = $newDbRows;
+
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_attach($tdbmService);
+		}
+	}
+
+	/**
+	 * 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;
+
+		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_setStatus($state);
+		}
+
+		if ($state === TDBMObjectStateEnum::STATE_DELETED) {
+			$this->onDelete();
+		}
+	}
+
+	/**
+	 * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
+	 * or throws an error.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	private function checkTableName($tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			}
+		}
+
+		return $tableName;
+	}
+
+	protected function get($var, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->get($var);
+	}
+
+	protected function set($var, $value, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$this->dbRows[$tableName]->set($var, $value);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	protected function setRef($foreignKeyName, AbstractTDBMObject $bean = null, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$oldLinkedBean = $this->dbRows[$tableName]->getRef($foreignKeyName);
+		if ($oldLinkedBean !== null) {
+			$oldLinkedBean->removeManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+
+		$this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+
+		if ($bean !== null) {
+			$bean->setManyToOneRelationship($tableName, $foreignKeyName, $this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	protected function getRef($foreignKeyName, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		if (!isset($this->dbRows[$tableName])) {
+			return;
+		}
+
+		return $this->dbRows[$tableName]->getRef($foreignKeyName);
+	}
+
+	/**
+	 * Adds a many to many relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$this->setRelationship($pivotTableName, $remoteBean, 'new');
+	}
+
+	/**
+	 * Returns true if there is a relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 *
+	 * @return bool
+	 */
+	protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		if ($storage->contains($remoteBean)) {
+			if ($storage[$remoteBean]['status'] !== 'delete') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Internal TDBM method. Removes a many to many relationship from this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
+			unset($this->relationships[$pivotTableName][$remoteBean]);
+			unset($remoteBean->relationships[$pivotTableName][$this]);
+		} else {
+			$this->setRelationship($pivotTableName, $remoteBean, 'delete');
+		}
+	}
+
+	/**
+	 * Sets many to many relationships for this bean.
+	 * Adds new relationships and removes unused ones.
+	 *
+	 * @param $pivotTableName
+	 * @param array $remoteBeans
+	 */
+	protected function setRelationships($pivotTableName, array $remoteBeans)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		foreach ($storage as $oldRemoteBean) {
+			if (!in_array($oldRemoteBean, $remoteBeans, true)) {
+				// $oldRemoteBean must be removed
+				$this->_removeRelationship($pivotTableName, $oldRemoteBean);
+			}
+		}
+
+		foreach ($remoteBeans as $remoteBean) {
+			if (!$storage->contains($remoteBean) || $storage[$remoteBean]['status'] === 'delete') {
+				// $remoteBean must be added
+				$this->addRelationship($pivotTableName, $remoteBean);
+			}
+		}
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function retrieveRelationshipsStorage($pivotTableName)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName])) {
+			return $storage;
+		}
+
+		$beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
+		$this->loadedRelationships[$pivotTableName] = true;
+
+		foreach ($beans as $bean) {
+			if (isset($storage[$bean])) {
+				$oldStatus = $storage[$bean]['status'];
+				if ($oldStatus === 'delete') {
+					// Keep deleted things deleted
+					continue;
+				}
+			}
+			$this->setRelationship($pivotTableName, $bean, 'loaded');
+		}
+
+		return $storage;
+	}
+
+	/**
+	 * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelationships($pivotTableName)
+	{
+		return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
+	}
+
+	private function relationshipStorageToArray(\SplObjectStorage $storage)
+	{
+		$beans = [];
+		foreach ($storage as $bean) {
+			$statusArr = $storage[$bean];
+			if ($statusArr['status'] !== 'delete') {
+				$beans[] = $bean;
+			}
+		}
+
+		return $beans;
+	}
+
+	/**
+	 * Declares a relationship between.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 * @param string             $status
+	 */
+	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
+		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
+		}
+
+		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function getRelationshipStorage(string $pivotTableName) : \SplObjectStorage
+	{
+		return $this->relationships[$pivotTableName] ?? $this->relationships[$pivotTableName] = new \SplObjectStorage();
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 *
+	 * @return AlterableResultIterator
+	 */
+	private function getManyToOneAlterableResultIterator(string $tableName, string $foreignKeyName) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+
+		return $this->manyToOneRelationships[$key] ?? $this->manyToOneRelationships[$key] = new AlterableResultIterator();
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function setManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->add($remoteBean);
+	}
+
+	/**
+	 * Declares a relationship between this bean and the bean pointing to it.
+	 *
+	 * @param string             $tableName
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	private function removeManyToOneRelationship(string $tableName, string $foreignKeyName, AbstractTDBMObject $remoteBean)
+	{
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		$alterableResultIterator->remove($remoteBean);
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via a given foreign key.
+	 *
+	 * @param string $tableName
+	 * @param string $foreignKeyName
+	 * @param string $searchTableName
+	 * @param array  $searchFilter
+	 * @param string $orderString     The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
+	 *
+	 * @return AlterableResultIterator
+	 */
+	protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
+	{
+		$key = $tableName.'___'.$foreignKeyName;
+		$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
+			return $alterableResultIterator;
+		}
+
+		$unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);
+
+		$alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());
+
+		return $alterableResultIterator;
+	}
+
+	/**
+	 * Reverts any changes made to the object and resumes it to its DB state.
+	 * This can only be called on objects that come from database and that have not been deleted.
+	 * Otherwise, this will throw an exception.
+	 *
+	 * @throws TDBMException
+	 */
+	public function discardChanges()
+	{
+		if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
+		}
+
+		if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
+		}
+
+		$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+	}
+
+	/**
+	 * 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 clone the many to many relationships
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$pivotTableList = array_keys($this->relationships);
+		} else {
+			$pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
+		}
+
+		foreach ($pivotTableList as $pivotTable) {
+			$storage = $this->retrieveRelationshipsStorage($pivotTable);
+
+			// Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
+			/*foreach ($storage as $remoteBean) {
                 $metadata = $storage[$remoteBean];
 
                 $remoteStorage = $remoteBean->getRelationshipStorage($pivotTable);
                 $remoteStorage->attach($this, ['status' => $metadata['status'], 'reverse' => !$metadata['reverse']]);
             }*/
-        }
-
-        // Let's clone each row
-        foreach ($this->dbRows as $key => &$dbRow) {
-            $dbRow = clone $dbRow;
-            $dbRow->setTDBMObject($this);
-        }
-
-        $this->manyToOneRelationships = [];
-
-        // Let's set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-    }
-
-    /**
-     * Returns raw database rows.
-     *
-     * @return DbRow[] Key: table name, Value: DbRow object
-     */
-    public function _getDbRows()
-    {
-        return $this->dbRows;
-    }
-
-    private function registerTable($tableName)
-    {
-        $dbRow = new DbRow($this, $tableName);
-
-        if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
-            // Let's get the primary key for the new table
-            $anotherDbRow = array_values($this->dbRows)[0];
-            /* @var $anotherDbRow DbRow */
-            $indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
-            $primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
-            $dbRow->_setPrimaryKeys($primaryKeys);
-        }
-
-        $dbRow->_setStatus($this->status);
-
-        $this->dbRows[$tableName] = $dbRow;
-        // TODO: look at status (if not new)=> get primary key from tdbmservice
-    }
-
-    /**
-     * Internal function: return the list of relationships.
-     *
-     * @return \SplObjectStorage[]
-     */
-    public function _getCachedRelationships()
-    {
-        return $this->relationships;
-    }
-
-    /**
-     * Returns an array of used tables by this bean (from parent to child relationship).
-     *
-     * @return string[]
-     */
-    abstract protected function getUsedTables();
-
-    /**
-     * Method called when the bean is removed from database.
-     */
-    protected function onDelete()
-    {
-    }
+		}
+
+		// Let's clone each row
+		foreach ($this->dbRows as $key => &$dbRow) {
+			$dbRow = clone $dbRow;
+			$dbRow->setTDBMObject($this);
+		}
+
+		$this->manyToOneRelationships = [];
+
+		// Let's set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+	}
+
+	/**
+	 * Returns raw database rows.
+	 *
+	 * @return DbRow[] Key: table name, Value: DbRow object
+	 */
+	public function _getDbRows()
+	{
+		return $this->dbRows;
+	}
+
+	private function registerTable($tableName)
+	{
+		$dbRow = new DbRow($this, $tableName);
+
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
+			// Let's get the primary key for the new table
+			$anotherDbRow = array_values($this->dbRows)[0];
+			/* @var $anotherDbRow DbRow */
+			$indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
+			$primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
+			$dbRow->_setPrimaryKeys($primaryKeys);
+		}
+
+		$dbRow->_setStatus($this->status);
+
+		$this->dbRows[$tableName] = $dbRow;
+		// TODO: look at status (if not new)=> get primary key from tdbmservice
+	}
+
+	/**
+	 * Internal function: return the list of relationships.
+	 *
+	 * @return \SplObjectStorage[]
+	 */
+	public function _getCachedRelationships()
+	{
+		return $this->relationships;
+	}
+
+	/**
+	 * Returns an array of used tables by this bean (from parent to child relationship).
+	 *
+	 * @return string[]
+	 */
+	abstract protected function getUsedTables();
+
+	/**
+	 * Method called when the bean is removed from database.
+	 */
+	protected function onDelete()
+	{
+	}
 }

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

Indentation +110 added lines, -110 removed lines

@@ -12,65 +12,65 @@ 
  */
 class DirectForeignKeyMethodDescriptor implements MethodDescriptorInterface
 {
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $fk;
-
-    private $useAlternateName = false;
-    /**
-     * @var Table
-     */
-    private $mainTable;
-
-    /**
-     * @param ForeignKeyConstraint $fk        The foreign key pointing to our bean.
-     * @param Table                $mainTable The main table that is pointed to.
-     */
-    public function __construct(ForeignKeyConstraint $fk, Table $mainTable)
-    {
-        $this->fk = $fk;
-        $this->mainTable = $mainTable;
-    }
-
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string
-    {
-        if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
-        } else {
-            $methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
-
-            $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
-
-            $methodName .= implode('And', $camelizedColumns);
-
-            return $methodName;
-        }
-    }
-
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName()
-    {
-        $this->useAlternateName = true;
-    }
-
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string
-    {
-        $code = '';
-
-        $getterCode = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $fk;
+
+	private $useAlternateName = false;
+	/**
+	 * @var Table
+	 */
+	private $mainTable;
+
+	/**
+	 * @param ForeignKeyConstraint $fk        The foreign key pointing to our bean.
+	 * @param Table                $mainTable The main table that is pointed to.
+	 */
+	public function __construct(ForeignKeyConstraint $fk, Table $mainTable)
+	{
+		$this->fk = $fk;
+		$this->mainTable = $mainTable;
+	}
+
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string
+	{
+		if (!$this->useAlternateName) {
+			return 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName());
+		} else {
+			$methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->fk->getLocalTableName()).'By';
+
+			$camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->fk->getLocalColumns());
+
+			$methodName .= implode('And', $camelizedColumns);
+
+			return $methodName;
+		}
+	}
+
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName()
+	{
+		$this->useAlternateName = true;
+	}
+
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string
+	{
+		$code = '';
+
+		$getterCode = '    /**
      * Returns the list of %s pointing to this bean via the %s column.
      *
      * @return %s[]|AlterableResultIterator
@@ -82,55 +82,55 @@ 
 
 ';
 
-        $beanClass = TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getLocalTableName());
-        $code .= sprintf($getterCode,
-            $beanClass,
-            implode(', ', $this->fk->getColumns()),
-            $beanClass,
-            $this->getName(),
-            var_export($this->fk->getLocalTableName(), true),
-            var_export($this->fk->getName(), true),
-            var_export($this->fk->getLocalTableName(), true),
-            $this->getFilters($this->fk)
-        );
-
-        return $code;
-    }
-
-    private function getFilters(ForeignKeyConstraint $fk) : string
-    {
-        $counter = 0;
-        $parameters = [];
-
-        $pkColumns = $this->mainTable->getPrimaryKeyColumns();
-
-        foreach ($fk->getLocalColumns() as $columnName) {
-            $pkColumn = $pkColumns[$counter];
-            $parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
-            ++$counter;
-        }
-        $parametersCode = '['.implode(', ', $parameters).']';
-
-        return $parametersCode;
-    }
-
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array
-    {
-        return [TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getForeignTableName())];
-    }
-
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string
-    {
-        return '';
-    }
+		$beanClass = TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getLocalTableName());
+		$code .= sprintf($getterCode,
+			$beanClass,
+			implode(', ', $this->fk->getColumns()),
+			$beanClass,
+			$this->getName(),
+			var_export($this->fk->getLocalTableName(), true),
+			var_export($this->fk->getName(), true),
+			var_export($this->fk->getLocalTableName(), true),
+			$this->getFilters($this->fk)
+		);
+
+		return $code;
+	}
+
+	private function getFilters(ForeignKeyConstraint $fk) : string
+	{
+		$counter = 0;
+		$parameters = [];
+
+		$pkColumns = $this->mainTable->getPrimaryKeyColumns();
+
+		foreach ($fk->getLocalColumns() as $columnName) {
+			$pkColumn = $pkColumns[$counter];
+			$parameters[] = sprintf('%s => $this->get(%s, %s)', var_export($fk->getLocalTableName().'.'.$columnName, true), var_export($pkColumn, true), var_export($this->fk->getForeignTableName(), true));
+			++$counter;
+		}
+		$parametersCode = '['.implode(', ', $parameters).']';
+
+		return $parametersCode;
+	}
+
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array
+	{
+		return [TDBMDaoGenerator::getBeanNameFromTableName($this->fk->getForeignTableName())];
+	}
+
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string
+	{
+		return '';
+	}
 }

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

Indentation +543 added lines, -543 removed lines

@@ -16,228 +16,228 @@ 
  */
 class BeanDescriptor
 {
-    /**
-     * @var Table
-     */
-    private $table;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var AbstractBeanPropertyDescriptor[]
-     */
-    private $beanPropertyDescriptors = [];
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
-    {
-        $this->table = $table;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->initBeanPropertyDescriptors();
-    }
-
-    private function initBeanPropertyDescriptors()
-    {
-        $this->beanPropertyDescriptors = $this->getProperties($this->table);
-    }
-
-    /**
-     * Returns the foreign-key the column is part of, if any. null otherwise.
-     *
-     * @param Table  $table
-     * @param Column $column
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    private function isPartOfForeignKey(Table $table, Column $column)
-    {
-        $localColumnName = $column->getName();
-        foreach ($table->getForeignKeys() as $foreignKey) {
-            foreach ($foreignKey->getColumns() as $columnName) {
-                if ($columnName === $localColumnName) {
-                    return $foreignKey;
-                }
-            }
-        }
-
-        return;
-    }
-
-    /**
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getBeanPropertyDescriptors()
-    {
-        return $this->beanPropertyDescriptors;
-    }
-
-    /**
-     * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getConstructorProperties()
-    {
-        $constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->isCompulsory();
-        });
-
-        return $constructorProperties;
-    }
-
-    /**
-     * Returns the list of columns that have default values for a given table.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getPropertiesWithDefault()
-    {
-        $properties = $this->getPropertiesForTable($this->table);
-        $defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->hasDefault();
-        });
-
-        return $defaultProperties;
-    }
-
-    /**
-     * Returns the list of properties exposed as getters and setters in this class.
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    public function getExposedProperties()
-    {
-        $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->getTable()->getName() == $this->table->getName();
-        });
-
-        return $exposedProperties;
-    }
-
-    /**
-     * Returns the list of properties for this table (including parent tables).
-     *
-     * @param Table $table
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getProperties(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
-            $properties = $this->getProperties($parentTable);
-            // we merge properties by overriding property names.
-            $localProperties = $this->getPropertiesForTable($table);
-            foreach ($localProperties as $name => $property) {
-                // We do not override properties if this is a primary key!
-                if ($property->isPrimaryKey()) {
-                    continue;
-                }
-                $properties[$name] = $property;
-            }
-        } else {
-            $properties = $this->getPropertiesForTable($table);
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Returns the list of properties for this table (ignoring parent tables).
-     *
-     * @param Table $table
-     *
-     * @return AbstractBeanPropertyDescriptor[]
-     */
-    private function getPropertiesForTable(Table $table)
-    {
-        $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-        if ($parentRelationship) {
-            $ignoreColumns = $parentRelationship->getLocalColumns();
-        } else {
-            $ignoreColumns = [];
-        }
-
-        $beanPropertyDescriptors = [];
-
-        foreach ($table->getColumns() as $column) {
-            if (array_search($column->getName(), $ignoreColumns) !== false) {
-                continue;
-            }
-
-            $fk = $this->isPartOfForeignKey($table, $column);
-            if ($fk !== null) {
-                // Check that previously added descriptors are not added on same FK (can happen with multi key FK).
-                foreach ($beanPropertyDescriptors as $beanDescriptor) {
-                    if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
-                        continue 2;
-                    }
-                }
-                // Check that this property is not an inheritance relationship
-                $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-                if ($parentRelationship === $fk) {
-                    continue;
-                }
-
-                $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
-            } else {
-                $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
-            }
-        }
-
-        // Now, let's get the name of all properties and let's check there is no duplicate.
-        /** @var $names AbstractBeanPropertyDescriptor[] */
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                $names[$name]->useAlternativeName();
-                $beanDescriptor->useAlternativeName();
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Final check (throw exceptions if problem arises)
-        $names = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $name = $beanDescriptor->getUpperCamelCaseName();
-            if (isset($names[$name])) {
-                throw new TDBMException('Unsolvable name conflict while generating method name');
-            } else {
-                $names[$name] = $beanDescriptor;
-            }
-        }
-
-        // Last step, let's rebuild the list with a map:
-        $beanPropertyDescriptorsMap = [];
-        foreach ($beanPropertyDescriptors as $beanDescriptor) {
-            $beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
-        }
-
-        return $beanPropertyDescriptorsMap;
-    }
-
-    public function generateBeanConstructor()
-    {
-        $constructorProperties = $this->getConstructorProperties();
-
-        $constructorCode = '    /**
+	/**
+	 * @var Table
+	 */
+	private $table;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var AbstractBeanPropertyDescriptor[]
+	 */
+	private $beanPropertyDescriptors = [];
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	public function __construct(Table $table, SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
+	{
+		$this->table = $table;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->initBeanPropertyDescriptors();
+	}
+
+	private function initBeanPropertyDescriptors()
+	{
+		$this->beanPropertyDescriptors = $this->getProperties($this->table);
+	}
+
+	/**
+	 * Returns the foreign-key the column is part of, if any. null otherwise.
+	 *
+	 * @param Table  $table
+	 * @param Column $column
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	private function isPartOfForeignKey(Table $table, Column $column)
+	{
+		$localColumnName = $column->getName();
+		foreach ($table->getForeignKeys() as $foreignKey) {
+			foreach ($foreignKey->getColumns() as $columnName) {
+				if ($columnName === $localColumnName) {
+					return $foreignKey;
+				}
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getBeanPropertyDescriptors()
+	{
+		return $this->beanPropertyDescriptors;
+	}
+
+	/**
+	 * Returns the list of columns that are not nullable and not autogenerated for a given table and its parent.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getConstructorProperties()
+	{
+		$constructorProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->isCompulsory();
+		});
+
+		return $constructorProperties;
+	}
+
+	/**
+	 * Returns the list of columns that have default values for a given table.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getPropertiesWithDefault()
+	{
+		$properties = $this->getPropertiesForTable($this->table);
+		$defaultProperties = array_filter($properties, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->hasDefault();
+		});
+
+		return $defaultProperties;
+	}
+
+	/**
+	 * Returns the list of properties exposed as getters and setters in this class.
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	public function getExposedProperties()
+	{
+		$exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
+			return $property->getTable()->getName() == $this->table->getName();
+		});
+
+		return $exposedProperties;
+	}
+
+	/**
+	 * Returns the list of properties for this table (including parent tables).
+	 *
+	 * @param Table $table
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	private function getProperties(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$parentTable = $this->schema->getTable($parentRelationship->getForeignTableName());
+			$properties = $this->getProperties($parentTable);
+			// we merge properties by overriding property names.
+			$localProperties = $this->getPropertiesForTable($table);
+			foreach ($localProperties as $name => $property) {
+				// We do not override properties if this is a primary key!
+				if ($property->isPrimaryKey()) {
+					continue;
+				}
+				$properties[$name] = $property;
+			}
+		} else {
+			$properties = $this->getPropertiesForTable($table);
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Returns the list of properties for this table (ignoring parent tables).
+	 *
+	 * @param Table $table
+	 *
+	 * @return AbstractBeanPropertyDescriptor[]
+	 */
+	private function getPropertiesForTable(Table $table)
+	{
+		$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+		if ($parentRelationship) {
+			$ignoreColumns = $parentRelationship->getLocalColumns();
+		} else {
+			$ignoreColumns = [];
+		}
+
+		$beanPropertyDescriptors = [];
+
+		foreach ($table->getColumns() as $column) {
+			if (array_search($column->getName(), $ignoreColumns) !== false) {
+				continue;
+			}
+
+			$fk = $this->isPartOfForeignKey($table, $column);
+			if ($fk !== null) {
+				// Check that previously added descriptors are not added on same FK (can happen with multi key FK).
+				foreach ($beanPropertyDescriptors as $beanDescriptor) {
+					if ($beanDescriptor instanceof ObjectBeanPropertyDescriptor && $beanDescriptor->getForeignKey() === $fk) {
+						continue 2;
+					}
+				}
+				// Check that this property is not an inheritance relationship
+				$parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
+				if ($parentRelationship === $fk) {
+					continue;
+				}
+
+				$beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->schemaAnalyzer);
+			} else {
+				$beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column);
+			}
+		}
+
+		// Now, let's get the name of all properties and let's check there is no duplicate.
+		/** @var $names AbstractBeanPropertyDescriptor[] */
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				$names[$name]->useAlternativeName();
+				$beanDescriptor->useAlternativeName();
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Final check (throw exceptions if problem arises)
+		$names = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$name = $beanDescriptor->getUpperCamelCaseName();
+			if (isset($names[$name])) {
+				throw new TDBMException('Unsolvable name conflict while generating method name');
+			} else {
+				$names[$name] = $beanDescriptor;
+			}
+		}
+
+		// Last step, let's rebuild the list with a map:
+		$beanPropertyDescriptorsMap = [];
+		foreach ($beanPropertyDescriptors as $beanDescriptor) {
+			$beanPropertyDescriptorsMap[$beanDescriptor->getLowerCamelCaseName()] = $beanDescriptor;
+		}
+
+		return $beanPropertyDescriptorsMap;
+	}
+
+	public function generateBeanConstructor()
+	{
+		$constructorProperties = $this->getConstructorProperties();
+
+		$constructorCode = '    /**
      * The constructor takes all compulsory arguments.
      *
 %s
@@ -248,110 +248,110 @@ 
     }
     ';
 
-        $paramAnnotations = [];
-        $arguments = [];
-        $assigns = [];
-        $parentConstructorArguments = [];
-
-        foreach ($constructorProperties as $property) {
-            $className = $property->getClassName();
-            if ($className) {
-                $arguments[] = $className.' '.$property->getVariableName();
-            } else {
-                $arguments[] = $property->getVariableName();
-            }
-            $paramAnnotations[] = $property->getParamAnnotation();
-            if ($property->getTable()->getName() === $this->table->getName()) {
-                $assigns[] = $property->getConstructorAssignCode();
-            } else {
-                $parentConstructorArguments[] = $property->getVariableName();
-            }
-        }
-
-        $parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
-
-        foreach ($this->getPropertiesWithDefault() as $property) {
-            $assigns[] = $property->assignToDefaultCode();
-        }
-
-        return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode("\n", $assigns));
-    }
-
-    public function getDirectForeignKeysDescriptors()
-    {
-        $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
-
-        $descriptors = [];
-
-        foreach ($fks as $fk) {
-            $descriptors[] = new DirectForeignKeyMethodDescriptor($fk, $this->table);
-        }
-
-        return $descriptors;
-    }
-
-    private function getPivotTableDescriptors()
-    {
-        $descs = [];
-        foreach ($this->schemaAnalyzer->detectJunctionTables(true) as $table) {
-            // There are exactly 2 FKs since this is a pivot table.
-            $fks = array_values($table->getForeignKeys());
-
-            if ($fks[0]->getForeignTableName() === $this->table->getName()) {
-                list($localFk, $remoteFk) = $fks;
-            } elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
-                list($remoteFk, $localFk) = $fks;
-            } else {
-                continue;
-            }
-
-            $descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk);
-        }
-
-        return $descs;
-    }
-
-    /**
-     * Returns the list of method descriptors (and applies the alternative name if needed).
-     *
-     * @return MethodDescriptorInterface[]
-     */
-    private function getMethodDescriptors()
-    {
-        $directForeignKeyDescriptors = $this->getDirectForeignKeysDescriptors();
-        $pivotTableDescriptors = $this->getPivotTableDescriptors();
-
-        $descriptors = array_merge($directForeignKeyDescriptors, $pivotTableDescriptors);
-
-        // Descriptors by method names
-        $descriptorsByMethodName = [];
-
-        foreach ($descriptors as $descriptor) {
-            $descriptorsByMethodName[$descriptor->getName()][] = $descriptor;
-        }
-
-        foreach ($descriptorsByMethodName as $descriptorsForMethodName) {
-            if (count($descriptorsForMethodName) > 1) {
-                foreach ($descriptorsForMethodName as $descriptor) {
-                    $descriptor->useAlternativeName();
-                }
-            }
-        }
-
-        return $descriptors;
-    }
-
-    public function generateJsonSerialize()
-    {
-        $tableName = $this->table->getName();
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-        if ($parentFk !== null) {
-            $initializer = '$array = parent::jsonSerialize($stopRecursion);';
-        } else {
-            $initializer = '$array = [];';
-        }
-
-        $str = '
+		$paramAnnotations = [];
+		$arguments = [];
+		$assigns = [];
+		$parentConstructorArguments = [];
+
+		foreach ($constructorProperties as $property) {
+			$className = $property->getClassName();
+			if ($className) {
+				$arguments[] = $className.' '.$property->getVariableName();
+			} else {
+				$arguments[] = $property->getVariableName();
+			}
+			$paramAnnotations[] = $property->getParamAnnotation();
+			if ($property->getTable()->getName() === $this->table->getName()) {
+				$assigns[] = $property->getConstructorAssignCode();
+			} else {
+				$parentConstructorArguments[] = $property->getVariableName();
+			}
+		}
+
+		$parentConstructorCode = sprintf("        parent::__construct(%s);\n", implode(', ', $parentConstructorArguments));
+
+		foreach ($this->getPropertiesWithDefault() as $property) {
+			$assigns[] = $property->assignToDefaultCode();
+		}
+
+		return sprintf($constructorCode, implode("\n", $paramAnnotations), implode(', ', $arguments), $parentConstructorCode, implode("\n", $assigns));
+	}
+
+	public function getDirectForeignKeysDescriptors()
+	{
+		$fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($this->table->getName());
+
+		$descriptors = [];
+
+		foreach ($fks as $fk) {
+			$descriptors[] = new DirectForeignKeyMethodDescriptor($fk, $this->table);
+		}
+
+		return $descriptors;
+	}
+
+	private function getPivotTableDescriptors()
+	{
+		$descs = [];
+		foreach ($this->schemaAnalyzer->detectJunctionTables(true) as $table) {
+			// There are exactly 2 FKs since this is a pivot table.
+			$fks = array_values($table->getForeignKeys());
+
+			if ($fks[0]->getForeignTableName() === $this->table->getName()) {
+				list($localFk, $remoteFk) = $fks;
+			} elseif ($fks[1]->getForeignTableName() === $this->table->getName()) {
+				list($remoteFk, $localFk) = $fks;
+			} else {
+				continue;
+			}
+
+			$descs[] = new PivotTableMethodsDescriptor($table, $localFk, $remoteFk);
+		}
+
+		return $descs;
+	}
+
+	/**
+	 * Returns the list of method descriptors (and applies the alternative name if needed).
+	 *
+	 * @return MethodDescriptorInterface[]
+	 */
+	private function getMethodDescriptors()
+	{
+		$directForeignKeyDescriptors = $this->getDirectForeignKeysDescriptors();
+		$pivotTableDescriptors = $this->getPivotTableDescriptors();
+
+		$descriptors = array_merge($directForeignKeyDescriptors, $pivotTableDescriptors);
+
+		// Descriptors by method names
+		$descriptorsByMethodName = [];
+
+		foreach ($descriptors as $descriptor) {
+			$descriptorsByMethodName[$descriptor->getName()][] = $descriptor;
+		}
+
+		foreach ($descriptorsByMethodName as $descriptorsForMethodName) {
+			if (count($descriptorsForMethodName) > 1) {
+				foreach ($descriptorsForMethodName as $descriptor) {
+					$descriptor->useAlternativeName();
+				}
+			}
+		}
+
+		return $descriptors;
+	}
+
+	public function generateJsonSerialize()
+	{
+		$tableName = $this->table->getName();
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+		if ($parentFk !== null) {
+			$initializer = '$array = parent::jsonSerialize($stopRecursion);';
+		} else {
+			$initializer = '$array = [];';
+		}
+
+		$str = '
     /**
      * Serializes the object for JSON encoding.
      *
@@ -367,76 +367,76 @@ 
     }
 ';
 
-        $propertiesCode = '';
-        foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
-            $propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
-        }
-
-        // Many2many relationships
-        $methodsCode = '';
-        foreach ($this->getMethodDescriptors() as $methodDescriptor) {
-            $methodsCode .= $methodDescriptor->getJsonSerializeCode();
-        }
-
-        return sprintf($str, $initializer, $propertiesCode, $methodsCode);
-    }
-
-    /**
-     * Returns as an array the class we need to extend from and the list of use statements.
-     *
-     * @return array
-     */
-    private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null)
-    {
-        $classes = [];
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-            $classes[] = $extends;
-        }
-
-        foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
-            $className = $beanPropertyDescriptor->getClassName();
-            if (null !== $className) {
-                $classes[] = $beanPropertyDescriptor->getClassName();
-            }
-        }
-
-        foreach ($this->getMethodDescriptors() as $descriptor) {
-            $classes = array_merge($classes, $descriptor->getUsedClasses());
-        }
-
-        $classes = array_unique($classes);
-
-        return $classes;
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param string $beannamespace The namespace of the bean
-     */
-    public function generatePhpCode($beannamespace)
-    {
-        $tableName = $this->table->getName();
-        $baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($tableName);
-        $className = TDBMDaoGenerator::getBeanNameFromTableName($tableName);
-        $parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
-
-        $classes = $this->generateExtendsAndUseStatements($parentFk);
-
-        $uses = array_map(function ($className) use ($beannamespace) {
-            return 'use '.$beannamespace.'\\'.$className.";\n";
-        }, $classes);
-        $use = implode('', $uses);
-
-        if ($parentFk !== null) {
-            $extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
-        } else {
-            $extends = 'AbstractTDBMObject';
-            $use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
-        }
-
-        $str = "<?php
+		$propertiesCode = '';
+		foreach ($this->beanPropertyDescriptors as $beanPropertyDescriptor) {
+			$propertiesCode .= $beanPropertyDescriptor->getJsonSerializeCode();
+		}
+
+		// Many2many relationships
+		$methodsCode = '';
+		foreach ($this->getMethodDescriptors() as $methodDescriptor) {
+			$methodsCode .= $methodDescriptor->getJsonSerializeCode();
+		}
+
+		return sprintf($str, $initializer, $propertiesCode, $methodsCode);
+	}
+
+	/**
+	 * Returns as an array the class we need to extend from and the list of use statements.
+	 *
+	 * @return array
+	 */
+	private function generateExtendsAndUseStatements(ForeignKeyConstraint $parentFk = null)
+	{
+		$classes = [];
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+			$classes[] = $extends;
+		}
+
+		foreach ($this->getBeanPropertyDescriptors() as $beanPropertyDescriptor) {
+			$className = $beanPropertyDescriptor->getClassName();
+			if (null !== $className) {
+				$classes[] = $beanPropertyDescriptor->getClassName();
+			}
+		}
+
+		foreach ($this->getMethodDescriptors() as $descriptor) {
+			$classes = array_merge($classes, $descriptor->getUsedClasses());
+		}
+
+		$classes = array_unique($classes);
+
+		return $classes;
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param string $beannamespace The namespace of the bean
+	 */
+	public function generatePhpCode($beannamespace)
+	{
+		$tableName = $this->table->getName();
+		$baseClassName = TDBMDaoGenerator::getBaseBeanNameFromTableName($tableName);
+		$className = TDBMDaoGenerator::getBeanNameFromTableName($tableName);
+		$parentFk = $this->schemaAnalyzer->getParentRelationship($tableName);
+
+		$classes = $this->generateExtendsAndUseStatements($parentFk);
+
+		$uses = array_map(function ($className) use ($beannamespace) {
+			return 'use '.$beannamespace.'\\'.$className.";\n";
+		}, $classes);
+		$use = implode('', $uses);
+
+		if ($parentFk !== null) {
+			$extends = TDBMDaoGenerator::getBeanNameFromTableName($parentFk->getForeignTableName());
+		} else {
+			$extends = 'AbstractTDBMObject';
+			$use .= "use Mouf\\Database\\TDBM\\AbstractTDBMObject;\n";
+		}
+
+		$str = "<?php
 namespace {$beannamespace}\\Generated;
 
 use Mouf\\Database\\TDBM\\ResultIterator;
@@ -456,129 +456,129 @@ 
 {
 ";
 
-        $str .= $this->generateBeanConstructor();
+		$str .= $this->generateBeanConstructor();
 
-        foreach ($this->getExposedProperties() as $property) {
-            $str .= $property->getGetterSetterCode();
-        }
+		foreach ($this->getExposedProperties() as $property) {
+			$str .= $property->getGetterSetterCode();
+		}
 
-        foreach ($this->getMethodDescriptors() as $methodDescriptor) {
-            $str .= $methodDescriptor->getCode();
-        }
-        $str .= $this->generateJsonSerialize();
+		foreach ($this->getMethodDescriptors() as $methodDescriptor) {
+			$str .= $methodDescriptor->getCode();
+		}
+		$str .= $this->generateJsonSerialize();
 
-        $str .= $this->generateGetUsedTablesCode();
+		$str .= $this->generateGetUsedTablesCode();
 
-        $str .= $this->generateOnDeleteCode();
+		$str .= $this->generateOnDeleteCode();
 
-        $str .= '}
+		$str .= '}
 ';
 
-        return $str;
-    }
-
-    /**
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    public function generateFindByDaoCode($beanNamespace, $beanClassName)
-    {
-        $code = '';
-        $usedBeans = [];
-        foreach ($this->table->getIndexes() as $index) {
-            if (!$index->isPrimary()) {
-                list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
-                $code .= $codeForIndex;
-                $usedBeans = array_merge($usedBeans, $usedBeansForIndex);
-            }
-        }
-
-        return [$usedBeans, $code];
-    }
-
-    /**
-     * @param Index  $index
-     * @param string $beanNamespace
-     * @param string $beanClassName
-     *
-     * @return array first element: list of used beans, second item: PHP code as a string
-     */
-    private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
-    {
-        $columns = $index->getColumns();
-        $usedBeans = [];
-
-        /*
+		return $str;
+	}
+
+	/**
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	public function generateFindByDaoCode($beanNamespace, $beanClassName)
+	{
+		$code = '';
+		$usedBeans = [];
+		foreach ($this->table->getIndexes() as $index) {
+			if (!$index->isPrimary()) {
+				list($usedBeansForIndex, $codeForIndex) = $this->generateFindByDaoCodeForIndex($index, $beanNamespace, $beanClassName);
+				$code .= $codeForIndex;
+				$usedBeans = array_merge($usedBeans, $usedBeansForIndex);
+			}
+		}
+
+		return [$usedBeans, $code];
+	}
+
+	/**
+	 * @param Index  $index
+	 * @param string $beanNamespace
+	 * @param string $beanClassName
+	 *
+	 * @return array first element: list of used beans, second item: PHP code as a string
+	 */
+	private function generateFindByDaoCodeForIndex(Index $index, $beanNamespace, $beanClassName)
+	{
+		$columns = $index->getColumns();
+		$usedBeans = [];
+
+		/*
          * The list of elements building this index (expressed as columns or foreign keys)
          * @var AbstractBeanPropertyDescriptor[]
          */
-        $elements = [];
-
-        foreach ($columns as $column) {
-            $fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
-            if ($fk !== null) {
-                if (!in_array($fk, $elements)) {
-                    $elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer);
-                }
-            } else {
-                $elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column));
-            }
-        }
-
-        // If the index is actually only a foreign key, let's bypass it entirely.
-        if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
-            return [[], ''];
-        }
-
-        $methodNameComponent = [];
-        $functionParameters = [];
-        $first = true;
-        foreach ($elements as $element) {
-            $methodNameComponent[] = $element->getUpperCamelCaseName();
-            $functionParameter = $element->getClassName();
-            if ($functionParameter) {
-                $usedBeans[] = $beanNamespace.'\\'.$functionParameter;
-                $functionParameter .= ' ';
-            }
-            $functionParameter .= $element->getVariableName();
-            if ($first) {
-                $first = false;
-            } else {
-                $functionParameter .= ' = null';
-            }
-            $functionParameters[] = $functionParameter;
-        }
-        if ($index->isUnique()) {
-            $methodName = 'findOneBy'.implode('And', $methodNameComponent);
-            $calledMethod = 'findOne';
-            $returnType = "{$beanClassName}";
-        } else {
-            $methodName = 'findBy'.implode('And', $methodNameComponent);
-            $returnType = "{$beanClassName}[]|ResultIterator|ResultArray";
-            $calledMethod = 'find';
-        }
-        $functionParametersString = implode(', ', $functionParameters);
-
-        $count = 0;
-
-        $params = [];
-        $filterArrayCode = '';
-        $commentArguments = [];
-        foreach ($elements as $element) {
-            $params[] = $element->getParamAnnotation();
-            if ($element instanceof ScalarBeanPropertyDescriptor) {
-                $filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
-            } else {
-                ++$count;
-                $filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
-            }
-            $commentArguments[] = substr($element->getVariableName(), 1);
-        }
-        $paramsString = implode("\n", $params);
-
-        $code = "
+		$elements = [];
+
+		foreach ($columns as $column) {
+			$fk = $this->isPartOfForeignKey($this->table, $this->table->getColumn($column));
+			if ($fk !== null) {
+				if (!in_array($fk, $elements)) {
+					$elements[] = new ObjectBeanPropertyDescriptor($this->table, $fk, $this->schemaAnalyzer);
+				}
+			} else {
+				$elements[] = new ScalarBeanPropertyDescriptor($this->table, $this->table->getColumn($column));
+			}
+		}
+
+		// If the index is actually only a foreign key, let's bypass it entirely.
+		if (count($elements) === 1 && $elements[0] instanceof ObjectBeanPropertyDescriptor) {
+			return [[], ''];
+		}
+
+		$methodNameComponent = [];
+		$functionParameters = [];
+		$first = true;
+		foreach ($elements as $element) {
+			$methodNameComponent[] = $element->getUpperCamelCaseName();
+			$functionParameter = $element->getClassName();
+			if ($functionParameter) {
+				$usedBeans[] = $beanNamespace.'\\'.$functionParameter;
+				$functionParameter .= ' ';
+			}
+			$functionParameter .= $element->getVariableName();
+			if ($first) {
+				$first = false;
+			} else {
+				$functionParameter .= ' = null';
+			}
+			$functionParameters[] = $functionParameter;
+		}
+		if ($index->isUnique()) {
+			$methodName = 'findOneBy'.implode('And', $methodNameComponent);
+			$calledMethod = 'findOne';
+			$returnType = "{$beanClassName}";
+		} else {
+			$methodName = 'findBy'.implode('And', $methodNameComponent);
+			$returnType = "{$beanClassName}[]|ResultIterator|ResultArray";
+			$calledMethod = 'find';
+		}
+		$functionParametersString = implode(', ', $functionParameters);
+
+		$count = 0;
+
+		$params = [];
+		$filterArrayCode = '';
+		$commentArguments = [];
+		foreach ($elements as $element) {
+			$params[] = $element->getParamAnnotation();
+			if ($element instanceof ScalarBeanPropertyDescriptor) {
+				$filterArrayCode .= '            '.var_export($element->getColumnName(), true).' => '.$element->getVariableName().",\n";
+			} else {
+				++$count;
+				$filterArrayCode .= '            '.$count.' => '.$element->getVariableName().",\n";
+			}
+			$commentArguments[] = substr($element->getVariableName(), 1);
+		}
+		$paramsString = implode("\n", $params);
+
+		$code = "
     /**
      * Get a list of $beanClassName filtered by ".implode(', ', $commentArguments).".
      *
@@ -596,27 +596,27 @@ 
     }
 ";
 
-        return [$usedBeans, $code];
-    }
-
-    /**
-     * Generates the code for the getUsedTable protected method.
-     *
-     * @return string
-     */
-    private function generateGetUsedTablesCode()
-    {
-        $hasParentRelationship = $this->schemaAnalyzer->getParentRelationship($this->table->getName()) !== null;
-        if ($hasParentRelationship) {
-            $code = sprintf('        $tables = parent::getUsedTables();
+		return [$usedBeans, $code];
+	}
+
+	/**
+	 * Generates the code for the getUsedTable protected method.
+	 *
+	 * @return string
+	 */
+	private function generateGetUsedTablesCode()
+	{
+		$hasParentRelationship = $this->schemaAnalyzer->getParentRelationship($this->table->getName()) !== null;
+		if ($hasParentRelationship) {
+			$code = sprintf('        $tables = parent::getUsedTables();
         $tables[] = %s;
         
         return $tables;', var_export($this->table->getName(), true));
-        } else {
-            $code = sprintf('        return [ %s ];', var_export($this->table->getName(), true));
-        }
+		} else {
+			$code = sprintf('        return [ %s ];', var_export($this->table->getName(), true));
+		}
 
-        return sprintf('
+		return sprintf('
     /**
      * Returns an array of used tables by this bean (from parent to child relationship).
      *
@@ -627,20 +627,20 @@ 
 %s    
     }
 ', $code);
-    }
-
-    private function generateOnDeleteCode()
-    {
-        $code = '';
-        $relationships = $this->getPropertiesForTable($this->table);
-        foreach ($relationships as $relationship) {
-            if ($relationship instanceof ObjectBeanPropertyDescriptor) {
-                $code .= sprintf('        $this->setRef('.var_export($relationship->getForeignKey()->getName(), true).', null, '.var_export($this->table->getName(), true).");\n");
-            }
-        }
-
-        if ($code) {
-            return sprintf('
+	}
+
+	private function generateOnDeleteCode()
+	{
+		$code = '';
+		$relationships = $this->getPropertiesForTable($this->table);
+		foreach ($relationships as $relationship) {
+			if ($relationship instanceof ObjectBeanPropertyDescriptor) {
+				$code .= sprintf('        $this->setRef('.var_export($relationship->getForeignKey()->getName(), true).', null, '.var_export($this->table->getName(), true).");\n");
+			}
+		}
+
+		if ($code) {
+			return sprintf('
     /**
      * Method called when the bean is removed from database.
      *
@@ -651,8 +651,8 @@ 
 %s
     }
 ', $code);
-        }
+		}
 
-        return '';
-    }
+		return '';
+	}
 }