mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 20:40:24 +02:00
Code Issues Releases Wiki Activity

Various changes, and tests ... marking/tracking is not complete ... tinkering, changing, etc. still to be done ... it's just I've made numerous and various changes to different files so a commit really is due

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3953 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-04-26 01:17:40 +00:00
parent 4e43cb5153
commit 5362625eab
18 changed files with 739 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
phpBB/includes/db/postgres.php
View File

@@ -19,7 +19,7 @@
*
***************************************************************************/
if(!defined("SQL_LAYER"))
if (!defined("SQL_LAYER"))
{
define("SQL_LAYER","postgresql");
@@ -42,33 +42,33 @@ class sql_db
{
$this->connect_string = "";
if( $sqluser )
if ($sqluser)
{
$this->connect_string .= "user=$sqluser ";
}
if( $sqlpassword )
if ($sqlpassword)
{
$this->connect_string .= "password=$sqlpassword ";
}
if( $sqlserver )
if ($sqlserver)
{
if( ereg(":", $sqlserver) )
if (ereg(":", $sqlserver))
{
list($sqlserver, $sqlport) = split(":", $sqlserver);
$this->connect_string .= "host=$sqlserver port=$sqlport ";
}
else
{
if( $sqlserver != "localhost" )
if ($sqlserver != "localhost")
{
$this->connect_string .= "host=$sqlserver ";
}
}
}
if( $database )
if ($database)
{
$this->dbname = $database;
$this->connect_string .= "dbname=$database";
@@ -76,9 +76,9 @@ class sql_db
$this->persistency = $persistency;
$this->db_connect_id = ( $this->persistency ) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string);
$this->db_connect_id = ($this->persistency) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string);
return ( $this->db_connect_id ) ? $this->db_connect_id : false;
return ($this->db_connect_id) ? $this->db_connect_id : false;
}
//
@@ -86,17 +86,17 @@ class sql_db
//
function sql_close()
{
if( $this->db_connect_id )
if ($this->db_connect_id)
{
//
// Commit any remaining transactions
//
if( $this->in_transaction )
if ($this->in_transaction)
{
@pg_exec($this->db_connect_id, "COMMIT");
}
if( $this->query_result )
if ($this->query_result)
{
@pg_freeresult($this->query_result);
}
@@ -118,30 +118,30 @@ class sql_db
// Remove any pre-existing queries
//
unset($this->query_result);
if( $query != "" )
if ($query != "")
{
$this->num_queries++;
$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);
if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
if ($transaction == BEGIN_TRANSACTION && !$this->in_transaction)
{
$this->in_transaction = TRUE;
if( !@pg_exec($this->db_connect_id, "BEGIN") )
if (!@pg_exec($this->db_connect_id, "BEGIN"))
{
return false;
}
}
$this->query_result = @pg_exec($this->db_connect_id, $query);
if( $this->query_result )
if ($this->query_result)
{
if( $transaction == END_TRANSACTION )
if ($transaction == END_TRANSACTION)
{
$this->in_transaction = FALSE;
if( !@pg_exec($this->db_connect_id, "COMMIT") )
if (!@pg_exec($this->db_connect_id, "COMMIT"))
{
@pg_exec($this->db_connect_id, "ROLLBACK");
return false;
@@ -158,7 +158,7 @@ class sql_db
}
else
{
if( $this->in_transaction )
if ($this->in_transaction)
{
@pg_exec($this->db_connect_id, "ROLLBACK");
}
@@ -169,11 +169,11 @@ class sql_db
}
else
{
if( $transaction == END_TRANSACTION && $this->in_transaction )
if ($transaction == END_TRANSACTION && $this->in_transaction)
{
$this->in_transaction = FALSE;
if( !@pg_exec($this->db_connect_id, "COMMIT") )
if (!@pg_exec($this->db_connect_id, "COMMIT"))
{
@pg_exec($this->db_connect_id, "ROLLBACK");
return false;
@@ -189,56 +189,56 @@ class sql_db
//
function sql_numrows($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_numrows($query_id) : false;
return ($query_id) ? @pg_numrows($query_id) : false;
}
function sql_numfields($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_numfields($query_id) : false;
return ($query_id) ? @pg_numfields($query_id) : false;
}
function sql_fieldname($offset, $query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false;
return ($query_id) ? @pg_fieldname($query_id, $offset) : false;
}
function sql_fieldtype($offset, $query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false;
return ($query_id) ? @pg_fieldtype($query_id, $offset) : false;
}
function sql_fetchrow($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
if ($query_id)
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]);
if( $this->row )
if ($this->row)
{
$this->rownum[$query_id]++;
return $this->row;
@@ -250,18 +250,18 @@ class sql_db
function sql_fetchrowset($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
if( $query_id )
if ($query_id)
{
unset($this->rowset[$query_id]);
unset($this->row[$query_id]);
$this->rownum[$query_id] = 0;
while( $this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC) )
while($this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC))
{
$result[] = $this->rowset;
$this->rownum[$query_id]++;
@@ -275,51 +275,25 @@ class sql_db
function sql_fetchfield($field, $row_offset=-1, $query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
if( $query_id )
{
if( $row_offset != -1 )
{
$this->row = @pg_fetch_array($query_id, $row_offset, PGSQL_ASSOC);
}
else
{
if( $this->rownum[$query_id] )
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]-1, PGSQL_ASSOC);
}
else
{
$this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC);
if( $this->row )
{
$this->rownum[$query_id]++;
}
}
}
return $this->row[$field];
}
return false;
}
function sql_rowseek($offset, $query_id = 0)
{
if(!$query_id)
if (!$query_id)
{
$query_id = $this->query_result;
}
if( $query_id )
if ($query_id)
{
if( $offset > -1 )
if ($offset > -1)
{
$this->rownum[$query_id] = $offset;
return true;
@@ -337,20 +311,20 @@ class sql_db
{
$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[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename))
{
$query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value";
$temp_q_id = @pg_exec($this->db_connect_id, $query);
if( !$temp_q_id )
if (!$temp_q_id)
{
return false;
}
$temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC);
return ( $temp_result ) ? $temp_result['last_value'] : false;
return ($temp_result) ? $temp_result['last_value'] : false;
}
}
@@ -359,27 +333,27 @@ class sql_db
function sql_affectedrows($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_cmdtuples($query_id) : false;
return ($query_id) ? @pg_cmdtuples($query_id) : false;
}
function sql_freeresult($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}
return ( $query_id ) ? @pg_freeresult($query_id) : false;
return ($query_id) ? @pg_freeresult($query_id) : false;
}
function sql_error($query_id = 0)
{
if( !$query_id )
if (!$query_id)
{
$query_id = $this->query_result;
}