Update of /cvsroot/phpbb-php5mod/phpbb-php5/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/db
Modified Files:
oracle.php postgres7.php
Log Message:
2.0.14.3
Index: oracle.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/oracle.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oracle.php 29 Jul 2004 22:36:00 -0000 1.1
--- oracle.php 16 Apr 2005 21:02:23 -0000 1.2
***************
*** 369,405 ****
}
}
- function sql_nextid($query_id = 0)
- {
- if(!$query_id)
- {
- $query_id = $this->query_result;
- }
- if($query_id && $this->last_query_text[$query_id] != "")
- {
- if( eregi("^(INSERT{1}|^INSERT INTO{1})[[:space:]][\"]?([a-zA-Z0-9\_\-]+)[\"]?", $this->last_query_text[$query_id], $tablename))
- {
- $query = "SELECT ".$tablename[2]."_id_seq.currval FROM DUAL";
- $stmt = @OCIParse($this->db_connect_id, $query);
- @OCIExecute($stmt,OCI_DEFAULT );
- $temp_result = @OCIFetchInto($stmt, $temp_result, OCI_ASSOC+OCI_RETURN_NULLS);
- if($temp_result)
- {
- return $temp_result['CURRVAL'];
- }
- else
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
function sql_nextid($query_id = 0)
--- 369,372 ----
Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/db/postgres7.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** postgres7.php 30 Jul 2004 20:12:43 -0000 1.2
--- postgres7.php 16 Apr 2005 21:02:23 -0000 1.3
***************
*** 124,127 ****
--- 124,128 ----
$query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query);
+ $query = preg_replace('#(.*WHERE.*)(username|user_email|ban_email) = \'(.*)\'#ise', "\"\\1LOWER(\\2) = '\" . strtolower('\\3') . \"'\"", $query);
if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction )
|
