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

Update DB IO to skip returning on prepare statements

Browse Source 
Same as normal exec if pk name is set to NULL
This commit is contained in:
Clemens Schwaighofer
2017-04-03 17:38:33 +09:00
parent 581518963b
commit 5c53621f96
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1391,34 +1391,37 @@
// if this is an insert query, check if we can add a return // if this is an insert query, check if we can add a return
if ($this->_check_query_for_insert($query, true)) if ($this->_check_query_for_insert($query, true))
{ {
// set primary key name if ($pk_name != 'NULL')
// current: only via parameter
if (!$pk_name)
{ {
// read the primary key from the table, if we do not have one, we get nothing in return // set primary key name
list($schema, $table) = $this->_db_return_table($query); // current: only via parameter
if (!$this->pk_name_table[$table]) if (!$pk_name)
{ {
$this->pk_name_table[$table] = $this->db_functions->_db_primary_key($table, $schema); // read the primary key from the table, if we do not have one, we get nothing in return
list($schema, $table) = $this->_db_return_table($query);
if (!$this->pk_name_table[$table])
{
$this->pk_name_table[$table] = $this->db_functions->_db_primary_key($table, $schema);
}
$pk_name = $this->pk_name_table[$table];
} }
$pk_name = $this->pk_name_table[$table]; if ($pk_name)
} $this->prepare_cursor[$stm_name]['pk_name'] = $pk_name;
if ($pk_name) // if no returning, then add it
$this->prepare_cursor[$stm_name]['pk_name'] = $pk_name; if (!preg_match("/ returning /i", $query) && $this->prepare_cursor[$stm_name]['pk_name'])
// if no returning, then add it
if (!preg_match("/ returning /i", $query) && $this->prepare_cursor[$stm_name]['pk_name'])
{
$query .= " RETURNING ".$this->prepare_cursor[$stm_name]['pk_name'];
$this->prepare_cursor[$stm_name]['returning_id'] = true;
}
// if returning exists but not pk_name, add it
else if (preg_match("/ returning (.*)/i", $query, $matches) && $this->prepare_cursor[$stm_name]['pk_name'])
{
if (!preg_match("/{$this->prepare_cursor[$stm_name]['pk_name']}/", $matches[1]))
{ {
$query .= " , ".$this->prepare_cursor[$stm_name]['pk_name']; $query .= " RETURNING ".$this->prepare_cursor[$stm_name]['pk_name'];
$this->prepare_cursor[$stm_name]['returning_id'] = true;
}
// if returning exists but not pk_name, add it
else if (preg_match("/ returning (.*)/i", $query, $matches) && $this->prepare_cursor[$stm_name]['pk_name'])
{
if (!preg_match("/{$this->prepare_cursor[$stm_name]['pk_name']}/", $matches[1]))
{
$query .= " , ".$this->prepare_cursor[$stm_name]['pk_name'];
}
$this->prepare_cursor[$stm_name]['returning_id'] = true;
} }
$this->prepare_cursor[$stm_name]['returning_id'] = true;
} }
} }
// search for $1, $2, in the query and push it into the control array // search for $1, $2, in the query and push it into the control array
@@ -1484,7 +1487,7 @@ $this->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[
$this->_db_error($this->prepare_cursor[$stm_name]['result']); $this->_db_error($this->prepare_cursor[$stm_name]['result']);
$this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Execution failed</span>', 'DB_ERROR'); $this->_db_debug('db', '<span style="color: red;"><b>DB-Error</b> '.$stm_name.': Execution failed</span>', 'DB_ERROR');
} }
if ($this->_check_query_for_insert($this->prepare_cursor[$stm_name]['query'], true)) if ($this->_check_query_for_insert($this->prepare_cursor[$stm_name]['query'], true) && $this->prepare_cursor[$stm_name]['pk_name'] != 'NULL')
{ {
if (!$this->prepare_cursor[$stm_name]['returning_id']) if (!$this->prepare_cursor[$stm_name]['returning_id'])
{ {
@@ -1493,6 +1496,7 @@ $this->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[
elseif ($code) elseif ($code)
{ {
$this->insert_id = array (); $this->insert_id = array ();
$this->insert_id_ext = array ();
// we have returning, now we need to check if we get one or many returned // we have returning, now we need to check if we get one or many returned
// we'll need to loop this, if we have multiple insert_id returns // we'll need to loop this, if we have multiple insert_id returns
while ($_insert_id = $this->db_functions->_db_fetch_array($code, PGSQL_ASSOC)) while ($_insert_id = $this->db_functions->_db_fetch_array($code, PGSQL_ASSOC))
@@ -1518,12 +1522,12 @@ $this->debug('ExecuteData', 'ERROR in STM['.$stm_name.'|'.$this->prepare_cursor[
} }
} }
else else
{ {
// failed to get insert id // failed to get insert id
$this->insert_id = ''; $this->insert_id = '';
$this->warning_id = 33; $this->warning_id = 33;
$this->_db_error('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id returned no data</span>', 'DB_WARNING'); $this->_db_error('db', '<span style="color: orange;"><b>DB-Warning</b> '.$stm_name.': insert id returned no data</span>', 'DB_WARNING');
} }
} }
// this error handling is only for pgsql // this error handling is only for pgsql
if (is_array($this->insert_id)) if (is_array($this->insert_id))