Re: [Wikitech-l] [MediaWiki-CVS] SVN: [45755] trunk/phase3 (IBM DB2 database layer)

Revision: 45755 Author: leonsp Date: 2009-01-14 22:20:15 +0000 (Wed, 14 Jan 2009) Log Message: ----------- (bug 17028) Added support for IBM DB2 database. config/index.php has new interface elements that only show up if PHP has ibm_db2 module enabled. AutoLoader knows about the new DB2 classes. GlobalFunctions has a new constant for DB2 time format. Revision class fixed slightly. Also includes new PHP files containing the Database and Search API implementations for IBM DB2. [...] Modified: trunk/phase3/includes/Revision.php =================================================================== --- trunk/phase3/includes/Revision.php 2009-01-14 22:15:50 UTC (rev 45754) +++ trunk/phase3/includes/Revision.php 2009-01-14 22:20:15 UTC (rev 45755) @@ -961,6 +961,10 @@ */ static function getTimestampFromId( $title, $id ) { $dbr = wfGetDB( DB_SLAVE ); + // Casting fix for DB2 + if ($id == '') { + $id = 0; + }

[...] Added: trunk/phase3/includes/SearchIBM_DB2.php =================================================================== --- trunk/phase3/includes/SearchIBM_DB2.php (rev 0) +++ trunk/phase3/includes/SearchIBM_DB2.php 2009-01-14 22:20:15 UTC (rev 45755) @@ -0,0 +1,247 @@ +<?php +# Copyright (C) 2004 Brion Vibber &lt;brion(a)pobox.com&gt;

Added: trunk/phase3/includes/db/DatabaseIbm_db2.php =================================================================== --- trunk/phase3/includes/db/DatabaseIbm_db2.php (rev 0) +++ trunk/phase3/includes/db/DatabaseIbm_db2.php 2009-01-14 22:20:15 UTC (rev 45755) +/** + * Utility class for generating blank objects + * Intended as an equivalent to {} in Javascript + * @ingroup Database + */ +class BlankObject { +}

+ +/** + * This represents a column in a DB2 database + * @ingroup Database + */ +class IBM_DB2Field { + private $name, $tablename, $type, $nullable, $max_length; + + /** + * Builder method for the class + * @param Object $db Database interface + * @param string $table table name + * @param string $field column name + * @return IBM_DB2Field + */ + static function fromText($db, $table, $field) { + [...] + } + /** + * Get column name + * @return string column name + */ + function name() { return $this->name; } + /** + * Get table name + * @return string table name + */ + function tableName() { return $this->tablename; } + /** + * Get column type + * @return string column type + */ + function type() { return $this->type; } + /** + * Can column be null? + * @return bool true or false + */ + function nullable() { return $this->nullable; } + /** + * How much can you fit in the column per row? + * @return int length + */ + function maxLength() { return $this->max_length; } +}

+ +/** + * Wrapper around binary large objects + * @ingroup Database + */ +class IBM_DB2Blob { + private $mData; + + function __construct($data) { + $this->mData = $data; + } + + function getData() { + return $this->mData; + } +}

[...] + public function is_numeric_type( $type ) { + switch (strtoupper($type)) { + case 'SMALLINT': + case 'INTEGER': + case 'INT': + case 'BIGINT': + case 'DECIMAL': + case 'REAL': + case 'DOUBLE': + case 'DECFLOAT': + return true; + } + return false; + }

+ /** + * Construct a LIMIT query with optional offset + * This is used for query pages + * $sql string SQL query we will append the limit too + * $limit integer the SQL limit + * $offset integer the SQL offset (default false) + */ + public function limitResult($sql, $limit, $offset=false) { + if( !is_numeric($limit) ) { + throw new DBUnexpectedError( $this, "Invalid non-numeric limit passed to limitResult()\n" ); + } + if( $offset ) { + wfDebug("Offset parameter not supported in limitResult()\n"); + } + // TODO implement proper offset handling + // idea: get all the rows between 0 and offset, advance cursor to offset + return "$sql FETCH FIRST $limit ROWS ONLY "; + }

+ /** + * USE INDEX clause + * DB2 doesn't have them and returns "" + * @param sting $index + */ + public function useIndexClause( $index ) { + return ""; + }

+ public function select( $table, $vars, $conds='', $fname = 'DatabaseIbm_db2::select', $options = array(), $join_conds = array() ) + { + $res = parent::select( $table, $vars, $conds, $fname, $options, $join_conds ); + + // We must adjust for offset + if ( isset( $options['LIMIT'] ) ) { + if ( isset ($options['OFFSET'] ) ) { + $limit = $options['LIMIT']; + $offset = $options['OFFSET']; + } + }

+ + + // DB2 does not have a proper num_rows() function yet, so we must emulate it + // DB2 9.5.3/9.5.4 and the corresponding ibm_db2 driver will introduce a working one + // Yay!

+ + // we want the count + $vars2 = array('count(*) as num_rows'); + // respecting just the limit option + $options2 = array(); + if ( isset( $options['LIMIT'] ) ) $options2['LIMIT'] = $options['LIMIT'];

Added: trunk/phase3/maintenance/ibm_db2/README =================================================================== --- trunk/phase3/maintenance/ibm_db2/README (rev 0) +++ trunk/phase3/maintenance/ibm_db2/README 2009-01-14 22:20:15 UTC (rev 45755) @@ -0,0 +1,41 @@ +== Syntax differences between other databases and IBM DB2 == +{| border cellspacing=0 cellpadding=4 +!MySQL!!IBM DB2 +|- + +|SELECT 1 FROM $table LIMIT 1 +|SELECT COUNT(*) FROM SYSIBM.SYSTABLES ST +WHERE ST.NAME = '$table' AND ST.CREATOR = '$schema' [...]

Added: trunk/phase3/maintenance/ibm_db2/tables.sql =================================================================== --- trunk/phase3/maintenance/ibm_db2/tables.sql (rev 0) +++ trunk/phase3/maintenance/ibm_db2/tables.sql 2009-01-14 22:20:15 UTC (rev 45755) @@ -0,0 +1,604 @@ +-- DB2 + +-- SQL to create the initial tables for the MediaWiki database. +-- This is read and executed by the install script; you should +-- not have to run it by itself unless doing a manual install. +-- This is the IBM DB2 version. +-- For information about each table, please see the notes in maintenance/tables.sql +-- Please make sure all dollar-quoting uses $mw$ at the start of the line +-- TODO: Change CHAR/SMALLINT to BOOL (still used in a non-bool fashion in PHP code) + + + + +CREATE SEQUENCE user_user_id_seq AS INTEGER START WITH 0 INCREMENT BY 1; +CREATE TABLE mwuser ( -- replace reserved word 'user' + user_id INTEGER NOT NULL PRIMARY KEY, -- DEFAULT nextval('user_user_id_seq'), + user_name VARCHAR(255) NOT NULL UNIQUE, + user_real_name VARCHAR(255), + user_password clob(1K), + user_newpassword clob(1K), + user_newpass_time TIMESTAMP, + user_token VARCHAR(255), + user_email VARCHAR(255), + user_email_token VARCHAR(255), + user_email_token_expires TIMESTAMP, + user_email_authenticated TIMESTAMP, + user_options CLOB(64K), + user_touched TIMESTAMP, + user_registration TIMESTAMP, + user_editcount INTEGER +); +CREATE INDEX user_email_token_idx ON mwuser (user_email_token);

+-- should be replaced with OmniFind, Contains(), etc +CREATE TABLE searchindex ( + si_page int NOT NULL, + si_title varchar(255) NOT NULL default '', + si_text clob NOT NULL +);