makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for bug #497093 + other updates

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1764 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-01-01 14:35:33 +00:00
parent 189ff7d6b2
commit 9a3e0cd3c6
1 changed files with 115 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

195
phpBB/db/postgres7.php
View file

@ -39,16 +39,18 @@ class sql_db
// //
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true) function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{ {
$this->connect_string = ""; $this->connect_string = "";
if( $sqluser ) if( $sqluser )
{ {
$this->connect_string .= "user=$sqluser "; $this->connect_string .= "user=$sqluser ";
} }
if( $sqlpassword ) if( $sqlpassword )
{ {
$this->connect_string .= "password=$sqlpassword "; $this->connect_string .= "password=$sqlpassword ";
} }
if( $sqlserver ) if( $sqlserver )
{ {
if( ereg(":", $sqlserver) ) if( ereg(":", $sqlserver) )
@ -64,35 +66,20 @@ class sql_db
} }
} }
} }
if( $database ) if( $database )
{ {
$this->dbname = $database; $this->dbname = $database;
$make_connect = $this->connect_string . "dbname=$database"; $this->connect_string .= "dbname=$database";
}
else
{
$make_connect = $this->connect_string;
} }
$this->persistency = $persistency; $this->persistency = $persistency;
if($this->persistency)
{ $this->db_connect_id = ( $this->persistency ) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string);
$this->db_connect_id = @pg_pconnect($make_connect);
} return ( $this->db_connect_id ) ? $this->db_connect_id : false;
else
{
$this->db_connect_id = @pg_connect($make_connect);
} }
if($this->db_connect_id)
{
return $this->db_connect_id;
}
else
{
return false;
}
}
// //
// Other base methods // Other base methods
// //
@ -112,8 +99,8 @@ class sql_db
{ {
@pg_freeresult($this->query_result); @pg_freeresult($this->query_result);
} }
$result = @pg_close($this->db_connect_id);
return $result; return @pg_close($this->db_connect_id);
} }
else else
{ {
@ -125,9 +112,11 @@ class sql_db
// //
// Query method // Query method
// //
function sql_query($query = "", $transaction = FALSE) function sql_query($query = "", $transaction = false)
{ {
//
// Remove any pre-existing queries // Remove any pre-existing queries
//
unset($this->query_result); unset($this->query_result);
if( $query != "" ) if( $query != "" )
{ {
@ -194,6 +183,7 @@ class sql_db
return false; return false;
} }
} }
// //
// Other query methods // Other query methods
// //
@ -203,110 +193,68 @@ class sql_db
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id)
{ return ( $query_id ) ? @pg_numrows($query_id) : false;
$result = @pg_numrows($query_id);
return $result;
}
else
{
return false;
}
}
function sql_affectedrows($query_id = 0)
{
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @pg_cmdtuples($query_id);
return $result;
}
else
{
return false;
}
} }
function sql_numfields($query_id = 0) function sql_numfields($query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id)
{ return ( $query_id ) ? @pg_numfields($query_id) : false;
$result = @pg_numfields($query_id);
return $result;
}
else
{
return false;
}
} }
function sql_fieldname($offset, $query_id = 0) function sql_fieldname($offset, $query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id)
{ return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false;
$result = @pg_fieldname($query_id, $offset);
return $result;
}
else
{
return false;
}
} }
function sql_fieldtype($offset, $query_id = 0) function sql_fieldtype($offset, $query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id)
{ return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false;
$result = @pg_fieldtype($query_id, $offset);
return $result;
}
else
{
return false;
}
} }
function sql_fetchrow($query_id = 0) function sql_fetchrow($query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id) if($query_id)
{ {
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]); $this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);
if( $this->row ) if( $this->row )
{ {
$this->rownum[$query_id]++; $this->rownum[$query_id]++;
return $this->row; return $this->row;
} }
else }
{
return false; return false;
} }
}
else
{
return false;
}
}
function sql_fetchrowset($query_id = 0) function sql_fetchrowset($query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if( $query_id ) if( $query_id )
{ {
unset($this->rowset[$query_id]); unset($this->rowset[$query_id]);
@ -318,19 +266,20 @@ class sql_db
$result[] = $this->rowset; $result[] = $this->rowset;
$this->rownum[$query_id]++; $this->rownum[$query_id]++;
} }
return $result; return $result;
} }
else
{
return false; return false;
} }
}
function sql_fetchfield($field, $row_offset=-1, $query_id = 0) function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
{ {
if( !$query_id ) if( !$query_id )
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if( $query_id ) if( $query_id )
{ {
if( $row_offset != -1 ) if( $row_offset != -1 )
@ -346,24 +295,28 @@ class sql_db
else else
{ {
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC); $this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC);
if( $this->row ) if( $this->row )
{ {
$this->rownum[$query_id]++; $this->rownum[$query_id]++;
} }
} }
} }
return $this->row[$field]; return $this->row[$field];
} }
else
{
return false; return false;
} }
}
function sql_rowseek($offset, $query_id = 0){ function sql_rowseek($offset, $query_id = 0)
{
if(!$query_id) if(!$query_id)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if( $query_id ) if( $query_id )
{ {
if( $offset > -1 ) if( $offset > -1 )
@ -376,21 +329,17 @@ class sql_db
return false; return false;
} }
} }
else
{
return false; return false;
} }
}
function sql_nextid($query_id = 0) function sql_nextid()
{
if(!$query_id)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
}
if($query_id && $this->last_query_text[$query_id] != "") if($query_id && $this->last_query_text[$query_id] != "")
{ {
if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
if( preg_match("/^INSERT[ ]+INTO[ ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) )
{ {
$query = "SELECT last_value $query = "SELECT last_value
FROM " . $tablename[1] . "_id_seq"; FROM " . $tablename[1] . "_id_seq";
@ -401,46 +350,44 @@ class sql_db
} }
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC); $temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
if($temp_result)
{ return ( $temp_result ) ? $temp_result['last_value'] : false;
return $temp_result['last_value'];
} }
else }
{
return false; return false;
} }
}
else function sql_affectedrows($query_id = 0)
{ {
return false; if( !$query_id )
}
}
else
{ {
return false;
}
}
function sql_freeresult($query_id = 0){
if(!$query_id){
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if($query_id)
return ( $query_id ) ? @pg_cmdtuples($query_id) : false;
}
function sql_freeresult($query_id = 0)
{ {
$result = @pg_freeresult($query_id); if( !$query_id )
return $result;
}
else
{ {
return false; $query_id = $this->query_result;
} }
return ( $query_id ) ? @pg_freeresult($query_id) : false;
} }
function sql_error($query_id = 0) function sql_error($query_id = 0)
{ {
if(!$query_id){ if( !$query_id )
{
$query_id = $this->query_result; $query_id = $this->query_result;
} }
$result['message'] = @pg_errormessage($this->db_connect_id); $result['message'] = @pg_errormessage($this->db_connect_id);
$result['code'] = -1; $result['code'] = -1;
return $result; return $result;
} }