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

dblayeroo : valid the select without the table name. Regression introduced last commit

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3496 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2017-04-04 17:31:05 +00:00
parent 15d70bd3a9
commit 0172aad420
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dblayeroo.php
View File

@@ -1599,7 +1599,9 @@ class dblayeroo
if (isset ($this->fieldsTmp)) if (isset ($this->fieldsTmp))
$displayColumns = implode (",", array_keys ($this->fieldsTmp)); $displayColumns = implode (",", array_keys ($this->fieldsTmp));
else else
$displayColumns = "*"; $displayColumns = $this->sep.
implode ($this->sep.",".$this->sep, array_keys ($this->fields)).
$this->sep;
} }
$sql .= " $displayColumns FROM $this->sep$this->tableprefix". $sql .= " $displayColumns FROM $this->sep$this->tableprefix".
"$this->table$this->sep"; "$this->table$this->sep";
@@ -1957,7 +1959,7 @@ class dblayeroo
// overwrite with the same value) // overwrite with the same value)
// If it is not the same, produce an error // If it is not the same, produce an error
$objTmp->whereAdd ($this->primary, "!=", $objTmp->whereAdd ($this->primary, "!=",
$resUpdate[0][$this->primary]); $resUpdate[0][$this->table.".".$this->primary]);
} }
if (count ($errors) == 0 && count ($objTmp->execute ())) if (count ($errors) == 0 && count ($objTmp->execute ()))
$this->DBException (dgettext ("domframework", $this->DBException (dgettext ("domframework",
@@ -2043,6 +2045,8 @@ class dblayeroo
// the filled value) // the filled value)
if (isset ($this->fieldsTmp)) if (isset ($this->fieldsTmp))
$columns = array_keys ($this->fieldsTmp); $columns = array_keys ($this->fieldsTmp);
elseif (count ($this->displayColumn))
$columns = $this->displayColumn;
else else
$columns = array_keys ($this->fields); $columns = array_keys ($this->fields);
foreach ($result as $rownb=>$row) foreach ($result as $rownb=>$row)
@@ -2056,9 +2060,17 @@ class dblayeroo
"integer") "integer")
$val = intval ($val); $val = intval ($val);
} }
elseif (isset ($this->fields)) elseif (count ($this->displayColumn))
{ {
if (strtolower ($this->fields[$columns[$colNb]][0]) === "integer") $fieldWithoutTable = substr ($columns[$colNb],
strlen ($this->sep.$this->table.$this->sep.".".$this->sep), -1);
if (strtolower ($this->fields[$fieldWithoutTable][0]) === "integer")
$val = intval ($val);
}
else
{
if (strtolower ($this->fields[$columns[$colNb]][0]) ===
"integer")
$val = intval ($val); $val = intval ($val);
} }
$colName = str_replace ($this->sep, "", $columns[$colNb]); $colName = str_replace ($this->sep, "", $columns[$colNb]);