projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix recovery of postgres connection
[brisk.git]
/
web
/
Obj
/
dbase_pgsql.phh
diff --git
a/web/Obj/dbase_pgsql.phh
b/web/Obj/dbase_pgsql.phh
index
5c187aa
..
7cd0c4b
100644
(file)
--- a/
web/Obj/dbase_pgsql.phh
+++ b/
web/Obj/dbase_pgsql.phh
@@
-25,7
+25,7
@@
require_once("${G_base}Obj/dbase_base.phh");
$escsql_from = array( "\\", "'" );
require_once("${G_base}Obj/dbase_base.phh");
$escsql_from = array( "\\", "'" );
-$escsql_to = array( "\\\\", "
\\
'" );
+$escsql_to = array( "\\\\", "
'
'" );
function escsql($s)
{
function escsql($s)
{
@@
-62,8
+62,9
@@
class DBConn
static function destroy()
{
if (DBConn::$dbcnnx != FALSE) {
static function destroy()
{
if (DBConn::$dbcnnx != FALSE) {
+ $ret = pg_close(DBConn::$dbcnnx);
DBConn::$dbcnnx = FALSE;
DBConn::$dbcnnx = FALSE;
- return (
pg_close(DBConn::$dbcnnx)
);
+ return (
$ret
);
}
return TRUE;
}
}
return TRUE;
}
@@
-112,11
+113,13
@@
class BriskDB
function query($sql)
{
function query($sql)
{
- if (($res = pg_query($this->dbconn->db(), $sql)) == FALSE) {
+ if (($res = @pg_query($this->dbconn->db(), $sql)) == FALSE) {
+ error_log('pg_result_status: ' . pg_result_status($res));
+ error_log('pg_connection_status: ' . pg_connection_status($this->dbconn->db()));
// try to recover the connection
if (($this->dbconn = DBConn::recover()) == FALSE)
return FALSE;
// try to recover the connection
if (($this->dbconn = DBConn::recover()) == FALSE)
return FALSE;
- return (pg_query($this->dbconn->db(), $sql));
+ return (
@
pg_query($this->dbconn->db(), $sql));
}
return ($res);
}
return ($res);
@@
-138,7
+141,7
@@
class BriskDB
/* check the existence of the nick in the BriskDB */
log_main("login_exists: ".$login);
/* check the existence of the nick in the BriskDB */
log_main("login_exists: ".$login);
- $user_sql = sprintf("SELECT * FROM %susers WHERE login =
lower('%s')
",
+ $user_sql = sprintf("SELECT * FROM %susers WHERE login =
'%s'
",
$G_dbpfx, escsql($login));
if (($user_pg = $this->query($user_sql)) != FALSE)
if (pg_numrows($user_pg) == 1)
$G_dbpfx, escsql($login));
if (($user_pg = $this->query($user_sql)) != FALSE)
if (pg_numrows($user_pg) == 1)