diff options
Diffstat (limited to 'it_dbi_postgres.class')
| -rw-r--r-- | it_dbi_postgres.class | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/it_dbi_postgres.class b/it_dbi_postgres.class index 73c76f2..ac9c4ae 100644 --- a/it_dbi_postgres.class +++ b/it_dbi_postgres.class @@ -109,6 +109,31 @@ function _connect_db($p) { return [$result, $result ? '' : 'Could not connect']; } +function __query($query, $p) +{ + if ($p['timeout'] || $this->_p['cancelable_queries']) + { + $starttime = microtime(true); + pg_send_query($this->_link, $query); + while (pg_connection_busy($this->_link)) { + if ($p['timeout'] && (microtime(true) - $starttime) > $p['timeout']) + return false; + $read = $error = [pg_socket($this->_link)]; + socket_select($read, [], $error, 1, 0); + } + + while ($newresult = @pg_get_result($this->_link)) + $result = $newresult; + if ($result && pg_result_error($result)) + $result = false; + return $result; + } + else + { + return @pg_query($this->_link, $query); + } +} + function _query($query, $p) { if ($this->_p['keyfield'] && it::match('^INSERT ', $query)) @@ -117,7 +142,7 @@ function _query($query, $p) $query .= ' RETURNING ' . $this->_escape_name($this->_p['keyfield']); } - if (!($result = @pg_query($this->_link, $query)) && $p['safety']) + if (!($result = $this->__query($query, $p)) && $p['safety']) { if (($p['safety'] < 2) && it::match('duplicate key value', pg_last_error($this->_link))) # Duplicate entry return null; @@ -127,7 +152,7 @@ function _query($query, $p) { it::log('sqllog', "it_dbi(): reconnecting mysqli_connect {$p['server']}, {$p['db']}"); $this->_connect(array('reconnect' => true)); - $result = mysqli_query($this->_link, $query, $p['unbuffered'] ? MYSQLI_USE_RESULT : MYSQLI_STORE_RESULT); + $result = $this->__query($query, $p); } */ } |