Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

dblayeroo : CONCAT must use the local entries if provided

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5165 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2019-03-22 13:44:22 +00:00
parent 07c95a1b3e
commit 26563260ad
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dblayeroo.php
View File

@@ -4,7 +4,7 @@
* @author Dominique Fournier <dominique@fournier38.fr> * @author Dominique Fournier <dominique@fournier38.fr>
*/ */
require_once ("domframework/dblayeroo.php"); namespace vendor\domframework;
// dblayeroo.php // dblayeroo.php
@@ -2079,16 +2079,17 @@ class dblayeroo
$newJoinArray = array (); $newJoinArray = array ();
foreach ($joinArray as $fieldLocal=>$fieldToJoin) foreach ($joinArray as $fieldLocal=>$fieldToJoin)
{ {
if (substr ($fieldToJoin, 0, 7) === "CONCAT(") if (substr ($fieldLocal, 0, 7) === "CONCAT(")
$fieldLocal = $this->concat ($fieldToJoin, $object); $fieldLocal = $this->concat ($fieldLocal, $this);
elseif (array_key_exists ($fieldToJoin, $object->fields)) elseif (array_key_exists ($fieldLocal, $this->fields))
$fieldLocal = $fieldLocal =
$this->sep.$object->tableprefix.$object->table.$this->sep.".". $this->sep.$this->tableprefix.$this->table.$this->sep.".".
$this->sep.$fieldToJoin.$this->sep; $this->sep.$fieldLocal.$this->sep;
else else
$this->DBException (sprintf ( $this->DBException (sprintf (
"Invalid field to join '%s' : not defined in Local table", "Invalid field to join '%s' : not defined in Local table",
$fieldLocal)); $fieldLocal));
if (substr ($fieldToJoin, 0, 7) === "CONCAT(") if (substr ($fieldToJoin, 0, 7) === "CONCAT(")
$fieldToJoin = $this->concat ($fieldToJoin, $object); $fieldToJoin = $this->concat ($fieldToJoin, $object);
elseif (array_key_exists ($fieldToJoin, $object->fields)) elseif (array_key_exists ($fieldToJoin, $object->fields))