[Beeframework-svn] SF.net SVN: beeframework:[293] trunk/framework/Bee/Persistence

[<m_p...@us...>]

Revision: 293
          http://sourceforge.net/p/beeframework/code/293
Author:   m_plomer
Date:     2015-02-27 21:01:00 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
Persistence:
- IRestrictionHolder: fixed wrong phpdoc type info
- GenericDaoBase: added path expression resolution to addValueRestriction()

Modified Paths:
--------------
    trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php
    trunk/framework/Bee/Persistence/IRestrictionHolder.php

Modified: trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php	2015-02-27 18:23:53 UTC (rev 292)
+++ trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php	2015-02-27 21:01:00 UTC (rev 293)
@@ -297,12 +297,11 @@
      * @param QueryBuilder $queryBuilder
      * @param $filters
      * @param string $fldName
-     * @param string $baseAlias
      */
-    protected function addValueRestriction(QueryBuilder $queryBuilder, $filters, $fldName = 'gender', $baseAlias = 'e') {
+    protected function addValueRestriction(QueryBuilder $queryBuilder, $filters, $fldName) {
         if (array_key_exists($fldName, $filters) && $value = $filters[$fldName]) {
-            $queryBuilder->andWhere($baseAlias . '.' . $fldName . ' = :val')->setParameter('val', $value);
-            $this->addAlias($queryBuilder, $baseAlias);
+            $fldName = $this->transformAndAddAliasForPathExpression($queryBuilder, $fldName);
+            $queryBuilder->andWhere($fldName . ' = :val')->setParameter('val', $value);
         }
     }
 

Modified: trunk/framework/Bee/Persistence/IRestrictionHolder.php
===================================================================
--- trunk/framework/Bee/Persistence/IRestrictionHolder.php	2015-02-27 18:23:53 UTC (rev 292)
+++ trunk/framework/Bee/Persistence/IRestrictionHolder.php	2015-02-27 21:01:00 UTC (rev 293)
@@ -28,7 +28,7 @@
     public function getFilterableFields();
 
     /**
-     * @return array
+     * @return string
      */
     public function getFilterString();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.