class ORABlob {
var $mData;
- function __construct($data) {
+ function __construct( $data ) {
$this->mData = $data;
}
private $nrows;
private $unique;
+ private function array_unique_md( $array_in ) {
+ $array_out = array();
+ $array_hashes = array();
+
+ foreach ( $array_in as $key => $item ) {
+ $hash = md5( serialize( $item ) );
+ if ( !isset( $array_hashes[$hash] ) ) {
+ $array_hashes[$hash] = $hash;
+ $array_out[] = $item;
+ }
+ }
+
+ return $array_out;
+ }
- function __construct(&$db, $stmt, $unique = false) {
+ function __construct( &$db, $stmt, $unique = false ) {
$this->db =& $db;
- if (($this->nrows = oci_fetch_all($stmt, $this->rows, 0, -1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM)) === false) {
- $e = oci_error($stmt);
- $db->reportQueryError($e['message'], $e['code'], '', __FUNCTION__);
+ if ( ( $this->nrows = oci_fetch_all( $stmt, $this->rows, 0, - 1, OCI_FETCHSTATEMENT_BY_ROW | OCI_NUM ) ) === false ) {
+ $e = oci_error( $stmt );
+ $db->reportQueryError( $e['message'], $e['code'], '', __FUNCTION__ );
return;
}
- if ($unique) {
- $this->rows = array_unique($this->rows);
- $this->nrows = count($this->rows);
+ if ( $unique ) {
+ $this->rows = $this->array_unique_md( $this->rows );
+ $this->nrows = count( $this->rows );
}
$this->cursor = 0;
}
public function free() {
- oci_free_statement($this->stmt);
+ oci_free_statement( $this->stmt );
}
- public function seek($row) {
- $this->cursor = min($row, $this->nrows);
+ public function seek( $row ) {
+ $this->cursor = min( $row, $this->nrows );
}
public function numRows() {
}
public function numFields() {
- return oci_num_fields($this->stmt);
+ return oci_num_fields( $this->stmt );
}
public function fetchObject() {
- if ($this->cursor >= $this->nrows)
+ if ( $this->cursor >= $this->nrows ) {
return false;
+ }
$row = $this->rows[$this->cursor++];
$ret = new stdClass();
- foreach ($row as $k => $v) {
- $lc = strtolower(oci_field_name($this->stmt, $k + 1));
+ foreach ( $row as $k => $v ) {
+ $lc = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
$ret->$lc = $v;
}
}
public function fetchRow() {
- if ($this->cursor >= $this->nrows)
+ if ( $this->cursor >= $this->nrows ) {
return false;
+ }
$row = $this->rows[$this->cursor++];
$ret = array();
- foreach ($row as $k => $v) {
- $lc = strtolower(oci_field_name($this->stmt, $k + 1));
+ foreach ( $row as $k => $v ) {
+ $lc = strtolower( oci_field_name( $this->stmt, $k + 1 ) );
$ret[$lc] = $v;
$ret[$k] = $v;
}
private $name, $tablename, $default, $max_length, $nullable,
$is_pk, $is_unique, $is_multiple, $is_key, $type;
- function __construct($info) {
+ function __construct( $info ) {
$this->name = $info['column_name'];
$this->tablename = $info['table_name'];
$this->default = $info['data_default'];
$this->max_length = $info['data_length'];
$this->nullable = $info['not_null'];
- $this->is_pk = isset($info['prim']) && $info['prim'] == 1 ? 1 : 0;
- $this->is_unique = isset($info['uniq']) && $info['uniq'] == 1 ? 1 : 0;
- $this->is_multiple = isset($info['nonuniq']) && $info['nonuniq'] == 1 ? 1 : 0;
- $this->is_key = ($this->is_pk || $this->is_unique || $this->is_multiple);
+ $this->is_pk = isset( $info['prim'] ) && $info['prim'] == 1 ? 1 : 0;
+ $this->is_unique = isset( $info['uniq'] ) && $info['uniq'] == 1 ? 1 : 0;
+ $this->is_multiple = isset( $info['nonuniq'] ) && $info['nonuniq'] == 1 ? 1 : 0;
+ $this->is_key = ( $this->is_pk || $this->is_unique || $this->is_multiple );
$this->type = $info['data_type'];
}
-
+
function name() {
return $this->name;
}
function nullable() {
return $this->nullable;
}
-
+
function isKey() {
return $this->is_key;
}
* @ingroup Database
*/
class DatabaseOracle extends DatabaseBase {
- var $mInsertId = NULL;
- var $mLastResult = NULL;
- var $numeric_version = NULL;
+ var $mInsertId = null;
+ var $mLastResult = null;
+ var $numeric_version = null;
var $lastResult = null;
var $cursor = 0;
var $mAffectedRows;
var $ignore_DUP_VAL_ON_INDEX = false;
+ var $sequenceData = null;
+
+ var $defaultCharset = 'AL32UTF8';
+
+ var $mFieldInfoCache = array();
- function DatabaseOracle($server = false, $user = false, $password = false, $dbName = false,
+ function __construct( $server = false, $user = false, $password = false, $dbName = false,
$failFunction = false, $flags = 0, $tablePrefix = 'get from global' )
{
- $tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper($tablePrefix);
- parent::__construct($server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix);
- wfRunHooks( 'DatabaseOraclePostInit', array(&$this));
+ $tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix : strtoupper( $tablePrefix );
+ parent::__construct( $server, $user, $password, $dbName, $failFunction, $flags, $tablePrefix );
+ wfRunHooks( 'DatabaseOraclePostInit', array( &$this ) );
+ }
+
+ function getType() {
+ return 'oracle';
}
function cascadingDeletes() {
return true;
}
- static function newFromParams( $server = false, $user = false, $password = false, $dbName = false,
- $failFunction = false, $flags = 0)
+ static function newFromParams( $server, $user, $password, $dbName, $failFunction = false, $flags = 0 )
{
return new DatabaseOracle( $server, $user, $password, $dbName, $failFunction, $flags );
}
if ( !function_exists( 'oci_connect' ) ) {
throw new DBConnectionError( $this, "Oracle functions missing, have you compiled PHP with the --with-oci8 option?\n (Note: if you recently installed PHP, you may need to restart your webserver and database)\n" );
}
-
- putenv("NLS_LANG=AMERICAN_AMERICA.AL32UTF8");
$this->close();
$this->mServer = $server;
$this->mPassword = $password;
$this->mDBname = $dbName;
- if (!strlen($user)) { ## e.g. the class is being loaded
- return;
+ if ( !strlen( $user ) ) { # e.g. the class is being loaded
+ return;
}
- //error_reporting( E_ALL ); //whoever had this bright idea
$session_mode = $this->mFlags & DBO_SYSDBA ? OCI_SYSDBA : OCI_DEFAULT;
- if ( $this->mFlags & DBO_DEFAULT )
- $this->mConn = oci_new_connect($user, $password, $dbName, null, $session_mode);
- else
- $this->mConn = oci_connect($user, $password, $dbName, null, $session_mode);
-
- if ($this->mConn == false) {
- wfDebug("DB connection error\n");
- wfDebug("Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n");
- wfDebug($this->lastError()."\n");
+ if ( $this->mFlags & DBO_DEFAULT ) {
+ $this->mConn = oci_new_connect( $user, $password, $dbName, $this->defaultCharset, $session_mode );
+ } else {
+ $this->mConn = oci_connect( $user, $password, $dbName, $this->defaultCharset, $session_mode );
+ }
+
+ if ( $this->mConn == false ) {
+ wfDebug( "DB connection error\n" );
+ wfDebug( "Server: $server, Database: $dbName, User: $user, Password: " . substr( $password, 0, 3 ) . "...\n" );
+ wfDebug( $this->lastError() . "\n" );
return false;
}
$this->mOpened = true;
-
- #removed putenv calls because they interfere with the system globaly
- $this->doQuery('ALTER SESSION SET NLS_TIMESTAMP_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'');
- $this->doQuery('ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'');
-
+
+ # removed putenv calls because they interfere with the system globaly
+ $this->doQuery( 'ALTER SESSION SET NLS_TIMESTAMP_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'' );
+ $this->doQuery( 'ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT=\'DD-MM-YYYY HH24:MI:SS.FF6\'' );
return $this->mConn;
}
return $this->mTrxLevel ? OCI_DEFAULT : OCI_COMMIT_ON_SUCCESS;
}
- function doQuery($sql) {
- wfDebug("SQL: [$sql]\n");
- if (!mb_check_encoding($sql)) {
- throw new MWException("SQL encoding is invalid");
+ function doQuery( $sql ) {
+ wfDebug( "SQL: [$sql]\n" );
+ if ( !mb_check_encoding( $sql ) ) {
+ throw new MWException( "SQL encoding is invalid\n$sql" );
}
- //handle some oracle specifics
- //remove AS column/table/subquery namings
- $sql = preg_replace('/ as /i', ' ', $sql);
+ // handle some oracle specifics
+ // remove AS column/table/subquery namings
+ if ( !defined( 'MEDIAWIKI_INSTALL' ) ) {
+ $sql = preg_replace( '/ as /i', ' ', $sql );
+ }
// Oracle has issues with UNION clause if the statement includes LOB fields
// So we do a UNION ALL and then filter the results array with array_unique
- $union_unique = (preg_match('/\/\* UNION_UNIQUE \*\/ /', $sql) != 0);
- //EXPLAIN syntax in Oracle is EXPLAIN PLAN FOR and it return nothing
- //you have to select data from plan table after explain
- $explain_id = date('dmYHis');
- $sql = preg_replace('/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \''.$explain_id.'\' FOR', $sql, 1, $explain_count);
-
-
- if (($this->mLastResult = $stmt = oci_parse($this->mConn, $sql)) === false) {
- $e = oci_error($this->mConn);
- $this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+ $union_unique = ( preg_match( '/\/\* UNION_UNIQUE \*\/ /', $sql ) != 0 );
+ // EXPLAIN syntax in Oracle is EXPLAIN PLAN FOR and it return nothing
+ // you have to select data from plan table after explain
+ $explain_id = date( 'dmYHis' );
+
+ $sql = preg_replace( '/^EXPLAIN /', 'EXPLAIN PLAN SET STATEMENT_ID = \'' . $explain_id . '\' FOR', $sql, 1, $explain_count );
+
+
+ wfSuppressWarnings();
+
+ if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn, $sql ) ) === false ) {
+ $e = oci_error( $this->mConn );
+ $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
}
- $olderr = error_reporting(E_ERROR);
- if (oci_execute($stmt, $this->execFlags()) == false) {
- $e = oci_error($stmt);
- if (!$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1')
- $this->reportQueryError($e['message'], $e['code'], $sql, __FUNCTION__);
+ if ( oci_execute( $stmt, $this->execFlags() ) == false ) {
+ $e = oci_error( $stmt );
+ if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
+ $this->reportQueryError( $e['message'], $e['code'], $sql, __FUNCTION__ );
+ }
}
- error_reporting($olderr);
+
+ wfRestoreWarnings();
- if ($explain_count > 0) {
- return $this->doQuery('SELECT id, cardinality "ROWS" FROM plan_table WHERE statement_id = \''.$explain_id.'\'');
- } elseif (oci_statement_type($stmt) == "SELECT") {
- return new ORAResult($this, $stmt, $union_unique);
+ if ( $explain_count > 0 ) {
+ return $this->doQuery( 'SELECT id, cardinality "ROWS" FROM plan_table WHERE statement_id = \'' . $explain_id . '\'' );
+ } elseif ( oci_statement_type( $stmt ) == 'SELECT' ) {
+ return new ORAResult( $this, $stmt, $union_unique );
} else {
- $this->mAffectedRows = oci_num_rows($stmt);
+ $this->mAffectedRows = oci_num_rows( $stmt );
return true;
}
}
- function queryIgnore($sql, $fname = '') {
- return $this->query($sql, $fname, true);
+ function queryIgnore( $sql, $fname = '' ) {
+ return $this->query( $sql, $fname, true );
}
- function freeResult($res) {
+ function freeResult( $res ) {
if ( $res instanceof ORAResult ) {
$res->free();
} else {
}
}
- function fetchObject($res) {
+ function fetchObject( $res ) {
if ( $res instanceof ORAResult ) {
return $res->numRows();
} else {
}
}
- function fetchRow($res) {
+ function fetchRow( $res ) {
if ( $res instanceof ORAResult ) {
return $res->fetchRow();
} else {
}
}
- function numRows($res) {
+ function numRows( $res ) {
if ( $res instanceof ORAResult ) {
return $res->numRows();
} else {
}
}
- function numFields($res) {
+ function numFields( $res ) {
if ( $res instanceof ORAResult ) {
return $res->numFields();
} else {
}
}
- function fieldName($stmt, $n) {
- return oci_field_name($stmt, $n);
+ function fieldName( $stmt, $n ) {
+ return oci_field_name( $stmt, $n );
}
/**
return $this->mInsertId;
}
- function dataSeek($res, $row) {
+ function dataSeek( $res, $row ) {
if ( $res instanceof ORAResult ) {
- $res->seek($row);
+ $res->seek( $row );
} else {
- $res->result->seek($row);
+ $res->result->seek( $row );
}
}
function lastError() {
- if ($this->mConn === false)
+ if ( $this->mConn === false ) {
$e = oci_error();
- else
- $e = oci_error($this->mConn);
+ } else {
+ $e = oci_error( $this->mConn );
+ }
return $e['message'];
}
function lastErrno() {
- if ($this->mConn === false)
+ if ( $this->mConn === false ) {
$e = oci_error();
- else
- $e = oci_error($this->mConn);
+ } else {
+ $e = oci_error( $this->mConn );
+ }
return $e['code'];
}
return false;
}
- function indexUnique ($table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
+ function indexUnique( $table, $index, $fname = 'DatabaseOracle::indexUnique' ) {
return false;
}
function insert( $table, $a, $fname = 'DatabaseOracle::insert', $options = array() ) {
- if ( !count( $a ) )
+ if ( !count( $a ) ) {
return true;
+ }
- if (!is_array($options))
- $options = array($options);
+ if ( !is_array( $options ) ) {
+ $options = array( $options );
+ }
- if (in_array('IGNORE', $options))
+ if ( in_array( 'IGNORE', $options ) ) {
$this->ignore_DUP_VAL_ON_INDEX = true;
+ }
- if (!is_array(reset($a))) {
- $a = array($a);
+ if ( !is_array( reset( $a ) ) ) {
+ $a = array( $a );
}
- foreach ($a as $row) {
- $this->insertOneRow($table, $row, $fname);
+
+ foreach ( $a as &$row ) {
+ $this->insertOneRow( $table, $row, $fname );
}
$retVal = true;
- if (in_array('IGNORE', $options))
+ if ( in_array( 'IGNORE', $options ) ) {
$this->ignore_DUP_VAL_ON_INDEX = false;
+ }
return $retVal;
}
- function insertOneRow($table, $row, $fname) {
+ function insertOneRow( $table, $row, $fname ) {
global $wgLang;
// "INSERT INTO tables (a, b, c)"
- $sql = "INSERT INTO " . $this->tableName($table) . " (" . join(',', array_keys($row)) . ')';
+ $sql = "INSERT INTO " . $this->tableName( $table ) . " (" . join( ',', array_keys( $row ) ) . ')';
$sql .= " VALUES (";
// for each value, append ":key"
$first = true;
- foreach ($row as $col => $val) {
- if ($first)
- $sql .= ':'.$col;
- else
- $sql.= ', :'.$col;
-
+ foreach ( $row as $col => $val ) {
+ if ( $first ) {
+ $sql .= $val !== null ? ':' . $col : 'NULL';
+ } else {
+ $sql .= $val !== null ? ', :' . $col : ', NULL';
+ }
+
$first = false;
}
$sql .= ')';
- $stmt = oci_parse($this->mConn, $sql);
- foreach ($row as $col => $val) {
- if (!is_object($val)) {
- if (oci_bind_by_name($stmt, ":$col", $row[$col]) === false)
- $this->reportQueryError($this->lastErrno(), $this->lastError(), $sql, __METHOD__);
- }
- }
-
- $stmt = oci_parse($this->mConn, $sql);
- foreach ($row as $col => $val) {
- $col_type=$this->fieldInfo($this->tableName($table), $col)->type();
- if ($col_type != 'BLOB' && $col_type != 'CLOB') {
- if (is_object($val))
+ $stmt = oci_parse( $this->mConn, $sql );
+ foreach ( $row as $col => &$val ) {
+ $col_info = $this->fieldInfo( $this->tableName( $table ), $col );
+ $col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+
+ if ( $val === null ) {
+ // do nothing ... null was inserted in statement creation
+ } elseif ( $col_type != 'BLOB' && $col_type != 'CLOB' ) {
+ if ( is_object( $val ) ) {
$val = $val->getData();
-
- if (preg_match('/^timestamp.*/i', $col_type) == 1 && strtolower($val) == 'infinity')
+ }
+
+ if ( preg_match( '/^timestamp.*/i', $col_type ) == 1 && strtolower( $val ) == 'infinity' ) {
$val = '31-12-2030 12:00:00.000000';
-
- if (oci_bind_by_name($stmt, ":$col", $wgLang->checkTitleEncoding($val)) === false)
- $this->reportQueryError($this->lastErrno(), $this->lastError(), $sql, __METHOD__);
+ }
+
+ $val = ( $wgLang != null ) ? $wgLang->checkTitleEncoding( $val ) : $val;
+ if ( oci_bind_by_name( $stmt, ":$col", $val ) === false ) {
+ $this->reportQueryError( $this->lastErrno(), $this->lastError(), $sql, __METHOD__ );
+ }
} else {
- if (($lob[$col] = oci_new_descriptor($this->mConn, OCI_D_LOB)) === false) {
- $e = oci_error($stmt);
- throw new DBUnexpectedError($this, "Cannot create LOB descriptor: " . $e['message']);
+ if ( ( $lob[$col] = oci_new_descriptor( $this->mConn, OCI_D_LOB ) ) === false ) {
+ $e = oci_error( $stmt );
+ throw new DBUnexpectedError( $this, "Cannot create LOB descriptor: " . $e['message'] );
}
-
- if (is_object($val)) {
- $lob[$col]->writeTemporary($val->getData());
- oci_bind_by_name($stmt, ":$col", $lob[$col], -1, SQLT_BLOB);
+
+ if ( $col_type == 'BLOB' ) { // is_object($val)) {
+ $lob[$col]->writeTemporary( $val ); // ->getData());
+ oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, SQLT_BLOB );
} else {
- $lob[$col]->writeTemporary($val);
- oci_bind_by_name($stmt, ":$col", $lob[$col], -1, OCI_B_CLOB);
+ $lob[$col]->writeTemporary( $val );
+ oci_bind_by_name( $stmt, ":$col", $lob[$col], - 1, OCI_B_CLOB );
}
}
}
-
- $olderr = error_reporting(E_ERROR);
- if (oci_execute($stmt, OCI_DEFAULT) === false) {
- $e = oci_error($stmt);
-
- if (!$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1')
- $this->reportQueryError($e['message'], $e['code'], $sql, __METHOD__);
- else
- $this->mAffectedRows = oci_num_rows($stmt);
- } else
- $this->mAffectedRows = oci_num_rows($stmt);
- error_reporting($olderr);
-
- if (isset($lob)){
- foreach ($lob as $lob_i => $lob_v) {
+
+ wfSuppressWarnings();
+
+ if ( oci_execute( $stmt, OCI_DEFAULT ) === false ) {
+ $e = oci_error( $stmt );
+
+ if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] != '1' ) {
+ $this->reportQueryError( $e['message'], $e['code'], $sql, __METHOD__ );
+ } else {
+ $this->mAffectedRows = oci_num_rows( $stmt );
+ }
+ } else {
+ $this->mAffectedRows = oci_num_rows( $stmt );
+ }
+
+ wfRestoreWarnings();
+
+ if ( isset( $lob ) ) {
+ foreach ( $lob as $lob_i => $lob_v ) {
$lob_v->free();
}
}
-
- if (!$this->mTrxLevel)
- oci_commit($this->mConn);
-
- oci_free_statement($stmt);
+
+ if ( !$this->mTrxLevel ) {
+ oci_commit( $this->mConn );
+ }
+
+ oci_free_statement( $stmt );
}
function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'DatabaseOracle::insertSelect',
$insertOptions = array(), $selectOptions = array() )
{
$destTable = $this->tableName( $destTable );
- if( !is_array( $selectOptions ) ) {
+ if ( !is_array( $selectOptions ) ) {
$selectOptions = array( $selectOptions );
}
list( $startOpts, $useIndex, $tailOpts ) = $this->makeSelectOptions( $selectOptions );
- if( is_array( $srcTable ) ) {
+ if ( is_array( $srcTable ) ) {
$srcTable = implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) );
} else {
$srcTable = $this->tableName( $srcTable );
}
+
+ if ( ( $sequenceData = $this->getSequenceData( $destTable ) ) !== false &&
+ !isset( $varMap[$sequenceData['column']] ) )
+ $varMap[$sequenceData['column']] = 'GET_SEQUENCE_VALUE(\'' . $sequenceData['sequence'] . '\')';
+
+ // count-alias subselect fields to avoid abigious definition errors
+ $i = 0;
+ foreach ( $varMap as $key => &$val ) {
+ $val = $val . ' field' . ( $i++ );
+ }
+
$sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' .
" SELECT $startOpts " . implode( ',', $varMap ) .
" FROM $srcTable $useIndex ";
}
$sql .= " $tailOpts";
- if (in_array('IGNORE', $insertOptions))
+ if ( in_array( 'IGNORE', $insertOptions ) ) {
$this->ignore_DUP_VAL_ON_INDEX = true;
+ }
$retval = $this->query( $sql, $fname );
- if (in_array('IGNORE', $insertOptions))
+ if ( in_array( 'IGNORE', $insertOptions ) ) {
$this->ignore_DUP_VAL_ON_INDEX = false;
-
+ }
+
return $retval;
}
function tableName( $name ) {
+ if (is_array($name)) {
+ foreach($name as &$single_name) {
+ $single_name = $this->tableName($single_name);
+ }
+ return $name;
+ }
+
global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
/*
Replace reserved words with better ones
- Useing uppercase, because that's the only way oracle can handle
+ Using uppercase because that's the only way Oracle can handle
quoted tablenames
*/
switch( $name ) {
case 'user':
- $name = 'MWUSER'; break;
+ $name = 'MWUSER';
+ break;
case 'text':
- $name = 'PAGECONTENT'; break;
+ $name = 'PAGECONTENT';
+ break;
}
/*
The rest of procedure is equal to generic Databse class
except for the quoting style
*/
- if ( $name[0] == '"' && substr( $name, -1, 1 ) == '"' ) return $name;
-
- if( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) return $name;
+ if ( $name[0] == '"' && substr( $name, - 1, 1 ) == '"' ) {
+ return $name;
+ }
+ if ( preg_match( '/(^|\s)(DISTINCT|JOIN|ON|AS)(\s|$)/i', $name ) !== 0 ) {
+ return $name;
+ }
$dbDetails = array_reverse( explode( '.', $name, 2 ) );
- if( isset( $dbDetails[1] ) ) @list( $table, $database ) = $dbDetails;
- else @list( $table ) = $dbDetails;
-
+ if ( isset( $dbDetails[1] ) ) {
+ @list( $table, $database ) = $dbDetails;
+ } else {
+ @list( $table ) = $dbDetails;
+ }
+
$prefix = $this->mTablePrefix;
-
- if( isset($database) ) $table = ( $table[0] == '`' ? $table : "`{$table}`" );
-
- if( !isset( $database )
- && isset( $wgSharedDB )
- && $table[0] != '"'
- && isset( $wgSharedTables )
- && is_array( $wgSharedTables )
- && in_array( $table, $wgSharedTables ) ) {
+
+ if ( isset( $database ) ) {
+ $table = ( $table[0] == '`' ? $table : "`{$table}`" );
+ }
+
+ if ( !isset( $database ) && isset( $wgSharedDB ) && $table[0] != '"'
+ && isset( $wgSharedTables )
+ && is_array( $wgSharedTables )
+ && in_array( $table, $wgSharedTables )
+ ) {
$database = $wgSharedDB;
$prefix = isset( $wgSharedPrefix ) ? $wgSharedPrefix : $prefix;
}
-
- if( isset($database) ) $database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
+
+ if ( isset( $database ) ) {
+ $database = ( $database[0] == '"' ? $database : "\"{$database}\"" );
+ }
$table = ( $table[0] == '"' ? $table : "\"{$prefix}{$table}\"" );
-
- $tableName = ( isset($database) ? "{$database}.{$table}" : "{$table}" );
-
- return strtoupper($tableName);
+
+ $tableName = ( isset( $database ) ? "{$database}.{$table}" : "{$table}" );
+
+ return strtoupper( $tableName );
}
/**
* Return the next in a sequence, save the value for retrieval via insertId()
*/
- function nextSequenceValue($seqName) {
- $res = $this->query("SELECT $seqName.nextval FROM dual");
- $row = $this->fetchRow($res);
+ function nextSequenceValue( $seqName ) {
+ $res = $this->query( "SELECT $seqName.nextval FROM dual" );
+ $row = $this->fetchRow( $res );
$this->mInsertId = $row[0];
- $this->freeResult($res);
+ $this->freeResult( $res );
return $this->mInsertId;
}
/**
- * Oracle does not have a "USE INDEX" clause, so return an empty string
+ * Return sequence_name if table has a sequence
*/
- function useIndexClause($index) {
- return '';
+ function getSequenceData( $table ) {
+ if ( $this->sequenceData == null ) {
+ $result = $this->query( "SELECT lower(us.sequence_name), lower(utc.table_name), lower(utc.column_name) from user_sequences us, user_tab_columns utc where us.sequence_name = utc.table_name||'_'||utc.column_name||'_SEQ'" );
+
+ while ( ( $row = $result->fetchRow() ) !== false ) {
+ $this->sequenceData[$this->tableName( $row[1] )] = array(
+ 'sequence' => $row[0],
+ 'column' => $row[2]
+ );
+ }
+ }
+
+ return ( isset( $this->sequenceData[$table] ) ) ? $this->sequenceData[$table] : false;
}
# REPLACE query wrapper
# However if you do this, you run the risk of encountering errors which wouldn't have
# occurred in MySQL
function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseOracle::replace' ) {
- $table = $this->tableName($table);
+ $table = $this->tableName( $table );
- if (count($rows)==0) {
+ if ( count( $rows ) == 0 ) {
return;
}
# Single row case
- if (!is_array(reset($rows))) {
- $rows = array($rows);
+ if ( !is_array( reset( $rows ) ) ) {
+ $rows = array( $rows );
}
- foreach( $rows as $row ) {
+ $sequenceData = $this->getSequenceData( $table );
+
+ foreach ( $rows as $row ) {
# Delete rows which collide
if ( $uniqueIndexes ) {
- $sql = "DELETE FROM $table WHERE ";
- $first = true;
- foreach ( $uniqueIndexes as $index ) {
- if ( $first ) {
- $first = false;
- $sql .= "(";
- } else {
- $sql .= ') OR (';
- }
- if ( is_array( $index ) ) {
- $first2 = true;
- foreach ( $index as $col ) {
- if ( $first2 ) {
- $first2 = false;
- } else {
- $sql .= ' AND ';
- }
- $sql .= $col.'=' . $this->addQuotes( $row[$col] );
- }
- } else {
- $sql .= $index.'=' . $this->addQuotes( $row[$index] );
- }
+ $condsDelete = array();
+ foreach ( $uniqueIndexes as $index )
+ $condsDelete[$index] = $row[$index];
+ if (count($condsDelete) > 0) {
+ $this->delete( $table, $condsDelete, $fname );
}
- $sql .= ')';
- $this->query( $sql, $fname );
+ }
+
+ if ( $sequenceData !== false && !isset( $row[$sequenceData['column']] ) ) {
+ $row[$sequenceData['column']] = $this->nextSequenceValue( $sequenceData['sequence'] );
}
# Now insert the row
# DELETE where the condition is a join
function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = "DatabaseOracle::deleteJoin" ) {
if ( !$conds ) {
- throw new DBUnexpectedError($this, 'DatabaseOracle::deleteJoin() called with empty $conds' );
+ throw new DBUnexpectedError( $this, 'DatabaseOracle::deleteJoin() called with empty $conds' );
}
$delTable = $this->tableName( $delTable );
FROM pg_class c, pg_attribute a, pg_type t
WHERE relname='$table' AND a.attrelid=c.oid AND
a.atttypid=t.oid and a.attname='$field'";
- $res =$this->query($sql);
- $row=$this->fetchObject($res);
- if ($row->ftype=="varchar") {
- $size=$row->size-4;
+ $res = $this->query( $sql );
+ $row = $this->fetchObject( $res );
+ if ( $row->ftype == "varchar" ) {
+ $size = $row->size - 4;
} else {
- $size=$row->size;
+ $size = $row->size;
}
$this->freeResult( $res );
return $size;
}
- function lowPriorityOption() {
- return '';
- }
-
- function limitResult($sql, $limit, $offset) {
- if ($offset === false)
+ function limitResult( $sql, $limit, $offset = false ) {
+ if ( $offset === false ) {
$offset = 0;
+ }
return "SELECT * FROM ($sql) WHERE rownum >= (1 + $offset) AND rownum < (1 + $limit + $offset)";
}
- function unionQueries($sqls, $all = false) {
+ function unionQueries( $sqls, $all ) {
$glue = ' UNION ALL ';
- return 'SELECT * '.($all?'':'/* UNION_UNIQUE */ ').'FROM ('.implode( $glue, $sqls ).')' ;
- }
-
- /**
- * Returns an SQL expression for a simple conditional.
- * Uses CASE on Oracle
- *
- * @param $cond String: SQL expression which will result in a boolean value
- * @param $trueVal String: SQL expression to return if true
- * @param $falseVal String: SQL expression to return if false
- * @return String: SQL fragment
- */
- function conditional( $cond, $trueVal, $falseVal ) {
- return " (CASE WHEN $cond THEN $trueVal ELSE $falseVal END) ";
+ return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) . 'FROM (' . implode( $glue, $sqls ) . ')' ;
}
function wasDeadlock() {
return $this->lastErrno() == 'OCI-00060';
}
- function timestamp($ts = 0) {
- return wfTimestamp(TS_ORACLE, $ts);
+
+ function duplicateTableStructure( $oldName, $newName, $temporary = false, $fname = 'DatabaseOracle::duplicateTableStructure' ) {
+ $temporary = $temporary ? 'TRUE' : 'FALSE';
+ return $this->query( 'BEGIN DUPLICATE_TABLE(\'' . $oldName . '\', \'' . $newName . '\', ' . $temporary . '); END;', $fname );
+ }
+
+ function timestamp( $ts = 0 ) {
+ return wfTimestamp( TS_ORACLE, $ts );
}
/**
* Return aggregated value function call
*/
- function aggregateValue ($valuedata,$valuename='value') {
+ function aggregateValue ( $valuedata, $valuename = 'value' ) {
return $valuedata;
}
- function reportQueryError($error, $errno, $sql, $fname, $tempIgnore = false) {
+ function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
# Ignore errors during error handling to avoid infinite
# recursion
- $ignore = $this->ignoreErrors(true);
+ $ignore = $this->ignoreErrors( true );
++$this->mErrorCount;
- if ($ignore || $tempIgnore) {
-//echo "error ignored! query = [$sql]\n";
- wfDebug("SQL ERROR (ignored): $error\n");
+ if ( $ignore || $tempIgnore ) {
+ wfDebug( "SQL ERROR (ignored): $error\n" );
$this->ignoreErrors( $ignore );
- }
- else {
-//echo "error!\n";
- $message = "A database error has occurred\n" .
- "Query: $sql\n" .
- "Function: $fname\n" .
- "Error: $errno $error\n";
- throw new DBUnexpectedError($this, $message);
+ } else {
+ throw new DBQueryError( $this, $error, $errno, $sql, $fname );
}
}
* @return string wikitext of a link to the server software's web site
*/
function getSoftwareLink() {
- return "[http://www.oracle.com/ Oracle]";
+ return '[http://www.oracle.com/ Oracle]';
}
/**
* @return string Version information from the database
*/
function getServerVersion() {
- return oci_server_version($this->mConn);
+ return oci_server_version( $this->mConn );
}
/**
* Query whether a given table exists (in the given schema, or the default mw one if not given)
*/
- function tableExists($table) {
+ function tableExists( $table ) {
$SQL = "SELECT 1 FROM user_tables WHERE table_name='$table'";
- $res = $this->doQuery($SQL);
- if ($res) {
+ $res = $this->doQuery( $SQL );
+ if ( $res ) {
$count = $res->numRows();
$res->free();
} else {
* Query whether a given column exists in the mediawiki schema
* based on prebuilt table to simulate MySQL field info and keep query speed minimal
*/
- function fieldExists( $table, $field ) {
- if (!isset($this->fieldInfo_stmt))
- $this->fieldInfo_stmt = oci_parse($this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)');
-
- oci_bind_by_name($this->fieldInfo_stmt, ':tab', trim($table, '"'));
- oci_bind_by_name($this->fieldInfo_stmt, ':col', $field);
-
- if (oci_execute($this->fieldInfo_stmt, OCI_DEFAULT) === false) {
- $e = oci_error($this->fieldInfo_stmt);
- $this->reportQueryError($e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__);
- return false;
- }
- $res = new ORAResult($this,$this->fieldInfo_stmt);
- return $res->numRows() != 0;
+ function fieldExists( $table, $field, $fname = 'DatabaseOracle::fieldExists' ) {
+ return (bool)$this->fieldInfo( $table, $field, $fname );
}
function fieldInfo( $table, $field ) {
- if (!isset($this->fieldInfo_stmt))
- $this->fieldInfo_stmt = oci_parse($this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name = upper(:tab) and column_name = UPPER(:col)');
-
- oci_bind_by_name($this->fieldInfo_stmt, ':tab', trim($table, '"'));
- oci_bind_by_name($this->fieldInfo_stmt, ':col', $field);
+ $tableWhere = '';
+ $field = strtoupper($field);
+ if (is_array($table)) {
+ $tableWhere = 'IN (';
+ foreach($table as &$singleTable) {
+ $singleTable = strtoupper(trim( $singleTable, '"' ));
+ if (isset($this->mFieldInfoCache["$singleTable.$field"])) {
+ return $this->mFieldInfoCache["$singleTable.$field"];
+ }
+ $tableWhere .= '\''.$singleTable.'\',';
+ }
+ $tableWhere = rtrim($tableWhere, ',').')';
+ } else {
+ $table = strtoupper(trim( $table, '"' ));
+ if (isset($this->mFieldInfoCache["$table.$field"])) {
+ return $this->mFieldInfoCache["$table.$field"];
+ }
+ $tableWhere = '= \''.$table.'\'';
+ }
- if (oci_execute($this->fieldInfo_stmt, OCI_DEFAULT) === false) {
- $e = oci_error($this->fieldInfo_stmt);
- $this->reportQueryError($e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__);
+ $fieldInfoStmt = oci_parse( $this->mConn, 'SELECT * FROM wiki_field_info_full WHERE table_name '.$tableWhere.' and column_name = \''.$field.'\'' );
+ if ( oci_execute( $fieldInfoStmt, OCI_DEFAULT ) === false ) {
+ $e = oci_error( $fieldInfoStmt );
+ $this->reportQueryError( $e['message'], $e['code'], 'fieldInfo QUERY', __METHOD__ );
return false;
}
- $res = new ORAResult($this,$this->fieldInfo_stmt);
- return new ORAField($res->fetchRow());
+ $res = new ORAResult( $this, $fieldInfoStmt );
+ if ($res->numRows() == 0 ) {
+ if (is_array($table)) {
+ foreach($table as &$singleTable) {
+ $this->mFieldInfoCache["$singleTable.$field"] = false;
+ }
+ } else {
+ $this->mFieldInfoCache["$table.$field"] = false;
+ }
+ } else {
+ $fieldInfoTemp = new ORAField( $res->fetchRow() );
+ $table = $fieldInfoTemp->tableName();
+ $this->mFieldInfoCache["$table.$field"] = $fieldInfoTemp;
+ return $fieldInfoTemp;
+ }
}
function begin( $fname = '' ) {
$this->mTrxLevel = 1;
}
+
function immediateCommit( $fname = '' ) {
return true;
}
+
function commit( $fname = '' ) {
- oci_commit($this->mConn);
+ oci_commit( $this->mConn );
$this->mTrxLevel = 0;
}
/* Not even sure why this is used in the main codebase... */
- function limitResultForUpdate($sql, $num) {
+ function limitResultForUpdate( $sql, $num ) {
return $sql;
}
/* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
function sourceStream( $fp, $lineCallback = false, $resultCallback = false ) {
- $cmd = "";
+ $cmd = '';
$done = false;
$dollarquote = false;
-
+
$replacements = array();
while ( ! feof( $fp ) ) {
$line = trim( fgets( $fp, 1024 ) );
$sl = strlen( $line ) - 1;
- if ( $sl < 0 ) { continue; }
- if ( '-' == $line{0} && '-' == $line{1} ) { continue; }
+ if ( $sl < 0 ) {
+ continue;
+ }
+ if ( '-' == $line { 0 } && '-' == $line { 1 } ) {
+ continue;
+ }
// Allow dollar quoting for function declarations
- if (substr($line,0,8) == '/*$mw$*/') {
- if ($dollarquote) {
+ if ( substr( $line, 0, 8 ) == '/*$mw$*/' ) {
+ if ( $dollarquote ) {
$dollarquote = false;
$done = true;
- }
- else {
+ } else {
$dollarquote = true;
}
- }
- else if (!$dollarquote) {
- if ( ';' == $line{$sl} && ($sl < 2 || ';' != $line{$sl - 1})) {
+ } elseif ( !$dollarquote ) {
+ if ( ';' == $line { $sl } && ( $sl < 2 || ';' != $line { $sl - 1 } ) ) {
$done = true;
$line = substr( $line, 0, $sl );
}
}
- if ( '' != $cmd ) { $cmd .= ' '; }
+ if ( $cmd != '' ) {
+ $cmd .= ' ';
+ }
$cmd .= "$line\n";
if ( $done ) {
- $cmd = str_replace(';;', ";", $cmd);
- if (strtolower(substr($cmd, 0, 6)) == 'define' ) {
- if (preg_match('/^define\s*([^\s=]*)\s*=\s*\'\{\$([^\}]*)\}\'/', $cmd, $defines)) {
+ $cmd = str_replace( ';;', ";", $cmd );
+ if ( strtolower( substr( $cmd, 0, 6 ) ) == 'define' ) {
+ if ( preg_match( '/^define\s*([^\s=]*)\s*=\s*\'\{\$([^\}]*)\}\'/', $cmd, $defines ) ) {
$replacements[$defines[2]] = $defines[1];
}
} else {
- foreach ( $replacements as $mwVar=>$scVar ) {
- $cmd = str_replace( '&' . $scVar . '.', '{$'.$mwVar.'}', $cmd );
+ foreach ( $replacements as $mwVar => $scVar ) {
+ $cmd = str_replace( '&' . $scVar . '.', '{$' . $mwVar . '}', $cmd );
}
$cmd = $this->replaceVars( $cmd );
if ( $resultCallback ) {
call_user_func( $resultCallback, $res, $this );
}
-
+
if ( false === $res ) {
$err = $this->lastError();
return "Query \"{$cmd}\" failed with error code \"$err\".\n";
function setup_database() {
global $wgVersion, $wgDBmwschema, $wgDBts2schema, $wgDBport, $wgDBuser;
-
+
echo "<li>Creating DB objects</li>\n";
- $res = dbsource( "../maintenance/ora/tables.sql", $this);
-
+ $res = $this->sourceFile( "../maintenance/ora/tables.sql" );
+
// Avoid the non-standard "REPLACE INTO" syntax
echo "<li>Populating table interwiki</li>\n";
$f = fopen( "../maintenance/interwiki.sql", 'r' );
- if ($f == false ) {
- dieout( "<li>Could not find the interwiki.sql file</li>");
+ if ( $f == false ) {
+ dieout( "<li>Could not find the interwiki.sql file</li>" );
}
-
- //do it like the postgres :D
+
+ // do it like the postgres :D
$SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES ";
- while ( ! feof( $f ) ) {
- $line = fgets($f,1024);
+ while ( !feof( $f ) ) {
+ $line = fgets( $f, 1024 );
$matches = array();
- if (!preg_match('/^\s*(\(.+?),(\d)\)/', $line, $matches)) {
+ if ( !preg_match( '/^\s*(\(.+?),(\d)\)/', $line, $matches ) ) {
continue;
}
- $this->query("$SQL $matches[1],$matches[2])");
+ $this->query( "$SQL $matches[1],$matches[2])" );
}
echo "<li>Table interwiki successfully populated</li>\n";
}
- function strencode($s) {
- return str_replace("'", "''", $s);
- }
-
- function encodeBlob($b) {
- return new ORABlob($b);
- }
- function decodeBlob($b) {
- return $b; //return $b->load();
+ function strencode( $s ) {
+ return str_replace( "'", "''", $s );
}
function addQuotes( $s ) {
global $wgLang;
- if (isset($wgLang->mLoaded) && $wgLang->mLoaded)
- $s = $wgLang->checkTitleEncoding($s);
- return "'" . $this->strencode($s) . "'";
+ if ( isset( $wgLang->mLoaded ) && $wgLang->mLoaded ) {
+ $s = $wgLang->checkTitleEncoding( $s );
+ }
+ return "'" . $this->strencode( $s ) . "'";
}
function quote_ident( $s ) {
return $s;
}
- /* For now, does nothing */
- function selectDB( $db ) {
- return true;
- }
-
function selectRow( $table, $vars, $conds, $fname = 'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) {
- if (is_array($table))
- foreach ($table as $tab)
- $tab = $this->tableName($tab);
- else
- $table = $this->tableName($table);
- return parent::selectRow($table, $vars, $conds, $fname, $options, $join_conds);
+ global $wgLang;
+
+ $conds2 = array();
+ $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds;
+ foreach ( $conds as $col => $val ) {
+ $col_info = $this->fieldInfo( $this->tableName( $table ), $col );
+ $col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+ if ( $col_type == 'CLOB' ) {
+ $conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val );
+ } elseif ( $col_type == 'VARCHAR2' && !mb_check_encoding( $val ) ) {
+ $conds2[$col] = $wgLang->checkTitleEncoding( $val );
+ } else {
+ $conds2[$col] = $val;
+ }
+ }
+
+ if ( is_array( $table ) ) {
+ foreach ( $table as $tab ) {
+ $tab = $this->tableName( $tab );
+ }
+ } else {
+ $table = $this->tableName( $table );
+ }
+
+ return parent::selectRow( $table, $vars, $conds2, $fname, $options, $join_conds );
}
/**
}
}
- if ( isset( $options['GROUP BY'] ) ) $preLimitTail .= " GROUP BY {$options['GROUP BY']}";
- if ( isset( $options['ORDER BY'] ) ) $preLimitTail .= " ORDER BY {$options['ORDER BY']}";
+ if ( isset( $options['GROUP BY'] ) ) {
+ $preLimitTail .= " GROUP BY {$options['GROUP BY']}";
+ }
+ if ( isset( $options['ORDER BY'] ) ) {
+ $preLimitTail .= " ORDER BY {$options['ORDER BY']}";
+ }
- #if ( isset( $noKeyOptions['FOR UPDATE'] ) ) $tailOpts .= ' FOR UPDATE';
- #if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $tailOpts .= ' LOCK IN SHARE MODE';
- if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) $startOpts .= 'DISTINCT';
+ # if ( isset( $noKeyOptions['FOR UPDATE'] ) ) $tailOpts .= ' FOR UPDATE';
+ # if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) $tailOpts .= ' LOCK IN SHARE MODE';
+ if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) {
+ $startOpts .= 'DISTINCT';
+ }
if ( isset( $options['USE INDEX'] ) && ! is_array( $options['USE INDEX'] ) ) {
$useIndex = $this->useIndexClause( $options['USE INDEX'] );
return array( $startOpts, $useIndex, $preLimitTail, $postLimitTail );
}
- /* redundand ... will remove after confirming bitwise operations functionality
- public function makeList( $a, $mode = LIST_COMMA ) {
- if ( !is_array( $a ) ) {
- throw new DBUnexpectedError( $this, 'DatabaseOracle::makeList called with incorrect parameters' );
- }
- $a2 = array();
- foreach ($a as $key => $value) {
- if (strpos($key, ' & ') !== FALSE)
- $a2[preg_replace('/(.*)\s&\s(.*)/', 'BITAND($1, $2)', $key)] = $value;
- elseif (strpos($key, ' | ') !== FALSE)
- $a2[preg_replace('/(.*)\s|\s(.*)/', 'BITOR($1, $2)', $key)] = $value;
- elseif (!is_array($value)) {
- if (strpos($value, ' = ') !== FALSE) {
- if (strpos($value, ' & ') !== FALSE)
- $a2[$key] = preg_replace('/(.*)\s&\s(.*?)\s=\s(.*)/', 'BITAND($1, $2) = $3', $value);
- elseif (strpos($value, ' | ') !== FALSE)
- $a2[$key] = preg_replace('/(.*)\s|\s(.*?)\s=\s(.*)/', 'BITOR($1, $2) = $3', $value);
- else $a2[$key] = $value;
- }
- elseif (strpos($value, ' & ') !== FALSE)
- $a2[$key] = preg_replace('/(.*)\s&\s(.*)/', 'BITAND($1, $2)', $value);
- elseif (strpos($value, ' | ') !== FALSE)
- $a2[$key] = preg_replace('/(.*)\s|\s(.*)/', 'BITOR($1, $2)', $value);
- else
- $a2[$key] = $value;
- }
- else
- $a2[$key] = $value;
- }
-
- return parent::makeList($a2, $mode);
- }
- */
+ public function delete( $table, $conds, $fname = 'DatabaseOracle::delete' ) {
+ global $wgLang;
- function bitNot($field) {
- //expecting bit-fields smaller than 4bytes
- return 'BITNOT('.$bitField.')';
- }
+ if ( $wgLang != null ) {
+ $conds2 = array();
+ $conds = ($conds != null && !is_array($conds)) ? array($conds) : $conds;
+ foreach ( $conds as $col => $val ) {
+ $col_info = $this->fieldInfo( $this->tableName( $table ), $col );
+ $col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
+ if ( $col_type == 'CLOB' ) {
+ $conds2['TO_CHAR(' . $col . ')'] = $wgLang->checkTitleEncoding( $val );
+ } else {
+ if ( is_array( $val ) ) {
+ $conds2[$col] = $val;
+ foreach ( $conds2[$col] as &$val2 ) {
+ $val2 = $wgLang->checkTitleEncoding( $val2 );
+ }
+ } else {
+ $conds2[$col] = $wgLang->checkTitleEncoding( $val );
+ }
+ }
+ }
- function bitAnd($fieldLeft, $fieldRight) {
- return 'BITAND('.$fieldLeft.', '.$fieldRight.')';
+ return parent::delete( $table, $conds2, $fname );
+ } else {
+ return parent::delete( $table, $conds, $fname );
+ }
}
- function bitOr($fieldLeft, $fieldRight) {
- return 'BITOR('.$fieldLeft.', '.$fieldRight.')';
+ function bitNot( $field ) {
+ // expecting bit-fields smaller than 4bytes
+ return 'BITNOT(' . $bitField . ')';
}
- public function setTimeout( $timeout ) {
- // @todo fixme no-op
+ function bitAnd( $fieldLeft, $fieldRight ) {
+ return 'BITAND(' . $fieldLeft . ', ' . $fieldRight . ')';
}
- function ping() {
- wfDebug( "Function ping() not written for DatabaseOracle.php yet");
- return true;
+ function bitOr( $fieldLeft, $fieldRight ) {
+ return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
}
/**
return 0;
}
- function setFakeSlaveLag( $lag ) {}
- function setFakeMaster( $enabled = true ) {}
+ function setFakeSlaveLag( $lag ) { }
+ function setFakeMaster( $enabled = true ) { }
function getDBname() {
return $this->mDBname;
function getServer() {
return $this->mServer;
}
-
+
public function replaceVars( $ins ) {
- $varnames = array('wgDBprefix');
- if ($this->mFlags & DBO_SYSDBA) {
+ $varnames = array( 'wgDBprefix' );
+ if ( $this->mFlags & DBO_SYSDBA ) {
$varnames[] = 'wgDBOracleDefTS';
$varnames[] = 'wgDBOracleTempTS';
}
// Ordinary variables
foreach ( $varnames as $var ) {
- if( isset( $GLOBALS[$var] ) ) {
+ if ( isset( $GLOBALS[$var] ) ) {
$val = addslashes( $GLOBALS[$var] ); // FIXME: safety check?
$ins = str_replace( '{$' . $var . '}', $val, $ins );
$ins = str_replace( '/*$' . $var . '*/`', '`' . $val, $ins );
}
}
- return parent::replaceVars($ins);
+ return parent::replaceVars( $ins );
}
- /**
- * No-op lock functions
- */
- public function lock( $lockName, $method ) {
- return true;
- }
- public function unlock( $lockName, $method ) {
- return true;
- }
-
public function getSearchEngine() {
- return "SearchOracle";
+ return 'SearchOracle';
}
-
- /** No-op */
- public function setBigSelects( $value = true ) {}
-
} // end DatabaseOracle class
dépôts / lhc / web / wiklou.git / blobdiff