CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix in class db io returning on insert

Browse Source 
Skip add RETURNING on auto set if 'NULL' is set as a primary key.
On return, also run if count of returned ids is > 0 (so it actually runs
the extended return flow)
This commit is contained in:
Clemens Schwaighofer
2017-11-02 17:04:43 +09:00
parent 93f2cf9b73
commit ff94efee8d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/libs/Class.DB.IO.inc
View File

@@ -663,12 +663,12 @@
} }
$this->pk_name = $this->pk_name_table[$table] ? $this->pk_name_table[$table] : 'NULL'; $this->pk_name = $this->pk_name_table[$table] ? $this->pk_name_table[$table] : 'NULL';
} }
if (!preg_match("/ returning /i", $this->query) && $this->pk_name) if (!preg_match("/ returning /i", $this->query) && $this->pk_name && $this->pk_name != 'NULL')
{ {
$this->query .= " RETURNING ".$this->pk_name; $this->query .= " RETURNING ".$this->pk_name;
$this->returning_id = true; $this->returning_id = true;
} }
elseif (preg_match("/ returning (.*)/i", $this->query, $matches) && $this->pk_name) elseif (preg_match("/ returning (.*)/i", $this->query, $matches) && $this->pk_name && $this->pk_name != 'NULL')
{ {
// add the primary key if it is not in the returning set // add the primary key if it is not in the returning set
if (!preg_match("/$this->pk_name/", $matches[1])) if (!preg_match("/$this->pk_name/", $matches[1]))
@@ -763,7 +763,7 @@
$this->insert_id[] = $_insert_id; $this->insert_id[] = $_insert_id;
} }
// if we have only one, revert from array to single // if we have only one, revert from array to single
if (count($this->insert_id) == 1) if (count($this->insert_id) >= 1)
{ {
// echo "* SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->pk_name, $this->insert_id[0])."<br>"; // echo "* SINGLE DATA CONVERT: ".count($this->insert_id[0])." => ".array_key_exists($this->pk_name, $this->insert_id[0])."<br>";
// echo "* PK DIRECT: ".$this->insert_id[0][$this->pk_name]."<Br>"; // echo "* PK DIRECT: ".$this->insert_id[0][$this->pk_name]."<Br>";