Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322651
Change subject: Clean up old unused code #2
......................................................................
Clean up old unused code #2
Oracle support has been dropped some time ago.
Change-Id: I0c063184b605273515dc50732312f75bf37db154
---
M BlueSpice.hooks.php
M includes/AutoLoader.php
D includes/db/BSOracleHooks.php
D includes/db/DatabaseOracleBase.php
D includes/db/DatabaseOraclePost120.php
D includes/db/DatabaseOraclePre120.php
D includes/db/OracleUpdater.php
D includes/db/oracle.fixes_and_changes.sql
8 files changed, 1 insertion(+), 1,559 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/51/322651/1
diff --git a/BlueSpice.hooks.php b/BlueSpice.hooks.php
index 12f9235..535c132 100644
--- a/BlueSpice.hooks.php
+++ b/BlueSpice.hooks.php
@@ -4,11 +4,3 @@
// START cache invalidation hooks
$wgHooks['PageContentSaveComplete'][] =
'BsCacheHelper::onPageContentSaveComplete';
// END cache invalidation hooks
-
-if ( !isset( $wgHooks['EditPage::showEditForm:initial'] ) ) {
- $wgHooks['EditPage::showEditForm:initial'] = array();
-}
-
-if ( $wgDBtype == 'oracle' ) {
- $wgHooks['ArticleDelete'][] = 'BSOracleHooks::onArticleDelete';
-}
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 0b598fd..73a2301 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -11,12 +11,4 @@
$GLOBALS['wgAutoloadClasses']['BsSTYLEMEDIA'] = __DIR__."/Common.php";
$GLOBALS['wgAutoloadClasses']['EXTINFO'] = __DIR__."/Common.php";
$GLOBALS['wgAutoloadClasses']['EXTTYPE'] = __DIR__."/Common.php";
-$GLOBALS['wgAutoloadClasses']['BsExtensionManager'] =
__DIR__."/ExtensionManager.class.php";
-
-//TODO: Remove this
-if ( version_compare( $wgVersion, '1.19.0', '>' ) ) {
- $GLOBALS['wgAutoloadClasses']['DatabaseOracle'] =
__DIR__."/db/DatabaseOraclePost120.php";
- $GLOBALS['wgAutoloadClasses']['OracleUpdater'] =
__DIR__."/db/OracleUpdater.php";
-} else {
- $GLOBALS['wgAutoloadClasses']['DatabaseOracle'] =
__DIR__."/db/DatabaseOraclePre120.php";
-}
+$GLOBALS['wgAutoloadClasses']['BsExtensionManager'] =
__DIR__."/ExtensionManager.class.php";
\ No newline at end of file
diff --git a/includes/db/BSOracleHooks.php b/includes/db/BSOracleHooks.php
deleted file mode 100644
index 2668a33..0000000
--- a/includes/db/BSOracleHooks.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class BSOracleHooks {
- /**
- * PW(26.06.2012): prevents crash on oracle/postgres when reason gets
to
- * long mysql ignores to long string by default
- * @param Article $article
- * @param User $user
- * @param string $reason
- * @param type $error
- * @return boolean Always true to keep hook running
- */
- public static function onArticleDelete(&$article, &$user, &$reason,
&$error) {
- if (strlen($reason) > 255) {
- $reason = substr($reason, 0, 255);
- }
- return true;
- }
-}
\ No newline at end of file
diff --git a/includes/db/DatabaseOracleBase.php
b/includes/db/DatabaseOracleBase.php
deleted file mode 100644
index f5795d5..0000000
--- a/includes/db/DatabaseOracleBase.php
+++ /dev/null
@@ -1,1235 +0,0 @@
-<?php
-/**
- * This is the Oracle database abstraction layer.
- *
- * @file
- * @ingroup Database
- */
-
-/**
- * @ingroup Database
- */
-class DatabaseOracleBase extends DatabaseBase {
- 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 __construct( $server = false, $user = false, $password =
false, $dbName = false,
- $flags = 0, $tablePrefix = 'get from global' )
- {
- $tablePrefix = $tablePrefix == 'get from global' ? $tablePrefix
: strtoupper( $tablePrefix );
- parent::__construct( $server, $user, $password, $dbName,
$flags, $tablePrefix );
- wfRunHooks( 'DatabaseOraclePostInit', array( $this ) );
- }
-
- function __destruct() {
- if ($this->mOpened) {
- wfSuppressWarnings();
- $this->close();
- wfRestoreWarnings();
- }
- }
-
- function getType() {
- return 'oracle';
- }
-
- function cascadingDeletes() {
- return true;
- }
- function cleanupTriggers() {
- return true;
- }
- function strictIPs() {
- return true;
- }
- function realTimestamps() {
- return true;
- }
- function implicitGroupby() {
- return false;
- }
- function implicitOrderby() {
- return false;
- }
- function searchableIPs() {
- return true;
- }
-
- static function newFromParams( $server, $user, $password, $dbName,
$flags = 0 )
- {
- return new DatabaseOracle( $server, $user, $password, $dbName,
$flags );
- }
-
- /**
- * Usually aborts on failure
- */
- function open( $server, $user, $password, $dbName ) {
- 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"
);
- }
-
- $this->mUser = $user;
- $this->mPassword = $password;
- // changed internal variables functions
- // mServer now holds the TNS endpoint
- // mDBname is schema name if different from username
- if ( !$server ) {
- // backward compatibillity (server used to be null and
TNS was supplied in dbname)
- $this->mServer = $dbName;
- $this->mDBname = $user;
- } else {
- $this->mServer = $server;
- if ( !$dbName ) {
- $this->mDBname = $user;
- } else {
- $this->mDBname = $dbName;
- }
- }
-
- if ( !strlen( $user ) ) { # e.g. the class is being loaded
- return;
- }
-
- $session_mode = $this->mFlags & DBO_SYSDBA ? OCI_SYSDBA :
OCI_DEFAULT;
- if ( $this->mFlags & DBO_DEFAULT ) {
- $this->mConn = oci_new_connect( $this->mUser,
$this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
- } else {
- $this->mConn = oci_connect( $this->mUser,
$this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
- }
-
- if ( $this->mUser != $this->mDBname ) {
- //change current schema in session
- $this->selectDB( $this->mDBname );
- }
-
- if ( !$this->mConn ) {
- throw new DBConnectionError( $this, $this->lastError()
);
- }
-
- $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\'' );
- $this->doQuery( 'ALTER SESSION SET
NLS_NUMERIC_CHARACTERS=\'.,\'' );
-
- return $this->mConn;
- }
-
- /**
- * Closes a database connection, if it is open
- * Returns success, true if already closed
- */
- function close() {
- $this->mOpened = false;
- if ( $this->mConn ) {
- if ( $this->mTrxLevel ) {
- $this->commit();
- }
- return oci_close( $this->mConn );
- } else {
- return true;
- }
- }
-
- protected function closeConnection(){
- return true;
- }
-
- function execFlags() {
- 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\n$sql"
);
- }
-
- // handle some oracle specifics
- // remove AS column/table/subquery namings
- if( !$this->getFlag( DBO_DDLMODE ) ) {
- $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 );
-
- wfSuppressWarnings();
-
- if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn,
$sql ) ) === false ) {
- $e = oci_error( $this->mConn );
- $this->reportQueryError( $e['message'], $e['code'],
$sql, __METHOD__ );
- return false;
- }
-
- if ( !oci_execute( $stmt, $this->execFlags() ) ) {
- $e = oci_error( $stmt );
- if ( !$this->ignore_DUP_VAL_ON_INDEX || $e['code'] !=
'1' ) {
- $this->reportQueryError( $e['message'],
$e['code'], $sql, __METHOD__ );
- return false;
- }
- }
-
- 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 );
- } else {
- $this->mAffectedRows = oci_num_rows( $stmt );
- return true;
- }
- }
-
- function queryIgnore( $sql, $fname = '' ) {
- return $this->query( $sql, $fname, true );
- }
-
- function freeResult( $res ) {
- if ( $res instanceof ResultWrapper ) {
- $res = $res->result;
- }
-
- $res->free();
- }
-
- function fetchObject( $res ) {
- if ( $res instanceof ResultWrapper ) {
- $res = $res->result;
- }
-
- return $res->fetchObject();
- }
-
- function fetchRow( $res ) {
- if ( $res instanceof ResultWrapper ) {
- $res = $res->result;
- }
-
- return $res->fetchRow();
- }
-
- function numRows( $res ) {
- if ( $res instanceof ResultWrapper ) {
- $res = $res->result;
- }
-
- return $res->numRows();
- }
-
- function numFields( $res ) {
- if ( $res instanceof ResultWrapper ) {
- $res = $res->result;
- }
-
- return $res->numFields();
- }
-
- function fieldName( $stmt, $n ) {
- return oci_field_name( $stmt, $n );
- }
-
- /**
- * This must be called after nextSequenceVal
- */
- function insertId() {
- return $this->mInsertId;
- }
-
- function dataSeek( $res, $row ) {
- if ( $res instanceof ORAResult ) {
- $res->seek( $row );
- } else {
- $res->result->seek( $row );
- }
- }
-
- function lastError() {
- if ( $this->mConn === false ) {
- $e = oci_error();
- } else {
- $e = oci_error( $this->mConn );
- }
- return $e['message'];
- }
-
- function lastErrno() {
- if ( $this->mConn === false ) {
- $e = oci_error();
- } else {
- $e = oci_error( $this->mConn );
- }
- return $e['code'];
- }
-
- function affectedRows() {
- return $this->mAffectedRows;
- }
-
- /**
- * Returns information about an index
- * If errors are explicitly ignored, returns NULL on failure
- */
- //HW: Auskommentiert, da ansonsten Fehler bei der update.php
- function indexInfo( $table, $field, $fname =
'DatabaseOracle::indexExists' ) {
- /*$tmpFieldInfo = $this->fieldInfo($table, $field);
- if($tmpFieldInfo && is_object($tmpFieldInfo)) {
- if($tmpFieldInfo->isKey()) {
- return true;
- }
- }*/
- return true;
- }
- //HW: Auskommentiert, da ansonsten Fehler bei der update.php
- function indexUnique( $table, $field, $fname =
'DatabaseOracle::indexUnique' ) {
- /*$tmpFieldInfo = $this->fieldInfo($table, $field);
- if($tmpFieldInfo && is_object($tmpFieldInfo)) {
- if($tmpFieldInfo->isKey() &&
!$tmpFieldInfo->isMultipleKey()) {
- return true;
- }
- }*/
- return true;
- }
-
- function insert( $table, $a, $fname = 'DatabaseOracle::insert',
$options = array() ) {
- if ( !count( $a ) ) {
- return true;
- }
-
- if ( !is_array( $options ) ) {
- $options = array( $options );
- }
-
- if ( in_array( 'IGNORE', $options ) ) {
- $this->ignore_DUP_VAL_ON_INDEX = true;
- }
-
- if ( !is_array( reset( $a ) ) ) {
- $a = array( $a );
- }
-
- foreach ( $a as &$row ) {
- $this->insertOneRow( $table, $row, $fname );
- }
- $retVal = true;
-
- if ( in_array( 'IGNORE', $options ) ) {
- $this->ignore_DUP_VAL_ON_INDEX = false;
- }
-
- return $retVal;
- }
-
- private function fieldBindStatement ( $table, $col, &$val, $includeCol
= false ) {
- $col_info = $this->fieldInfoMulti( $table, $col );
- $col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
-
- $bind = '';
- if ( is_numeric( $col ) ) {
- $bind = $val;
- $val = null;
- return $bind;
- } else if ( $includeCol ) {
- $bind = "$col = ";
- }
-
- if ( $val == '' && $val !== 0 && $col_type != 'BLOB' &&
$col_type != 'CLOB' ) {
- $val = null;
- }
-
- if ( $val === 'NULL' ) {
- $val = null;
- }
-
- if ( $val === null ) {
- if ( $col_info != false && $col_info->isNullable() == 0
&& $col_info->defaultValue() != null ) {
- $bind .= 'DEFAULT';
- } else {
- $bind .= 'NULL';
- }
- } else {
- $bind .= ':' . $col;
- }
-
- return $bind;
- }
-
- private function insertOneRow( $table, $row, $fname ) {
- global $wgContLang;
-
- $table = $this->tableName( $table );
- // "INSERT INTO tables (a, b, c)"
- $sql = "INSERT INTO " . $table . " (" . join( ',', array_keys(
$row ) ) . ')';
- $sql .= " VALUES (";
-
- // for each value, append ":key"
- $first = true;
- foreach ( $row as $col => &$val ) {
- if ( !$first ) {
- $sql .= ', ';
- } else {
- $first = false;
- }
-
- $sql .= $this->fieldBindStatement( $table, $col, $val );
- }
- $sql .= ')';
-
- if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn,
$sql ) ) === false ) {
- $e = oci_error( $this->mConn );
- $this->reportQueryError( $e['message'], $e['code'],
$sql, __METHOD__ );
- return false;
- }
- foreach ( $row as $col => &$val ) {
- $col_info = $this->fieldInfoMulti( $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->fetch();
- }
-
- if ( preg_match( '/^timestamp.*/i', $col_type )
== 1 && strtolower( $val ) == 'infinity' ) {
- $val = '31-12-2030 12:00:00.000000';
- }
-
- $val = ( $wgContLang != null ) ?
$wgContLang->checkTitleEncoding( $val ) : $val;
- if ( oci_bind_by_name( $stmt, ":$col", $val )
=== false ) {
- $e = oci_error( $stmt );
- $this->reportQueryError( $e['message'],
$e['code'], $sql, __METHOD__ );
- return false;
- }
- } 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 ( is_object( $val ) ) {
- $val = $val->fetch();
- }
-
- if ( $col_type == 'BLOB' ) {
- $lob[$col]->writeTemporary( $val,
OCI_TEMP_BLOB );
- oci_bind_by_name( $stmt, ":$col",
$lob[$col], - 1, OCI_B_BLOB );
- } else {
- $lob[$col]->writeTemporary( $val,
OCI_TEMP_CLOB );
- oci_bind_by_name( $stmt, ":$col",
$lob[$col], - 1, OCI_B_CLOB );
- }
- }
- }
-
- wfSuppressWarnings();
-
- 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, __METHOD__ );
- return false;
- } else {
- $this->mAffectedRows = oci_num_rows( $stmt );
- }
- } else {
- $this->mAffectedRows = oci_num_rows( $stmt );
- }
-
- wfRestoreWarnings();
-
- if ( isset( $lob ) ) {
- foreach ( $lob as $lob_v ) {
- $lob_v->free();
- }
- }
-
- 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 ) ) {
- $selectOptions = array( $selectOptions );
- }
- list( $startOpts, $useIndex, $tailOpts ) =
$this->makeSelectOptions( $selectOptions );
- 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 &$val ) {
- $val = $val . ' field' . ( $i++ );
- }
-
- $sql = "INSERT INTO $destTable (" . implode( ',', array_keys(
$varMap ) ) . ')' .
- " SELECT $startOpts " . implode( ',', $varMap ) .
- " FROM $srcTable $useIndex ";
- if ( $conds != '*' ) {
- $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
- }
- $sql .= " $tailOpts";
-
- if ( in_array( 'IGNORE', $insertOptions ) ) {
- $this->ignore_DUP_VAL_ON_INDEX = true;
- }
-
- $retval = $this->query( $sql, $fname );
-
- if ( in_array( 'IGNORE', $insertOptions ) ) {
- $this->ignore_DUP_VAL_ON_INDEX = false;
- }
-
- return $retval;
- }
-
- function tableName( $name, $format = 'quoted' ) {
- global $wgSharedDB, $wgSharedPrefix, $wgSharedTables;
- /*
- Replace reserved words with better ones
- Using uppercase because that's the only way Oracle can handle
- quoted tablenames
- */
- switch( $name ) {
- case 'user':
- $name = 'MWUSER';
- break;
- case 'text':
- $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;
- }
- $dbDetails = array_reverse( explode( '.', $name, 2 ) );
- 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 )
- ) {
- $database = $wgSharedDB;
- $prefix = isset( $wgSharedPrefix ) ? $wgSharedPrefix
: $prefix;
- }
-
- if ( isset( $database ) ) {
- $database = ( $database[0] == '"' ? $database :
"\"{$database}\"" );
- }
- $table = ( $table[0] == '"') ? $table : "\"{$prefix}{$table}\""
;
-
- $tableName = ( isset( $database ) ? "{$database}.{$table}" :
"{$table}" );
-
- return strtoupper( $tableName );
- }
-
- function tableNameInternal( $name ) {
- $name = $this->tableName( $name );
- return preg_replace( '/.*\."(.*)"/', '$1', $name);
- }
-
- /**
- * 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 );
- $this->mInsertId = $row[0];
- return $this->mInsertId;
- }
-
- /**
- * Return sequence_name if table has a sequence
- */
- private function getSequenceData( $table ) {
- if ( $this->sequenceData == null ) {
- $result = $this->doQuery( '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
- * Oracle simulates this with a DELETE followed by INSERT
- * $row is the row to insert, an associative array
- * $uniqueIndexes is an array of indexes. Each element may be either a
- * field name or an array of field names
- *
- * It may be more efficient to leave off unique indexes which are
unlikely to collide.
- * However if you do this, you run the risk of encountering errors
which wouldn't have
- * occurred in MySQL.
- *
- * @param $table String: table name
- * @param $uniqueIndexes Array: array of indexes. Each element may be
- * either a field name or an array of field names
- * @param $rows Array: rows to insert to $table
- * @param $fname String: function name, you can use __METHOD__ here
- */
- function replace( $table, $uniqueIndexes, $rows, $fname =
'DatabaseOracle::replace' ) {
- $table = $this->tableName( $table );
-
- if ( count( $rows ) == 0 ) {
- return;
- }
-
- # Single row case
- if ( !is_array( reset( $rows ) ) ) {
- $rows = array( $rows );
- }
-
- $sequenceData = $this->getSequenceData( $table );
-
- foreach ( $rows as $row ) {
- # Delete rows which collide
- if ( $uniqueIndexes ) {
- $deleteConds = array();
- foreach ( $uniqueIndexes as $key=>$index ) {
- if ( is_array( $index ) ) {
- $deleteConds2 = array();
- foreach ( $index as $col ) {
- $deleteConds2[$col] =
$row[$col];
- }
- $deleteConds[$key] =
$this->makeList( $deleteConds2, LIST_AND );
- } else {
- $deleteConds[$index] =
$row[$index];
- }
- }
- $deleteConds = array( $this->makeList(
$deleteConds, LIST_OR ) );
- $this->delete( $table, $deleteConds, $fname );
- }
-
-
- if ( $sequenceData !== false && !isset(
$row[$sequenceData['column']] ) ) {
- $row[$sequenceData['column']] =
$this->nextSequenceValue( $sequenceData['sequence'] );
- }
-
- # Now insert the row
- $this->insert( $table, $row, $fname );
- }
- }
-
- # 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' );
- }
-
- $delTable = $this->tableName( $delTable );
- $joinTable = $this->tableName( $joinTable );
- $sql = "DELETE FROM $delTable WHERE $delVar IN (SELECT $joinVar
FROM $joinTable ";
- if ( $conds != '*' ) {
- $sql .= 'WHERE ' . $this->makeList( $conds, LIST_AND );
- }
- $sql .= ')';
-
- $this->query( $sql, $fname );
- }
-
- # Returns the size of a text field, or -1 for "unlimited"
- function textFieldSize( $table, $field ) {
- $fieldInfoData = $this->fieldInfo( $table, $field );
- return $fieldInfoData->maxLength();
- }
-
- 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 encodeBlob( $b ) {
- return new Blob( $b );
- }
-
- function decodeBlob( $b ) {
- if ( $b instanceof Blob ) {
- $b = $b->fetch();
- }
- return $b;
- }
-
- function unionQueries( $sqls, $all ) {
- $glue = ' UNION ALL ';
- return 'SELECT * ' . ( $all ? '':'/* UNION_UNIQUE */ ' ) .
'FROM (' . implode( $glue, $sqls ) . ')' ;
- }
-
- public function unixTimestamp( $field ) {
- return "((trunc($field) - to_date('19700101','YYYYMMDD')) *
86400)";
- }
-
- function wasDeadlock() {
- return $this->lastErrno() == 'OCI-00060';
- }
-
- function duplicateTableStructure( $oldName, $newName, $temporary =
false, $fname = 'DatabaseOracle::duplicateTableStructure' ) {
- global $wgDBprefix;
-
- $temporary = $temporary ? 'TRUE' : 'FALSE';
-
- $newName = trim( strtoupper( $newName ), '"');
- $oldName = trim( strtoupper( $oldName ), '"');
-
- $tabName = substr( $newName, strlen( $wgDBprefix ) );
- $oldPrefix = substr( $oldName, 0, strlen( $oldName ) - strlen(
$tabName ) );
-
- return $this->doQuery( 'BEGIN DUPLICATE_TABLE(\'' . $tabName .
'\', \'' . $oldPrefix . '\', \'' . strtoupper( $wgDBprefix ) . '\', ' .
$temporary . '); END;' );
- }
-
- function listTables( $prefix = null, $fname =
'DatabaseOracle::listTables' ) {
- $listWhere = '';
- if (!empty($prefix)) {
- $listWhere = ' AND table_name LIKE
\''.strtoupper($prefix).'%\'';
- }
-
- $result = $this->doQuery( "SELECT table_name FROM user_tables
WHERE table_name NOT LIKE '%!_IDX$_' ESCAPE '!' $listWhere" );
-
- // dirty code ... i know
- $endArray = array();
- $endArray[] = $prefix.'MWUSER';
- $endArray[] = $prefix.'PAGE';
- $endArray[] = $prefix.'IMAGE';
- $fixedOrderTabs = $endArray;
- while (($row = $result->fetchRow()) !== false) {
- if (!in_array($row['table_name'], $fixedOrderTabs))
- $endArray[] = $row['table_name'];
- }
-
- return $endArray;
- }
-
- public function dropTable( $tableName, $fName =
'DatabaseOracle::dropTable' ) {
- $tableName = $this->tableName($tableName);
- if( !$this->tableExists( $tableName ) ) {
- return false;
- }
-
- return $this->doQuery( "DROP TABLE $tableName CASCADE
CONSTRAINTS PURGE" );
- }
-
- function timestamp( $ts = 0 ) {
- return wfTimestamp( TS_ORACLE, $ts );
- }
-
- /**
- * Return aggregated value function call
- */
- function aggregateValue ( $valuedata, $valuename = 'value' ) {
- return $valuedata;
- }
-
- function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore =
false ) {
- # Ignore errors during error handling to avoid infinite
- # recursion
- $ignore = $this->ignoreErrors( true );
- ++$this->mErrorCount;
-
- if ( $ignore || $tempIgnore ) {
- wfDebug( "SQL ERROR (ignored): $error\n" );
- $this->ignoreErrors( $ignore );
- } else {
- throw new DBQueryError( $this, $error, $errno, $sql,
$fname );
- }
- }
-
- /**
- * @return string wikitext of a link to the server software's web site
- */
- public static function getSoftwareLink() {
- return '[http://www.oracle.com/ Oracle]';
- }
-
- /**
- * @return string Version information from the database
- */
- function getServerVersion() {
- //better version number, fallback on driver
- $rset = $this->doQuery( 'SELECT version FROM
product_component_version WHERE UPPER(product) LIKE \'ORACLE DATABASE%\'' );
- if ( !( $row = $rset->fetchRow() ) ) {
- return oci_server_version( $this->mConn );
- }
- return $row['version'];
- }
-
- /**
- * Query whether a given table exists (in the given schema, or the
default mw one if not given)
- */
- function tableExists( $table, $fname = __METHOD__) {
- $table = $this->addQuotes( trim( $this->tableName($table), '"'
) );
- $owner = $this->addQuotes( strtoupper( $this->mDBname ) );
- $SQL = "SELECT 1 FROM all_tables WHERE owner=$owner AND
table_name=$table";
- $res = $this->doQuery( $SQL );
- if ( $res ) {
- $count = $res->numRows();
- $res->free();
- } else {
- $count = 0;
- }
- return $count!=0;
- }
-
- /**
- * Function translates mysql_fetch_field() functionality on ORACLE.
- * Caching is present for reducing query time.
- * For internal calls. Use fieldInfo for normal usage.
- * Returns false if the field doesn't exist
- *
- * @param $table Array
- * @param $field String
- */
- private function fieldInfoMulti( $table, $field ) {
- $field = strtoupper( $field );
- if ( is_array( $table ) ) {
- $table = array_map( array( &$this, 'tableNameInternal'
), $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( $this->tableNameInternal(
$table ), '"' ) );
- if ( isset( $this->mFieldInfoCache["$table.$field"] ) )
{
- return $this->mFieldInfoCache["$table.$field"];
- }
- $tableWhere = '= \''.$table.'\'';
- }
-
- $fieldInfoStmt = oci_parse( $this->mConn, 'SELECT * FROM
wiki_field_info_full WHERE table_name '.$tableWhere.' and column_name =
\''.$field.'\'' );
- if ( oci_execute( $fieldInfoStmt, $this->execFlags() ) ===
false ) {
- $e = oci_error( $fieldInfoStmt );
- $this->reportQueryError( $e['message'], $e['code'],
'fieldInfo QUERY', __METHOD__ );
- return false;
- }
- $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;
- }
- $fieldInfoTemp = null;
- } else {
- $fieldInfoTemp = new ORAField( $res->fetchRow() );
- $table = $fieldInfoTemp->tableName();
- $this->mFieldInfoCache["$table.$field"] =
$fieldInfoTemp;
- }
- $res->free();
- return $fieldInfoTemp;
- }
-
- function fieldInfo( $table, $field ) {
- if ( is_array( $table ) ) {
- throw new DBUnexpectedError( $this,
'DatabaseOracle::fieldInfo called with table array!' );
- }
- return $this->fieldInfoMulti ($table, $field);
- }
-
- /* Not even sure why this is used in the main codebase... */
- function limitResultForUpdate( $sql, $num ) {
- return $sql;
- }
-
- /* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}';
*/
- function sourceStream( $fp, $lineCallback = false, $resultCallback =
false, $fname = 'DatabaseOracle::sourceStream', $inputCallback = false ) {
- $cmd = '';
- $done = false;
- $dollarquote = false;
-
- $replacements = array();
-
- while ( ! feof( $fp ) ) {
- if ( $lineCallback ) {
- call_user_func( $lineCallback );
- }
- $line = trim( fgets( $fp, 1024 ) );
- $sl = strlen( $line ) - 1;
-
- if ( $sl < 0 ) {
- continue;
- }
- if ( '-' == $line { 0 } && '-' == $line { 1 } ) {
- continue;
- }
-
- // Allow dollar quoting for function declarations
- if ( substr( $line, 0, 8 ) == '/*$mw$*/' ) {
- if ( $dollarquote ) {
- $dollarquote = false;
- $line = str_replace( '/*$mw$*/', '',
$line ); // remove dollarquotes
- $done = true;
- } else {
- $dollarquote = true;
- }
- } elseif ( !$dollarquote ) {
- if ( ';' == $line { $sl } && ( $sl < 2 || ';'
!= $line { $sl - 1 } ) ) {
- $done = true;
- $line = substr( $line, 0, $sl );
- }
- }
-
- 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 ) ) {
- $replacements[$defines[2]] =
$defines[1];
- }
- } else {
- foreach ( $replacements as $mwVar =>
$scVar ) {
- //HW: Ersetzung falsch...
- //$cmd = str_replace( '&' .
$scVar . '.', '`{$' . $mwVar . '}`', $cmd );
- $cmd = str_replace( '&' . $scVar . '.', '/*$' . $mwVar
. '*/', $cmd );
- }
-
- $cmd = $this->replaceVars( $cmd );
- $res = $this->doQuery( $cmd );
- if ( $resultCallback ) {
- call_user_func(
$resultCallback, $res, $this );
- }
-
- if ( false === $res ) {
- $err = $this->lastError();
- return "Query \"{$cmd}\" failed
with error code \"$err\".\n";
- }
- }
-
- $cmd = '';
- $done = false;
- }
- }
- return true;
- }
-
- function selectDB( $db ) {
- $this->mDBname = $db;
- if ( $db == null || $db == $this->mUser ) {
- return true;
- }
- $sql = 'ALTER SESSION SET CURRENT_SCHEMA=' . strtoupper($db);
- $stmt = oci_parse( $this->mConn, $sql );
- wfSuppressWarnings();
- $success = oci_execute( $stmt );
- wfRestoreWarnings();
- if ( !$success ) {
- $e = oci_error( $stmt );
- if ( $e['code'] != '1435' ) {
- $this->reportQueryError( $e['message'],
$e['code'], $sql, __METHOD__ );
- }
- return false;
- }
- return true;
- }
-
- function strencode( $s ) {
- return str_replace( "'", "''", $s );
- }
-
- function addQuotes( $s ) {
- global $wgContLang;
- if ( isset( $wgContLang->mLoaded ) && $wgContLang->mLoaded ) {
- $s = $wgContLang->checkTitleEncoding( $s );
- }
- return "'" . $this->strencode( $s ) . "'";
- }
-
- public function addIdentifierQuotes( $s ) {
- if ( !$this->mFlags & DBO_DDLMODE ) {
- $s = '"' . str_replace( '"', '""', $s ) . '"';
- }
- return $s;
- }
-
- private function wrapFieldForWhere( $table, &$col, &$val ) {
- global $wgContLang;
-
- $col_info = $this->fieldInfoMulti( $table, $col );
- $col_type = $col_info != false ? $col_info->type() : 'CONSTANT';
- if ( $col_type == 'CLOB' ) {
- $col = 'TO_CHAR(' . $col . ')';
- $val = $wgContLang->checkTitleEncoding( $val );
- } elseif ( $col_type == 'VARCHAR2' && !mb_check_encoding( $val
) ) {
- $val = $wgContLang->checkTitleEncoding( $val );
- }
- }
-
- private function wrapConditionsForWhere ( $table, $conds, $parentCol =
null ) {
- $conds2 = array();
- foreach ( $conds as $col => $val ) {
- if ( is_array( $val ) ) {
- $conds2[$col] = $this->wrapConditionsForWhere (
$table, $val, $col );
- } else {
- if ( is_numeric( $col ) && $parentCol != null )
{
- $this->wrapFieldForWhere ( $table,
$parentCol, $val );
- } else {
- $this->wrapFieldForWhere ( $table,
$col, $val );
- }
- $conds2[$col] = $val;
- }
- }
- return $conds2;
- }
-
- function selectRow( $table, $vars, $conds, $fname =
'DatabaseOracle::selectRow', $options = array(), $join_conds = array() ) {
- if ( is_array($conds) ) {
- $conds = $this->wrapConditionsForWhere( $table, $conds
);
- }
- return parent::selectRow( $table, $vars, $conds, $fname,
$options, $join_conds );
- }
-
- /**
- * Returns an optional USE INDEX clause to go after the table, and a
- * string to go at the end of the query
- *
- * @private
- *
- * @param $options Array: an associative array of options to be turned
into
- * an SQL query, valid keys are listed in the function.
- * @return array
- */
- function makeSelectOptions( $options ) {
- $preLimitTail = $postLimitTail = '';
- $startOpts = '';
-
- $noKeyOptions = array();
- foreach ( $options as $key => $option ) {
- if ( is_numeric( $key ) ) {
- $noKeyOptions[$option] = true;
- }
- }
-
- if ( isset( $options['GROUP BY'] ) ) {
- $gb = is_array( $options['GROUP BY'] )
- ? implode( ',', $options['GROUP BY'] )
- : $options['GROUP BY'];
- $preLimitTail .= " GROUP BY {$gb}";
- }
-
- if ( isset( $options['HAVING'] ) ) {
- $having = is_array( $options['HAVING'] )
- ? $this->makeList( $options['HAVING'], LIST_AND
)
- : $options['HAVING'];
- $preLimitTail .= " HAVING {$having}";
- }
-
- if ( isset( $options['ORDER BY'] ) ) {
- $ob = is_array( $options['ORDER BY'] )
- ? implode( ',', $options['ORDER BY'] )
- : $options['ORDER BY'];
- $preLimitTail .= " ORDER BY {$ob}";
- }
-
- if ( isset( $noKeyOptions['FOR UPDATE'] ) ) {
- $postLimitTail .= ' FOR UPDATE';
- }
-
- 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'] );
- } else {
- $useIndex = '';
- }
-
- return array( $startOpts, $useIndex, $preLimitTail,
$postLimitTail );
- }
-
- public function delete( $table, $conds, $fname =
'DatabaseOracle::delete' ) {
- if ( is_array($conds) ) {
- $conds = $this->wrapConditionsForWhere( $table, $conds
);
- }
- return parent::delete( $table, $conds, $fname );
- }
-
- function update( $table, $values, $conds, $fname =
'DatabaseOracle::update', $options = array() ) {
- global $wgContLang;
-
- $table = $this->tableName( $table );
- $opts = $this->makeUpdateOptions( $options );
- $sql = "UPDATE $opts $table SET ";
-
- $first = true;
- foreach ( $values as $col => &$val ) {
- $sqlSet = $this->fieldBindStatement( $table, $col,
$val, true );
-
- if ( !$first ) {
- $sqlSet = ', ' . $sqlSet;
- } else {
- $first = false;
- }
- $sql .= $sqlSet;
- }
-
- if ( $conds !== array() && $conds != '*' ) {
- $conds = $this->wrapConditionsForWhere( $table, $conds
);
- $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
- }
-
- if ( ( $this->mLastResult = $stmt = oci_parse( $this->mConn,
$sql ) ) === false ) {
- $e = oci_error( $this->mConn );
- $this->reportQueryError( $e['message'], $e['code'],
$sql, __METHOD__ );
- return false;
- }
- foreach ( $values as $col => &$val ) {
- $col_info = $this->fieldInfoMulti( $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' ) {
- $val = '31-12-2030 12:00:00.000000';
- }
-
- $val = ( $wgContLang != null ) ?
$wgContLang->checkTitleEncoding( $val ) : $val;
- if ( oci_bind_by_name( $stmt, ":$col", $val )
=== false ) {
- $e = oci_error( $stmt );
- $this->reportQueryError( $e['message'],
$e['code'], $sql, __METHOD__ );
- return false;
- }
- } 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 ( $col_type == 'BLOB' ) {
- $lob[$col]->writeTemporary( $val );
- 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 );
- }
- }
- }
-
- wfSuppressWarnings();
-
- 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, __METHOD__ );
- return false;
- } else {
- $this->mAffectedRows = oci_num_rows( $stmt );
- }
- } else {
- $this->mAffectedRows = oci_num_rows( $stmt );
- }
-
- wfRestoreWarnings();
-
- if ( isset( $lob ) ) {
- foreach ( $lob as $lob_v ) {
- $lob_v->free();
- }
- }
-
- if ( !$this->mTrxLevel ) {
- oci_commit( $this->mConn );
- }
-
- oci_free_statement( $stmt );
- }
-
- function bitNot( $field ) {
- // expecting bit-fields smaller than 4bytes
- return 'BITNOT(' . $field . ')';
- }
-
- function bitAnd( $fieldLeft, $fieldRight ) {
- return 'BITAND(' . $fieldLeft . ', ' . $fieldRight . ')';
- }
-
- function bitOr( $fieldLeft, $fieldRight ) {
- return 'BITOR(' . $fieldLeft . ', ' . $fieldRight . ')';
- }
-
- function setFakeMaster( $enabled = true ) { }
-
- function getDBname() {
- return $this->mDBname;
- }
-
- function getServer() {
- return $this->mServer;
- }
-
- public function getSearchEngine() {
- return 'SearchOracle';
- }
-} // end DatabaseOracle class
\ No newline at end of file
diff --git a/includes/db/DatabaseOraclePost120.php
b/includes/db/DatabaseOraclePost120.php
deleted file mode 100644
index 050791b..0000000
--- a/includes/db/DatabaseOraclePost120.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-class DatabaseOracle extends DatabaseOracleBase{
-
- function doBegin( $fname = 'DatabaseOracle::begin' ) {
- $this->mTrxLevel = 1;
- }
-
- function doCommit( $fname = 'DatabaseOracle::commit' ) {
- if ( $this->mTrxLevel ) {
- oci_commit( $this->mConn );
- $this->mTrxLevel = 0;
- }
- }
-
- function doRollback( $fname = 'DatabaseOracle::rollback' ) {
- if ( $this->mTrxLevel ) {
- oci_rollback( $this->mConn );
- $this->mTrxLevel = 0;
- }
- }
-}
\ No newline at end of file
diff --git a/includes/db/DatabaseOraclePre120.php
b/includes/db/DatabaseOraclePre120.php
deleted file mode 100644
index 9121026..0000000
--- a/includes/db/DatabaseOraclePre120.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-class DatabaseOracle extends DatabaseOracleBase{
-
- function begin( $fname = 'DatabaseOracle::begin' ) {
- $this->mTrxLevel = 1;
- }
-
- function commit( $fname = 'DatabaseOracle::commit' ) {
- if ( $this->mTrxLevel ) {
- oci_commit( $this->mConn );
- $this->mTrxLevel = 0;
- }
- }
-
- function rollback( $fname = 'DatabaseOracle::rollback' ) {
- if ( $this->mTrxLevel ) {
- oci_rollback( $this->mConn );
- $this->mTrxLevel = 0;
- }
- }
-}
\ No newline at end of file
diff --git a/includes/db/OracleUpdater.php b/includes/db/OracleUpdater.php
deleted file mode 100644
index 623a4df..0000000
--- a/includes/db/OracleUpdater.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * Oracle-specific updater.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Deployment
- */
-
-/**
- * Class for handling updates to Oracle databases.
- *
- * @ingroup Deployment
- * @since 1.17
- */
-class OracleUpdater extends DatabaseUpdater {
-
- /**
- * Handle to the database subclass
- *
- * @var DatabaseOracle
- */
- protected $db;
-
- protected function getCoreUpdateList() {
- return array(
- // 1.17
- array( 'doNamespaceDefaults' ),
- array( 'doFKRenameDeferr' ),
- array( 'doFunctions17' ),
- array( 'doSchemaUpgrade17' ),
- array( 'doInsertPage0' ),
- array( 'doRemoveNotNullEmptyDefaults' ),
- array( 'addTable', 'user_former_groups',
'patch-user_former_groups.sql' ),
-
- //1.18
- array( 'addIndex', 'user', 'i02',
'patch-user_email_index.sql' ),
- array( 'modifyField', 'user_properties', 'up_property',
'patch-up_property.sql' ),
- array( 'addTable', 'uploadstash',
'patch-uploadstash.sql' ),
- array( 'doRecentchangesFK2Cascade' ),
-
- //1.19
- array( 'addIndex', 'logging', 'i05',
'patch-logging_type_action_index.sql'),
- array( 'addField', 'revision', 'rev_sha1',
'patch-rev_sha1_field.sql' ),
- array( 'addField', 'archive', 'ar_sha1',
'patch-ar_sha1_field.sql' ),
- array( 'doRemoveNotNullEmptyDefaults2' ),
- array( 'addIndex', 'page', 'i03',
'patch-page_redirect_namespace_len.sql' ),
- array( 'modifyField', 'user_groups', 'ug_group',
'patch-ug_group-length-increase.sql' ),
- array( 'addField', 'uploadstash', 'us_chunk_inx',
'patch-us_chunk_inx_field.sql' ),
- array( 'addField', 'job', 'job_timestamp',
'patch-job_timestamp_field.sql' ),
- array( 'addIndex', 'job', 'i02',
'patch-job_timestamp_index.sql' ),
- array( 'doPageRestrictionsPKUKFix' ),
- array( 'modifyField', 'user_former_groups',
'ufg_group', 'patch-ufg_group-length-increase.sql' ),
-
- //1.20
- array( 'addIndex', 'ipblocks', 'i05',
'patch-ipblocks_i05_index.sql' ),
- array( 'addIndex', 'revision', 'i05',
'patch-revision_i05_index.sql' ),
-
- // KEEP THIS AT THE BOTTOM!!
- array( 'doRebuildDuplicateFunction' ),
-
- );
- }
-
- /**
- * MySQL uses datatype defaults for NULL inserted into NOT NULL fields
- * In namespace case that results into insert of 0 which is default
namespace
- * Oracle inserts NULL, so namespace fields should have a default value
- */
- protected function doNamespaceDefaults() {
- $meta = $this->db->fieldInfo( 'page', 'page_namespace' );
- if ( $meta->defaultValue() != null ) {
- return;
- }
-
- $this->applyPatch( 'patch_namespace_defaults.sql', false,
"Altering namespace fields with default value" );
- }
-
- /**
- * Uniform FK names + deferrable state
- */
- protected function doFKRenameDeferr() {
- $meta = $this->db->query( 'SELECT COUNT(*) cnt FROM
user_constraints WHERE constraint_type = \'R\' AND deferrable = \'DEFERRABLE\''
);
- $row = $meta->fetchRow();
- if ( $row && $row['cnt'] > 0 ) {
- return;
- }
-
- $this->applyPatch( 'patch_fk_rename_deferred.sql', false,
"Altering foreign keys ... " );
- }
-
- /**
- * Recreate functions to 17 schema layout
- */
- protected function doFunctions17() {
- $this->applyPatch( 'patch_create_17_functions.sql', false,
"Recreating functions" );
- }
-
- /**
- * Schema upgrade 16->17
- * there are no incremental patches prior to this
- */
- protected function doSchemaUpgrade17() {
- // check if iwlinks table exists which was added in 1.17
- if ( $this->db->tableExists( 'iwlinks' ) ) {
- return;
- }
- $this->applyPatch( 'patch_16_17_schema_changes.sql', false,
"Updating schema to 17" );
- }
-
- /**
- * Insert page (page_id = 0) to prevent FK constraint violation
- */
- protected function doInsertPage0() {
- $this->output( "Inserting page 0 if missing ... " );
- $row = array(
- 'page_id' => 0,
- 'page_namespace' => 0,
- 'page_title' => ' ',
- 'page_counter' => 0,
- 'page_is_redirect' => 0,
- 'page_is_new' => 0,
- 'page_random' => 0,
- 'page_touched' => $this->db->timestamp(),
- 'page_latest' => 0,
- 'page_len' => 0
- );
- $this->db->insert( 'page', $row, 'OracleUpdater:doInserPage0',
array( 'IGNORE' ) );
- $this->output( "ok\n" );
- }
-
- /**
- * Remove DEFAULT '' NOT NULL constraints from fields as '' is
internally
- * converted to NULL in Oracle
- */
- protected function doRemoveNotNullEmptyDefaults() {
- $meta = $this->db->fieldInfo( 'categorylinks' ,
'cl_sortkey_prefix' );
- if ( $meta->isNullable() ) {
- return;
- }
- $this->applyPatch( 'patch_remove_not_null_empty_defs.sql',
false, "Removing not null empty constraints" );
- }
-
- protected function doRemoveNotNullEmptyDefaults2() {
- $meta = $this->db->fieldInfo( 'ipblocks' , 'ipb_by_text' );
- if ( $meta->isNullable() ) {
- return;
- }
- $this->applyPatch( 'patch_remove_not_null_empty_defs2.sql',
false, "Removing not null empty constraints" );
- }
-
- /**
- * Removed forcing of invalid state on recentchanges_fk2.
- * cascading taken in account in the deleting function
- */
- protected function doRecentchangesFK2Cascade() {
- $meta = $this->db->query( 'SELECT 1 FROM all_constraints WHERE
owner = \''.strtoupper($this->db->getDBname()).'\' AND constraint_name =
\''.$this->db->tablePrefix().'RECENTCHANGES_FK2\' AND delete_rule =
\'CASCADE\'' );
- $row = $meta->fetchRow();
- if ( $row ) {
- return;
- }
-
- $this->applyPatch( 'patch_recentchanges_fk2_cascade.sql',
false, "Altering RECENTCHANGES_FK2" );
- }
-
- /**
- * Fixed wrong PK, UK definition
- */
- protected function doPageRestrictionsPKUKFix() {
- global $wgDBprefix;
- $this->output( "Altering PAGE_RESTRICTIONS keys ... " );
-
- //HW: Überschrieben, da fehlender Prefix...
- //$meta = $this->db->query( 'SELECT column_name FROM
all_cons_columns WHERE owner = \''.strtoupper($this->db->getDBname()).'\' AND
constraint_name = \'MW_PAGE_RESTRICTIONS_PK\' AND rownum = 1' );
- $meta = $this->db->query( 'SELECT column_name FROM all_cons_columns
WHERE owner = \''.strtoupper($this->db->getDBname()).'\' AND constraint_name =
\''.$wgDBprefix.'PAGE_RESTRICTIONS_PK\' AND rownum = 1' );
- $row = $meta->fetchRow();
- if ( $row['column_name'] == 'PR_ID' ) {
- $this->output( "seems to be up to date.\n" );
- return;
- }
-
- //HW: kann nciht ausgeführt werden, da indizes Überprüfung nicht geht
- //$this->applyPatch( 'patch-page_restrictions_pkuk_fix.sql',
false );
- $this->output( "ok\n" );
- }
-
- /**
- * rebuilding of the function that duplicates tables for tests
- */
- protected function doRebuildDuplicateFunction() {
- $this->applyPatch( 'patch_rebuild_dupfunc.sql', false,
"Rebuilding duplicate function" );
- }
-
- /**
- * Overload: after this action field info table has to be rebuilt
- *
- * @param $what array
- */
- public function doUpdates( $what = array( 'core', 'extensions',
'purge', 'stats' ) ) {
- parent::doUpdates( $what );
-
- $this->db->query( 'BEGIN fill_wiki_info; END;' );
- }
-
- /**
- * Overload: because of the DDL_MODE tablename escaping is a bit dodgy
- */
- public function purgeCache() {
- # We can't guarantee that the user will be able to use TRUNCATE,
- # but we know that DELETE is available to us
- $this->output( "Purging caches..." );
- //HW: Query kaputt
- //$this->db->delete( '/*Q*/'.$this->db->tableName(
'objectcache' ), '*', __METHOD__ );
- $this->db->delete( 'objectcache', '*', __METHOD__ );
- $this->output( "done.\n" );
- }
-
-}
diff --git a/includes/db/oracle.fixes_and_changes.sql
b/includes/db/oracle.fixes_and_changes.sql
deleted file mode 100644
index e06bb9a..0000000
--- a/includes/db/oracle.fixes_and_changes.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-alter table /*$wgDBprefix*/RECENTCHANGES modify ("RC_CUR_ID" NUMBER NULL);
-alter table /*$wgDBprefix*/INTERWIKI modify ("IW_API" BLOB NULL);
-alter table /*$wgDBprefix*/ARCHIVE modify ("ar_user" NUMBER NULL);
-/* just use on mediawiki before 1.17.1 /*
-alter table /*$wgDBprefix*/CATEGORYLINKS modify ("CL_SORTKEY_PREFIX"
VARCHAR2(255) NULL);
-
-/*$mw$*/
-CREATE OR REPLACE TRIGGER fa_id_inc
-BEFORE INSERT ON /*$wgDBprefix*/filearchive
-FOR EACH ROW
-BEGIN
- SELECT filearchive_fa_id_seq.nextval INTO :NEW.fa_id FROM dual;
-END;
-/*$mw$*/
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/322651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c063184b605273515dc50732312f75bf37db154
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
