4 files changed, 374 insertions, 241 deletions
diff --git a/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php b/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
new file mode 100644
index 0000000000..cad1c16bb2
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/310/auth_provider_oauth.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+						'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
+						'provider'			=> array('VCHAR', ''), // Name of the OAuth provider
+						'oauth_token'		=> array('MTEXT', ''), // Serialized token
+					),
+					'KEYS' => array(
+						'user_id'			=> array('INDEX', 'user_id'),
+						'provider'			=> array('INDEX', 'provider'),
+					),
+				),
+				$this->table_prefix . 'oauth_accounts'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0),
+						'provider'			=> array('VCHAR', ''),
+						'oauth_provider_id'	=> array('TEXT_UNI', ''),
+					),
+					'PRIMARY_KEY' => array(
+						'user_id',
+						'provider',
+					),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'oauth_tokens',
+				$this->table_prefix . 'oauth_accounts',
+			),
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('module.add', array(
+				'ucp',
+				'UCP_PROFILE',
+				array(
+					'module_basename'	=> 'ucp_auth_link',
+					'modes'				=> array('auth_link'),
+				),
+			)),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/310/mod_rewrite.php b/phpBB/phpbb/db/migration/data/310/mod_rewrite.php
new file mode 100644
index 0000000000..85ce25abf3
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/310/mod_rewrite.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_mod_rewrite extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'phpbb_db_migration_data_310_dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('enable_mod_rewrite', '0')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/310/notifications_cron.php b/phpBB/phpbb/db/migration/data/310/notifications_cron.php
new file mode 100644
index 0000000000..454628e50e
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/310/notifications_cron.php
@@ -0,0 +1,25 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_notifications_cron extends phpbb_db_migration
+{
+	static public function depends_on()
+	{
+		return array('phpbb_db_migration_data_310_notifications');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('read_notification_expire_days', 30)),
+			array('config.add', array('read_notification_last_gc', 0)), // last run
+			array('config.add', array('read_notification_gc', (60 * 60 * 24))), // seconds between run; 1 day
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 492284ffcd..dbe00f6be2 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -37,247 +37,257 @@ class phpbb_db_tools
 	* The Column types for every database we support
 	* @var array
 	*/
-	var $dbms_type_map = array(
-		'mysql_41'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT'		=> 'text',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT'		=> 'text',
-			'TEXT_UNI'	=> 'text',
-			'MTEXT'		=> 'mediumtext',
-			'MTEXT_UNI'	=> 'mediumtext',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'mysql_40'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'smallint(4) UNSIGNED',
-			'BOOL'		=> 'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varbinary(255)',
-			'VCHAR:'	=> 'varbinary(%d)',
-			'CHAR:'		=> 'binary(%d)',
-			'XSTEXT'	=> 'blob',
-			'XSTEXT_UNI'=> 'blob',
-			'STEXT'		=> 'blob',
-			'STEXT_UNI'	=> 'blob',
-			'TEXT'		=> 'blob',
-			'TEXT_UNI'	=> 'blob',
-			'MTEXT'		=> 'mediumblob',
-			'MTEXT_UNI'	=> 'mediumblob',
-			'TIMESTAMP'	=> 'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'blob',
-			'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
-			'VCHAR_CI'	=> 'blob',
-			'VARBINARY'	=> 'varbinary(255)',
-		),
-
-		'firebird'	=> array(
-			'INT:'		=> 'INTEGER',
-			'BINT'		=> 'DOUBLE PRECISION',
-			'UINT'		=> 'INTEGER',
-			'UINT:'		=> 'INTEGER',
-			'TINT:'		=> 'INTEGER',
-			'USINT'		=> 'INTEGER',
-			'BOOL'		=> 'INTEGER',
-			'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
-			'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
-			'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
-			'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
-			'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
-			'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
-			'TIMESTAMP'	=> 'INTEGER',
-			'DECIMAL'	=> 'DOUBLE PRECISION',
-			'DECIMAL:'	=> 'DOUBLE PRECISION',
-			'PDECIMAL'	=> 'DOUBLE PRECISION',
-			'PDECIMAL:'	=> 'DOUBLE PRECISION',
-			'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
-			'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
-			'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
-		),
-
-		'mssql'		=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'mssqlnative'	=> array(
-			'INT:'		=> '[int]',
-			'BINT'		=> '[float]',
-			'UINT'		=> '[int]',
-			'UINT:'		=> '[int]',
-			'TINT:'		=> '[int]',
-			'USINT'		=> '[int]',
-			'BOOL'		=> '[int]',
-			'VCHAR'		=> '[varchar] (255)',
-			'VCHAR:'	=> '[varchar] (%d)',
-			'CHAR:'		=> '[char] (%d)',
-			'XSTEXT'	=> '[varchar] (1000)',
-			'STEXT'		=> '[varchar] (3000)',
-			'TEXT'		=> '[varchar] (8000)',
-			'MTEXT'		=> '[text]',
-			'XSTEXT_UNI'=> '[varchar] (100)',
-			'STEXT_UNI'	=> '[varchar] (255)',
-			'TEXT_UNI'	=> '[varchar] (4000)',
-			'MTEXT_UNI'	=> '[text]',
-			'TIMESTAMP'	=> '[int]',
-			'DECIMAL'	=> '[float]',
-			'DECIMAL:'	=> '[float]',
-			'PDECIMAL'	=> '[float]',
-			'PDECIMAL:'	=> '[float]',
-			'VCHAR_UNI'	=> '[varchar] (255)',
-			'VCHAR_UNI:'=> '[varchar] (%d)',
-			'VCHAR_CI'	=> '[varchar] (255)',
-			'VARBINARY'	=> '[varchar] (255)',
-		),
-
-		'oracle'	=> array(
-			'INT:'		=> 'number(%d)',
-			'BINT'		=> 'number(20)',
-			'UINT'		=> 'number(8)',
-			'UINT:'		=> 'number(%d)',
-			'TINT:'		=> 'number(%d)',
-			'USINT'		=> 'number(4)',
-			'BOOL'		=> 'number(1)',
-			'VCHAR'		=> 'varchar2(255)',
-			'VCHAR:'	=> 'varchar2(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar2(1000)',
-			'STEXT'		=> 'varchar2(3000)',
-			'TEXT'		=> 'clob',
-			'MTEXT'		=> 'clob',
-			'XSTEXT_UNI'=> 'varchar2(300)',
-			'STEXT_UNI'	=> 'varchar2(765)',
-			'TEXT_UNI'	=> 'clob',
-			'MTEXT_UNI'	=> 'clob',
-			'TIMESTAMP'	=> 'number(11)',
-			'DECIMAL'	=> 'number(5, 2)',
-			'DECIMAL:'	=> 'number(%d, 2)',
-			'PDECIMAL'	=> 'number(6, 3)',
-			'PDECIMAL:'	=> 'number(%d, 3)',
-			'VCHAR_UNI'	=> 'varchar2(765)',
-			'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
-			'VCHAR_CI'	=> 'varchar2(255)',
-			'VARBINARY'	=> 'raw(255)',
-		),
-
-		'sqlite'	=> array(
-			'INT:'		=> 'int(%d)',
-			'BINT'		=> 'bigint(20)',
-			'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
-			'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
-			'TINT:'		=> 'tinyint(%d)',
-			'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
-			'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'text(65535)',
-			'STEXT'		=> 'text(65535)',
-			'TEXT'		=> 'text(65535)',
-			'MTEXT'		=> 'mediumtext(16777215)',
-			'XSTEXT_UNI'=> 'text(65535)',
-			'STEXT_UNI'	=> 'text(65535)',
-			'TEXT_UNI'	=> 'text(65535)',
-			'MTEXT_UNI'	=> 'mediumtext(16777215)',
-			'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar(255)',
-			'VARBINARY'	=> 'blob',
-		),
-
-		'postgres'	=> array(
-			'INT:'		=> 'INT4',
-			'BINT'		=> 'INT8',
-			'UINT'		=> 'INT4', // unsigned
-			'UINT:'		=> 'INT4', // unsigned
-			'USINT'		=> 'INT2', // unsigned
-			'BOOL'		=> 'INT2', // unsigned
-			'TINT:'		=> 'INT2',
-			'VCHAR'		=> 'varchar(255)',
-			'VCHAR:'	=> 'varchar(%d)',
-			'CHAR:'		=> 'char(%d)',
-			'XSTEXT'	=> 'varchar(1000)',
-			'STEXT'		=> 'varchar(3000)',
-			'TEXT'		=> 'varchar(8000)',
-			'MTEXT'		=> 'TEXT',
-			'XSTEXT_UNI'=> 'varchar(100)',
-			'STEXT_UNI'	=> 'varchar(255)',
-			'TEXT_UNI'	=> 'varchar(4000)',
-			'MTEXT_UNI'	=> 'TEXT',
-			'TIMESTAMP'	=> 'INT4', // unsigned
-			'DECIMAL'	=> 'decimal(5,2)',
-			'DECIMAL:'	=> 'decimal(%d,2)',
-			'PDECIMAL'	=> 'decimal(6,3)',
-			'PDECIMAL:'	=> 'decimal(%d,3)',
-			'VCHAR_UNI'	=> 'varchar(255)',
-			'VCHAR_UNI:'=> 'varchar(%d)',
-			'VCHAR_CI'	=> 'varchar_ci',
-			'VARBINARY'	=> 'bytea',
-		),
-	);
+	var $dbms_type_map = array();
+
+	/**
+	* Get the column types for every database we support
+	*
+	* @return array
+	*/
+	public static function get_dbms_type_map()
+	{
+		return array(
+			'mysql_41'	=> array(
+				'INT:'		=> 'int(%d)',
+				'BINT'		=> 'bigint(20)',
+				'UINT'		=> 'mediumint(8) UNSIGNED',
+				'UINT:'		=> 'int(%d) UNSIGNED',
+				'TINT:'		=> 'tinyint(%d)',
+				'USINT'		=> 'smallint(4) UNSIGNED',
+				'BOOL'		=> 'tinyint(1) UNSIGNED',
+				'VCHAR'		=> 'varchar(255)',
+				'VCHAR:'	=> 'varchar(%d)',
+				'CHAR:'		=> 'char(%d)',
+				'XSTEXT'	=> 'text',
+				'XSTEXT_UNI'=> 'varchar(100)',
+				'STEXT'		=> 'text',
+				'STEXT_UNI'	=> 'varchar(255)',
+				'TEXT'		=> 'text',
+				'TEXT_UNI'	=> 'text',
+				'MTEXT'		=> 'mediumtext',
+				'MTEXT_UNI'	=> 'mediumtext',
+				'TIMESTAMP'	=> 'int(11) UNSIGNED',
+				'DECIMAL'	=> 'decimal(5,2)',
+				'DECIMAL:'	=> 'decimal(%d,2)',
+				'PDECIMAL'	=> 'decimal(6,3)',
+				'PDECIMAL:'	=> 'decimal(%d,3)',
+				'VCHAR_UNI'	=> 'varchar(255)',
+				'VCHAR_UNI:'=> 'varchar(%d)',
+				'VCHAR_CI'	=> 'varchar(255)',
+				'VARBINARY'	=> 'varbinary(255)',
+			),
+
+			'mysql_40'	=> array(
+				'INT:'		=> 'int(%d)',
+				'BINT'		=> 'bigint(20)',
+				'UINT'		=> 'mediumint(8) UNSIGNED',
+				'UINT:'		=> 'int(%d) UNSIGNED',
+				'TINT:'		=> 'tinyint(%d)',
+				'USINT'		=> 'smallint(4) UNSIGNED',
+				'BOOL'		=> 'tinyint(1) UNSIGNED',
+				'VCHAR'		=> 'varbinary(255)',
+				'VCHAR:'	=> 'varbinary(%d)',
+				'CHAR:'		=> 'binary(%d)',
+				'XSTEXT'	=> 'blob',
+				'XSTEXT_UNI'=> 'blob',
+				'STEXT'		=> 'blob',
+				'STEXT_UNI'	=> 'blob',
+				'TEXT'		=> 'blob',
+				'TEXT_UNI'	=> 'blob',
+				'MTEXT'		=> 'mediumblob',
+				'MTEXT_UNI'	=> 'mediumblob',
+				'TIMESTAMP'	=> 'int(11) UNSIGNED',
+				'DECIMAL'	=> 'decimal(5,2)',
+				'DECIMAL:'	=> 'decimal(%d,2)',
+				'PDECIMAL'	=> 'decimal(6,3)',
+				'PDECIMAL:'	=> 'decimal(%d,3)',
+				'VCHAR_UNI'	=> 'blob',
+				'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')),
+				'VCHAR_CI'	=> 'blob',
+				'VARBINARY'	=> 'varbinary(255)',
+			),
+
+			'firebird'	=> array(
+				'INT:'		=> 'INTEGER',
+				'BINT'		=> 'DOUBLE PRECISION',
+				'UINT'		=> 'INTEGER',
+				'UINT:'		=> 'INTEGER',
+				'TINT:'		=> 'INTEGER',
+				'USINT'		=> 'INTEGER',
+				'BOOL'		=> 'INTEGER',
+				'VCHAR'		=> 'VARCHAR(255) CHARACTER SET NONE',
+				'VCHAR:'	=> 'VARCHAR(%d) CHARACTER SET NONE',
+				'CHAR:'		=> 'CHAR(%d) CHARACTER SET NONE',
+				'XSTEXT'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+				'STEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+				'TEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+				'MTEXT'		=> 'BLOB SUB_TYPE TEXT CHARACTER SET NONE',
+				'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8',
+				'STEXT_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+				'TEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
+				'MTEXT_UNI'	=> 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8',
+				'TIMESTAMP'	=> 'INTEGER',
+				'DECIMAL'	=> 'DOUBLE PRECISION',
+				'DECIMAL:'	=> 'DOUBLE PRECISION',
+				'PDECIMAL'	=> 'DOUBLE PRECISION',
+				'PDECIMAL:'	=> 'DOUBLE PRECISION',
+				'VCHAR_UNI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+				'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8',
+				'VCHAR_CI'	=> 'VARCHAR(255) CHARACTER SET UTF8',
+				'VARBINARY'	=> 'CHAR(255) CHARACTER SET NONE',
+			),
+
+			'mssql'		=> array(
+				'INT:'		=> '[int]',
+				'BINT'		=> '[float]',
+				'UINT'		=> '[int]',
+				'UINT:'		=> '[int]',
+				'TINT:'		=> '[int]',
+				'USINT'		=> '[int]',
+				'BOOL'		=> '[int]',
+				'VCHAR'		=> '[varchar] (255)',
+				'VCHAR:'	=> '[varchar] (%d)',
+				'CHAR:'		=> '[char] (%d)',
+				'XSTEXT'	=> '[varchar] (1000)',
+				'STEXT'		=> '[varchar] (3000)',
+				'TEXT'		=> '[varchar] (8000)',
+				'MTEXT'		=> '[text]',
+				'XSTEXT_UNI'=> '[varchar] (100)',
+				'STEXT_UNI'	=> '[varchar] (255)',
+				'TEXT_UNI'	=> '[varchar] (4000)',
+				'MTEXT_UNI'	=> '[text]',
+				'TIMESTAMP'	=> '[int]',
+				'DECIMAL'	=> '[float]',
+				'DECIMAL:'	=> '[float]',
+				'PDECIMAL'	=> '[float]',
+				'PDECIMAL:'	=> '[float]',
+				'VCHAR_UNI'	=> '[varchar] (255)',
+				'VCHAR_UNI:'=> '[varchar] (%d)',
+				'VCHAR_CI'	=> '[varchar] (255)',
+				'VARBINARY'	=> '[varchar] (255)',
+			),
+
+			'mssqlnative'	=> array(
+				'INT:'		=> '[int]',
+				'BINT'		=> '[float]',
+				'UINT'		=> '[int]',
+				'UINT:'		=> '[int]',
+				'TINT:'		=> '[int]',
+				'USINT'		=> '[int]',
+				'BOOL'		=> '[int]',
+				'VCHAR'		=> '[varchar] (255)',
+				'VCHAR:'	=> '[varchar] (%d)',
+				'CHAR:'		=> '[char] (%d)',
+				'XSTEXT'	=> '[varchar] (1000)',
+				'STEXT'		=> '[varchar] (3000)',
+				'TEXT'		=> '[varchar] (8000)',
+				'MTEXT'		=> '[text]',
+				'XSTEXT_UNI'=> '[varchar] (100)',
+				'STEXT_UNI'	=> '[varchar] (255)',
+				'TEXT_UNI'	=> '[varchar] (4000)',
+				'MTEXT_UNI'	=> '[text]',
+				'TIMESTAMP'	=> '[int]',
+				'DECIMAL'	=> '[float]',
+				'DECIMAL:'	=> '[float]',
+				'PDECIMAL'	=> '[float]',
+				'PDECIMAL:'	=> '[float]',
+				'VCHAR_UNI'	=> '[varchar] (255)',
+				'VCHAR_UNI:'=> '[varchar] (%d)',
+				'VCHAR_CI'	=> '[varchar] (255)',
+				'VARBINARY'	=> '[varchar] (255)',
+			),
+
+			'oracle'	=> array(
+				'INT:'		=> 'number(%d)',
+				'BINT'		=> 'number(20)',
+				'UINT'		=> 'number(8)',
+				'UINT:'		=> 'number(%d)',
+				'TINT:'		=> 'number(%d)',
+				'USINT'		=> 'number(4)',
+				'BOOL'		=> 'number(1)',
+				'VCHAR'		=> 'varchar2(255)',
+				'VCHAR:'	=> 'varchar2(%d)',
+				'CHAR:'		=> 'char(%d)',
+				'XSTEXT'	=> 'varchar2(1000)',
+				'STEXT'		=> 'varchar2(3000)',
+				'TEXT'		=> 'clob',
+				'MTEXT'		=> 'clob',
+				'XSTEXT_UNI'=> 'varchar2(300)',
+				'STEXT_UNI'	=> 'varchar2(765)',
+				'TEXT_UNI'	=> 'clob',
+				'MTEXT_UNI'	=> 'clob',
+				'TIMESTAMP'	=> 'number(11)',
+				'DECIMAL'	=> 'number(5, 2)',
+				'DECIMAL:'	=> 'number(%d, 2)',
+				'PDECIMAL'	=> 'number(6, 3)',
+				'PDECIMAL:'	=> 'number(%d, 3)',
+				'VCHAR_UNI'	=> 'varchar2(765)',
+				'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')),
+				'VCHAR_CI'	=> 'varchar2(255)',
+				'VARBINARY'	=> 'raw(255)',
+			),
+
+			'sqlite'	=> array(
+				'INT:'		=> 'int(%d)',
+				'BINT'		=> 'bigint(20)',
+				'UINT'		=> 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED',
+				'UINT:'		=> 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED',
+				'TINT:'		=> 'tinyint(%d)',
+				'USINT'		=> 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED',
+				'BOOL'		=> 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED',
+				'VCHAR'		=> 'varchar(255)',
+				'VCHAR:'	=> 'varchar(%d)',
+				'CHAR:'		=> 'char(%d)',
+				'XSTEXT'	=> 'text(65535)',
+				'STEXT'		=> 'text(65535)',
+				'TEXT'		=> 'text(65535)',
+				'MTEXT'		=> 'mediumtext(16777215)',
+				'XSTEXT_UNI'=> 'text(65535)',
+				'STEXT_UNI'	=> 'text(65535)',
+				'TEXT_UNI'	=> 'text(65535)',
+				'MTEXT_UNI'	=> 'mediumtext(16777215)',
+				'TIMESTAMP'	=> 'INTEGER UNSIGNED', //'int(11) UNSIGNED',
+				'DECIMAL'	=> 'decimal(5,2)',
+				'DECIMAL:'	=> 'decimal(%d,2)',
+				'PDECIMAL'	=> 'decimal(6,3)',
+				'PDECIMAL:'	=> 'decimal(%d,3)',
+				'VCHAR_UNI'	=> 'varchar(255)',
+				'VCHAR_UNI:'=> 'varchar(%d)',
+				'VCHAR_CI'	=> 'varchar(255)',
+				'VARBINARY'	=> 'blob',
+			),
+
+			'postgres'	=> array(
+				'INT:'		=> 'INT4',
+				'BINT'		=> 'INT8',
+				'UINT'		=> 'INT4', // unsigned
+				'UINT:'		=> 'INT4', // unsigned
+				'USINT'		=> 'INT2', // unsigned
+				'BOOL'		=> 'INT2', // unsigned
+				'TINT:'		=> 'INT2',
+				'VCHAR'		=> 'varchar(255)',
+				'VCHAR:'	=> 'varchar(%d)',
+				'CHAR:'		=> 'char(%d)',
+				'XSTEXT'	=> 'varchar(1000)',
+				'STEXT'		=> 'varchar(3000)',
+				'TEXT'		=> 'varchar(8000)',
+				'MTEXT'		=> 'TEXT',
+				'XSTEXT_UNI'=> 'varchar(100)',
+				'STEXT_UNI'	=> 'varchar(255)',
+				'TEXT_UNI'	=> 'varchar(4000)',
+				'MTEXT_UNI'	=> 'TEXT',
+				'TIMESTAMP'	=> 'INT4', // unsigned
+				'DECIMAL'	=> 'decimal(5,2)',
+				'DECIMAL:'	=> 'decimal(%d,2)',
+				'PDECIMAL'	=> 'decimal(6,3)',
+				'PDECIMAL:'	=> 'decimal(%d,3)',
+				'VCHAR_UNI'	=> 'varchar(255)',
+				'VCHAR_UNI:'=> 'varchar(%d)',
+				'VCHAR_CI'	=> 'varchar_ci',
+				'VARBINARY'	=> 'bytea',
+			),
+		);
+	}
 
 	/**
 	* A list of types being unsigned for better reference in some db's
@@ -308,6 +318,8 @@ class phpbb_db_tools
 		$this->db = $db;
 		$this->return_statements = $return_statements;
 
+		$this->dbms_type_map = self::get_dbms_type_map();
+
 		// Determine mapping database type
 		switch ($this->db->sql_layer)
 		{