- some language tweaks suggested by John

- some bug fixes - finally adding db_tools... git-svn-id: file:///svn/phpbb/trunk@8088 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-09-13 15:01:15 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-09-13 15:01:15 +0000
commit: 685282c2cbe8a6d8c7abd77d3801d7242d0ae693 (patch)
tree: 0533a1ca066f5c78882782b1a9fcbcb4e2f768f5
parent: e503216834c466de1eb5746d1b2998a8db5de086 (diff)
download: forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar
forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.gz
forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.bz2
forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.xz
forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.zip
10 files changed, 1419 insertions, 12 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 921ae212a7..b4288cf685 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -205,6 +205,7 @@ p a {
 		<li>[Change] Require additional permissions for copying permission when editing forums </li>
 		<li>[Fix] Local magic URLs no longer get an additional trailing slash (Bug #14362)</li>
 		<li>[Fix] Do not let the cron script stale for one hour if register_shutdown_function is not able to be called (Bug #14436)</li>
+		<li>[Feature] Added /includes/db/db_tools.php file, which includes tools for handling cross-db actions such as altering columns, etc.</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index e87614b5b2..62fcf8e8be 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -499,7 +499,7 @@ p a {
 
 <div class="paragraph">
 
-	<p>Once you have succssfully installed phpBB3 you <strong>MUST</strong> ensure you remove the entire install/ directory. Leaving the install directory in place is a <em>very serious potential security issue</em> which may lead to deletion or alteration of files, etc. Please note that until this directory is not removed phpBB3 will not operate and a warning message will be displayed. Beyond this <strong>essential</strong> deletion you may also wish to delete the docs/ directories if you wish.</p>
+	<p>Once you have successfully installed phpBB3 you <strong>MUST</strong> ensure you remove the entire install/ directory. Leaving the install directory in place is a <em>very serious potential security issue</em> which may lead to deletion or alteration of files, etc. Please note that until this directory is removed, phpBB3 will not operate and a warning message will be displayed. Beyond this <strong>essential</strong> deletion, you may also wish to delete the docs/ directories if you wish.</p>
 
 	<p>With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/conversion and click the <strong>Administration Panel</strong> link at the bottom of any page. Ensure that details specified in <code>Admin -&gt; General</code> are correct!</p>
 
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index a407be10ee..f9d75b11b2 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -822,7 +822,7 @@ $sql = 'SELECT *
 
 	<h3>sql_build_array():</h3>
 
-	<p>If you need to UPDATE or INSERT data, make use of the <code>$db-&gt;sql_build_array()</code> function. This function already escapes strings and checks other types, so there is no need to do this here. The data to be inserted should go into an array - <code>$sql_ary</code> - or directly within the statement if one one or two variables needs to be inserted/updated. An example of an insert statement would be:</p>
+	<p>If you need to UPDATE or INSERT data, make use of the <code>$db-&gt;sql_build_array()</code> function. This function already escapes strings and checks other types, so there is no need to do this here. The data to be inserted should go into an array - <code>$sql_ary</code> - or directly within the statement if one or two variables needs to be inserted/updated. An example of an insert statement would be:</p>
 
 	<blockquote><pre>
 $sql_ary = array(
@@ -1940,7 +1940,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 	<h3>Normalisation of language tags for phpBB:</h3>
 
-	<p>For phpBB, the language tags are <strong>not</strong> used in their raw form and instead converted to all lower-case and have the hyphen <code>-</code> replaced with an underscore <code>_</code> where appropiate, with some examples below:</p>
+	<p>For phpBB, the language tags are <strong>not</strong> used in their raw form and instead converted to all lower-case and have the hyphen <code>-</code> replaced with an underscore <code>_</code> where appropriate, with some examples below:</p>
 
 	<table summary="Normalisation of language tags for usage in phpBB">
 	<caption>Language tag normalisation examples</caption>
@@ -2040,13 +2040,13 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 	</tbody>
 	</table>
 
-	<p>For the localised language description, just translate the English version though use whatever appropiate punctuation typical for your own locale, assuming the language uses punctuation at all.</p>
+	<p>For the localised language description, just translate the English version though use whatever appropriate punctuation typical for your own locale, assuming the language uses punctuation at all.</p>
 
 	<h3>Unicode bi-directional considerations:</h3>
 	
 	<p>Because phpBB is now UTF-8, all translators must take into account that certain strings may be shown when the directionality of the document is either opposite to normal or is ambiguous.</p>
 		
-	<p>The various Unicode control characters for bi-directional text and their HTML enquivalents where appropiate are as follows:</p>
+	<p>The various Unicode control characters for bi-directional text and their HTML enquivalents where appropriate are as follows:</p>
 	
 	<table summary="Table of the various Unicode bidirectional control characters">
 	<caption>Unicode bidirectional control characters &amp; HTML elements/entities</caption>
@@ -2159,12 +2159,12 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 	</table>
 	
 	<p>In choosing which of the three methods to use, in the majority of cases, the <code>LRM</code> or <code>RLM</code> to put a &quot;strong&quot; character to fully enclose an ambiguous punctuation character and thus make it inherit the correct directionality is sufficient.</p>
-	<p>Within some cases, there may be mixed scripts of a left-to-right and right-to-left direction, so using <code>LRE</code> &amp; <code>RLE</code> with <code>PDF</code> may be more appropiate. Lastly, in very rare instances where directionality must be forced, then use <code>LRO</code> &amp; <code>RLO</code> with <code>PDF</code>.</p>
+	<p>Within some cases, there may be mixed scripts of a left-to-right and right-to-left direction, so using <code>LRE</code> &amp; <code>RLE</code> with <code>PDF</code> may be more appropriate. Lastly, in very rare instances where directionality must be forced, then use <code>LRO</code> &amp; <code>RLO</code> with <code>PDF</code>.</p>
 	<p>For further information on authoring techniques of bi-directional text, please see the W3C tutorial on <a href="http://www.w3.org/International/tutorials/bidi-xhtml/">authoring techniques for XHTML pages with bi-directional text</a>.</p>
 	
 	<h3>Working with placeholders:</h3>
 	
-	<p>As phpBB is translated into languages with different ordering rules to that of English, it is possible to show specific values in any order deemed appropiate. Take for example the extremely simple &quot;Page <em>X</em> of <em>Y</em>&quot;, whilst in English this could just be coded as:</p>
+	<p>As phpBB is translated into languages with different ordering rules to that of English, it is possible to show specific values in any order deemed appropriate. Take for example the extremely simple &quot;Page <em>X</em> of <em>Y</em>&quot;, whilst in English this could just be coded as:</p>
 	
 	<blockquote><pre>
 	...
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
new file mode 100644
index 0000000000..1efd09c626
--- /dev/null
+++ b/phpBB/includes/db/db_tools.php
@@ -0,0 +1,1405 @@
+<?php
+/** 
+*
+* @package dbal
+* @version $Id$
+* @copyright (c) 2007 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* Database Tools for handling cross-db actions such as altering columns, etc.
+* Currently not supported is returning SQL for creating tables.
+*
+* @package dbal
+* @note currently not used within phpBB3, but may be utilized later.
+*/
+class phpbb_db_tools
+{
+	/**
+	* Current sql layer
+	*/
+	var $sql_layer = '';
+
+	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)',
+		),
+
+		'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
+	var $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
+	var $supported_dbms = array('firebird', 'mssql', 'mysql_40', 'mysql_41', 'oracle', 'postgres', 'sqlite');
+
+	/**
+	* Set this to true if you only want to return the 'to-be-executed' SQL statement(s) (as an array).
+	*/
+	var $return_statements = false;
+
+	/**
+	*/
+	function phpbb_db_tools(&$db)
+	{
+		$this->db = $db;
+
+		// Determine mapping database type
+		switch ($this->db->sql_layer)
+		{
+			case 'mysql':
+				$this->sql_layer = 'mysql_40';
+			break;
+
+			case 'mysql4':
+				if (version_compare($this->db->mysql_version, '4.1.3', '>='))
+				{
+					$this->sql_layer = 'mysql_41';
+				}
+				else
+				{
+					$this->sql_layer = 'mysql_40';
+				}
+			break;
+
+			case 'mysqli':
+				$this->sql_layer = 'mysql_41';
+			break;
+
+			case 'mssql':
+			case 'mssql_odbc':
+				$this->sql_layer = 'mssql';
+			break;
+
+			default:
+				$this->sql_layer = $this->db->sql_layer;
+			break;
+		}
+	}
+
+	/**
+	* Handle passed database update array.
+	* Expected structure...
+	* Key being one of the following
+	*	change_columns: Column changes (only type, not name)
+	*	add_columns: Add columns to a table
+	*	drop_keys: Dropping keys
+	*	drop_columns: Removing/Dropping columns
+	*	add_primary_keys: adding primary keys
+	*	add_unique_index: adding an unique index
+	*	add_index: adding an index
+	*
+	* The values are in this format:
+	*		{TABLE NAME}		=> array(
+	*			{COLUMN NAME}		=> array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}),
+	*			{KEY/INDEX NAME}	=> array({COLUMN NAMES}),
+	*		)
+	*
+	* For more information have a look at /develop/create_schema_files.php (only available through CVS)
+	*/
+	function perform_schema_changes($schema_changes)
+	{
+		if (empty($schema_changes))
+		{
+			return;
+		}
+
+		$statements = array();
+
+		// Change columns?
+		if (!empty($schema_changes['change_columns']))
+		{
+			foreach ($schema_changes['change_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column_name => $column_data)
+				{
+					$result = $this->sql_column_change($table, $column_name, $column_data);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add columns?
+		if (!empty($schema_changes['add_columns']))
+		{
+			foreach ($schema_changes['add_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column_name => $column_data)
+				{
+					// Only add the column if it does not exist yet
+					if (!$this->sql_column_exists($table, $column_name))
+					{
+						$result = $this->sql_column_add($table, $column_name, $column_data);
+
+						if ($this->return_statements)
+						{
+							$statements = array_merge($statements, $result);
+						}
+					}
+				}
+			}
+		}
+
+		// Remove keys?
+		if (!empty($schema_changes['drop_keys']))
+		{
+			foreach ($schema_changes['drop_keys'] as $table => $indexes)
+			{
+				foreach ($indexes as $index_name)
+				{
+					$result = $this->sql_index_drop($table, $index_name);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Drop columns?
+		if (!empty($schema_changes['drop_columns']))
+		{
+			foreach ($schema_changes['drop_columns'] as $table => $columns)
+			{
+				foreach ($columns as $column)
+				{
+					$result = $this->sql_column_remove($table, $column);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add primary keys?
+		if (!empty($schema_changes['add_primary_keys']))
+		{
+			foreach ($schema_changes['add_primary_keys'] as $table => $columns)
+			{
+				$result = $this->sql_create_primary_key($table, $columns);
+
+				if ($this->return_statements)
+				{
+					$statements = array_merge($statements, $result);
+				}
+			}
+		}
+
+		// Add unqiue indexes?
+		if (!empty($schema_changes['add_unique_index']))
+		{
+			foreach ($schema_changes['add_unique_index'] as $table => $index_array)
+			{
+				foreach ($index_array as $index_name => $column)
+				{
+					$result = $this->sql_create_unique_index($table, $index_name, $column);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		// Add indexes?
+		if (!empty($schema_changes['add_index']))
+		{
+			foreach ($schema_changes['add_index'] as $table => $index_array)
+			{
+				foreach ($index_array as $index_name => $column)
+				{
+					$result = $this->sql_create_index($table, $index_name, $column);
+
+					if ($this->return_statements)
+					{
+						$statements = array_merge($statements, $result);
+					}
+				}
+			}
+		}
+
+		if ($this->return_statements)
+		{
+			return $statements;
+		}
+	}
+
+	/**
+	* Check if a specified column exist
+	* @return bool True if column exists, else false
+	*/
+	function sql_column_exists($table, $column_name)
+	{
+		switch ($this->sql_layer)
+		{
+			case 'mysql_40':
+			case 'mysql_41':
+
+				$sql = "SHOW COLUMNS FROM $table";
+				$result = $this->db->sql_query($sql);
+
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// lower case just in case
+					if (strtolower($row['Field']) == $column_name)
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+				$this->db->sql_freeresult($result);
+				return false;
+			break;
+
+			// PostgreSQL has a way of doing this in a much simpler way but would
+			// not allow us to support all versions of PostgreSQL
+			case 'postgres':
+				$sql = "SELECT a.attname
+					FROM pg_class c, pg_attribute a
+					WHERE c.relname = '{$table}'
+						AND a.attnum > 0
+						AND a.attrelid = c.oid";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// lower case just in case
+					if (strtolower($row['attname']) == $column_name)
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+				$this->db->sql_freeresult($result);
+
+				return false;
+			break;
+
+			// same deal with PostgreSQL, we must perform more complex operations than
+			// we technically could
+			case 'mssql':
+				$sql = "SELECT c.name
+					FROM syscolumns c
+					LEFT JOIN sysobjects o (ON c.id = o.id)
+					WHERE o.name = '{$table}'";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// lower case just in case
+					if (strtolower($row['name']) == $column_name)
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+				$this->db->sql_freeresult($result);
+				return false;
+			break;
+
+			case 'oracle':
+				$sql = "SELECT column_name
+					FROM user_tab_columns
+					WHERE table_name = '{$table}'";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// lower case just in case
+					if (strtolower($row['column_name']) == $column_name)
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+				$this->db->sql_freeresult($result);
+				return false;
+			break;
+
+			case 'firebird':
+				$sql = "SELECT RDB\$FIELD_NAME as FNAME
+					FROM RDB\$RELATION_FIELDS
+					WHERE RDB\$RELATION_NAME = '{$table}'";
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					// lower case just in case
+					if (strtolower($row['fname']) == $column_name)
+					{
+						$this->db->sql_freeresult($result);
+						return true;
+					}
+				}
+				$this->db->sql_freeresult($result);
+				return false;
+			break;
+
+			// ugh, SQLite
+			case 'sqlite':
+				$sql = "SELECT sql
+					FROM sqlite_master 
+					WHERE type = 'table' 
+						AND name = '{$table}'";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					return false;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$cols = trim($matches[1]);
+				$col_array = preg_split('/,(?![\s\w]+\))/m', $cols);
+
+				foreach ($col_array as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						continue;
+					}
+
+					if (strtolower($entities[0]) == $column_name)
+					{
+						return true;
+					}
+				}
+				return false;
+			break;
+		}
+	}
+
+	/**
+	* Private method for performing sql statements (either execute them or return them)
+	* @private
+	*/
+	function _sql_run_sql($statements)
+	{
+		if ($this->return_statements)
+		{
+			return $statements;
+		}
+
+		// We could add error handling here...
+		foreach ($statements as $sql)
+		{
+			if ($sql === 'begin')
+			{
+				$this->db->sql_transaction('begin');
+			}
+			else if ($sql === 'commit')
+			{
+				$this->db->sql_transaction('commit');
+			}
+			else
+			{
+				$this->db->sql_query($sql);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	* Function to prepare some column information for better usage
+	* @private
+	*/
+	function sql_prepare_column_data($table_name, $column_name, $column_data)
+	{
+		// Get type
+		if (strpos($column_data[0], ':') !== false)
+		{
+			list($orig_column_type, $column_length) = explode(':', $column_data[0]);
+
+			if (!is_array($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']))
+			{
+				$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'], $column_length);
+			}
+			else
+			{
+				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule']))
+				{
+					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][0])
+					{
+						case 'div':
+							$column_length /= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['rule'][1];
+							$column_length = ceil($column_length);
+							$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
+						break;
+					}
+				}
+
+				if (isset($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit']))
+				{
+					switch ($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][0])
+					{
+						case 'mult':
+							$column_length *= $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][1];
+							if ($column_length > $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][2])
+							{
+								$column_type = $this->dbms_type_map[$this->sql_layer][$orig_column_type . ':']['limit'][3];
+							}
+							else
+							{
+								$column_type = sprintf($this->dbms_type_map[$this->sql_layer][$orig_column_type . ':'][0], $column_length);
+							}
+						break;
+					}
+				}
+			}
+			$orig_column_type .= ':';
+		}
+		else
+		{
+			$orig_column_type = $column_data[0];
+			$column_type = $this->dbms_type_map[$this->sql_layer][$column_data[0]];
+		}
+
+		// Adjust default value if db-dependant specified
+		if (is_array($column_data[1]))
+		{
+			$column_data[1] = (isset($column_data[1][$this->sql_layer])) ? $column_data[1][$this->sql_layer] : $column_data[1]['default'];
+		}
+
+		$sql = '';
+
+		$return_array = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$sql .= " {$column_type} ";
+
+				if (!is_null($column_data[1]))
+				{
+					$sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' ';
+				}
+
+				$sql .= 'NOT NULL';
+
+				// This is a UNICODE column and thus should be given it's fair share
+				if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0]))
+				{
+					$sql .= ' COLLATE UNICODE';
+				}
+
+			break;
+
+			case 'mssql':
+				$sql .= " {$column_type} ";
+
+				// we do not support MSSQL DEFAULTs for the near future
+				/*if (!is_null($column_data[1]))
+				{
+					// For hexadecimal values do not use single quotes
+					if (strpos($column_data[1], '0x') === 0)
+					{
+						$sql .= 'DEFAULT (' . $column_data[1] . ') ';
+					}
+					else
+					{
+						$sql .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') ';
+					}
+				}*/
+
+				$sql .= 'NOT NULL';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$sql .= " {$column_type} ";
+
+				// For hexadecimal values do not use single quotes
+				if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob')
+				{
+					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
+				}
+				$sql .= 'NOT NULL';
+
+				if (isset($column_data[2]))
+				{
+					if ($column_data[2] == 'auto_increment')
+					{
+						$sql .= ' auto_increment';
+					}
+					else if ($this->sql_layer === 'mysql_41' && $column_data[2] == 'true_sort')
+					{
+						$sql .= ' COLLATE utf8_unicode_ci';
+					}
+				}
+
+			break;
+
+			case 'oracle':
+				$sql .= " {$column_type} ";
+				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : '';
+
+				// In Oracle empty strings ('') are treated as NULL.
+				// Therefore in oracle we allow NULL's for all DEFAULT '' entries
+				// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
+				if (preg_match('/number/i', $column_type))
+				{
+					$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
+				}
+			break;
+
+			case 'postgres':
+				$return_array['column_type'] = $column_type;
+
+				$sql .= " {$column_type} ";
+
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$default_val = "nextval('{$table_name}_seq')";
+				}
+				else if (!is_null($column_data[1]))
+				{
+					$default_val = "'" . $column_data[1] . "'";
+					$return_array['null'] = 'NOT NULL';
+					$sql .= 'NOT NULL ';
+				}
+
+				$return_array['default'] = $default_val;
+
+				$sql .= "DEFAULT {$default_val}";
+
+				// Unsigned? Then add a CHECK contraint
+				if (in_array($orig_column_type, $this->unsigned_types))
+				{
+					$return_array['constraint'] = "CHECK ({$column_name} >= 0)";
+					$sql .= " CHECK ({$column_name} >= 0)";
+				}
+			break;
+
+			case 'sqlite':
+				if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
+				{
+					$sql .= ' INTEGER PRIMARY KEY';
+				}
+				else
+				{
+					$sql .= ' ' . $column_type;
+				}
+
+				$sql .= ' NOT NULL ';
+				$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
+			break;
+		}
+
+		$return_array['column_type_sql'] = $sql;
+
+		return $return_array;
+	}
+
+	/**
+	* Add new column
+	*/
+	function sql_column_add($table_name, $column_name, $column_data)
+	{
+		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$statements[] = 'ALTER TABLE "' . $table_name . '" ADD "' . $column_name . '" ' . $column_data['column_type_sql'];
+			break;
+
+			case 'mssql':
+				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql'];
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
+			break;
+
+			case 'postgres':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
+			break;
+
+			case 'sqlite':
+				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				{
+					$sql = "SELECT sql
+						FROM sqlite_master 
+						WHERE type = 'table' 
+							AND name = '{$table_name}'
+						ORDER BY type DESC, name;";
+					$result = $this->db->sql_query($sql);
+
+					if (!$result)
+					{
+						break;
+					}
+
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					$statements[] = 'begin';
+
+					// Create a backup table and populate it, destroy the existing one
+					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+					$statements[] = 'DROP TABLE ' . $table_name;
+
+					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+					$new_table_cols = trim($matches[1]);
+					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+					$column_list = array();
+
+					foreach ($old_table_cols as $declaration)
+					{
+						$entities = preg_split('#\s+#', trim($declaration));
+						if ($entities[0] == 'PRIMARY')
+						{
+							continue;
+						}
+						$column_list[] = $entities[0];
+					}
+
+					$columns = implode(',', $column_list);
+
+					$new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols;
+
+					// create a new table and fill it up. destroy the temp one
+					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+					$statements[] = 'commit';
+				}
+				else
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']';
+				}
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Drop column
+	*/
+	function sql_column_remove($table_name, $column_name)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				$statements[] = 'ALTER TABLE "' . $table_name . '" DROP "' . $column_name . '"';
+			break;
+
+			case 'mssql':
+				$statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`';
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name;
+			break;
+
+			case 'postgres':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"';
+			break;
+
+			case 'sqlite':
+				if (version_compare(sqlite_libversion(), '3.0') == -1)
+				{
+					$sql = "SELECT sql
+						FROM sqlite_master 
+						WHERE type = 'table' 
+							AND name = '{$table_name}'
+						ORDER BY type DESC, name;";
+					$result = $this->db->sql_query($sql);
+
+					if (!$result)
+					{
+						break;
+					}
+
+					$row = $this->db->sql_fetchrow($result);
+					$this->db->sql_freeresult($result);
+
+					$statements[] = 'begin';
+
+					// Create a backup table and populate it, destroy the existing one
+					$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+					$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+					$statements[] = 'DROP TABLE ' . $table_name;
+
+					preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+					$new_table_cols = trim($matches[1]);
+					$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+					$column_list = array();
+
+					foreach ($old_table_cols as $declaration)
+					{
+						$entities = preg_split('#\s+#', trim($declaration));
+						if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name')
+						{
+							continue;
+						}
+						$column_list[] = $entities[0];
+					}
+
+					$columns = implode(',', $column_list);
+
+					$new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols);
+
+					// create a new table and fill it up. destroy the temp one
+					$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');';
+					$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+					$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+					$statements[] = 'commit';
+				}
+				else
+				{
+					$statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
+				}
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Drop Index
+	*/
+	function sql_index_drop($table_name, $index_name)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'mssql':
+				$statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name;
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name;
+			break;
+
+			case 'firebird':
+			case 'oracle':
+			case 'postgres':
+			case 'sqlite':
+				$statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name;
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add primary key
+	*/
+	function sql_create_primary_key($table_name, $column)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+				$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
+				$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY  CLUSTERED (";
+				$sql .= '[' . implode("],\n\t\t[", $column) . ']';
+				$sql .= ') ON [PRIMARY]';
+
+				$statements[] = $sql;
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')';
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')';
+			break;
+
+			case 'sqlite':
+				$sql = "SELECT sql
+					FROM sqlite_master 
+					WHERE type = 'table' 
+						AND name = '{$table_name}'
+					ORDER BY type DESC, name;";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					break;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$statements[] = 'begin';
+
+				// Create a backup table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
+
+				foreach ($old_table_cols as $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					if ($entities[0] == 'PRIMARY')
+					{
+						continue;
+					}
+					$column_list[] = $entities[0];
+				}
+
+				$columns = implode(',', $column_list);
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));';
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add unique index
+	*/
+	function sql_create_unique_index($table_name, $index_name, $column)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+			case 'oracle':
+			case 'sqlite':
+				$statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+				$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* Add index
+	*/
+	function sql_create_index($table_name, $index_name, $column)
+	{
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+			case 'postgres':
+			case 'oracle':
+			case 'sqlite':
+				$statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
+			break;
+
+			case 'mssql':
+				$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]';
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+
+	/**
+	* List all of the indices that belong to a table,
+	* does not count:
+	* * UNIQUE indices
+	* * PRIMARY keys
+	*/
+	function sql_list_index($table_name)
+	{
+		$index_array = array();
+
+		if ($this->sql_layer == 'mssql')
+		{
+			$sql = "EXEC sp_statistics '$table_name'";
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if ($row['TYPE'] == 3)
+				{
+					$index_array[] = $row['INDEX_NAME'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+		else
+		{
+			switch ($this->sql_layer)
+			{
+				case 'firebird':
+					$sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name
+						FROM RDB\$INDICES
+						WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . "
+							AND RDB\$UNIQUE_FLAG IS NULL
+							AND RDB\$FOREIGN_KEY IS NULL";
+					$col = 'index_name';
+				break;
+
+				case 'postgres':
+					$sql = "SELECT ic.relname as index_name
+						FROM pg_class bc, pg_class ic, pg_index i
+						WHERE (bc.oid = i.indrelid)
+							AND (ic.oid = i.indexrelid)
+							AND (bc.relname = '" . $table_name . "')
+							AND (i.indisunique != 't')
+							AND (i.indisprimary != 't')";
+					$col = 'index_name';
+				break;
+
+				case 'mysql_40':
+				case 'mysql_41':
+					$sql = 'SHOW KEYS
+						FROM ' . $table_name;
+					$col = 'Key_name';
+				break;
+
+				case 'oracle':
+					$sql = "SELECT index_name
+						FROM user_indexes
+						WHERE table_name = '" . $table_name . "'
+							AND generated = 'N'";
+				break;
+
+				case 'sqlite':
+					$sql = "PRAGMA index_info('" . $table_name . "');";
+					$col = 'name';
+				break;
+			}
+
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (($this->sql_layer == 'mysql_40' || $this->sql_layer == 'mysql_41') && !$row['Non_unique'])
+				{
+					continue;
+				}
+
+				switch ($this->sql_layer)
+				{
+					case 'firebird':
+					case 'oracle':
+					case 'postgres':
+					case 'sqlite':
+						$row[$col] = substr($row[$col], strlen($table_name) + 1);
+					break;
+				}
+
+				$index_array[] = $row[$col];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		return array_map('strtolower', $index_array);
+	}
+
+	/**
+	* Change column type (not name!)
+	*/
+	function sql_column_change($table_name, $column_name, $column_data)
+	{
+		$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
+		$statements = array();
+
+		switch ($this->sql_layer)
+		{
+			case 'firebird':
+				// Change type...
+				$statements[] = 'ALTER TABLE "' . $table_name . '" ALTER COLUMN "' . $column_name . '" TYPE ' . ' ' . $column_data['column_type_sql'];
+			break;
+
+			case 'mssql':
+				$statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql'];
+			break;
+
+			case 'mysql_40':
+			case 'mysql_41':
+				$statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql'];
+			break;
+
+			case 'oracle':
+				$statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql'];
+			break;
+
+			case 'postgres':
+				$sql = 'ALTER TABLE ' . $table_name . ' ';
+
+				$sql_array = array();
+				$sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type'];
+
+				if (isset($column_data['null']))
+				{
+					if ($column_data['null'] == 'NOT NULL')
+					{
+						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL';
+					}
+					else if ($column_data['null'] == 'NULL')
+					{
+						$sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL';
+					}
+				}
+
+				if (isset($column_data['default']))
+				{
+					$sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default'];
+				}
+
+				// we don't want to double up on constraints if we change different number data types
+				if (isset($column_data['constraint']))
+				{
+					$constraint_sql = "SELECT consrc as constraint_data
+								FROM pg_constraint, pg_class bc
+								WHERE conrelid = bc.oid
+									AND bc.relname = '{$table_name}'
+									AND NOT EXISTS (
+										SELECT *
+											FROM pg_constraint as c, pg_inherits as i
+											WHERE i.inhrelid = pg_constraint.conrelid
+												AND c.conname = pg_constraint.conname
+												AND c.consrc = pg_constraint.consrc
+												AND c.conrelid = i.inhparent
+									)";
+
+					$constraint_exists = false;
+
+					$result = $this->db->sql_query($constraint_sql);
+					while ($row = $this->db->sql_fetchrow($result))
+					{
+						if (trim($row['constraint_data']) == trim($column_data['constraint']))
+						{
+							$constraint_exists = true;
+							break;
+						}
+					}
+					$this->db->sql_freeresult($result);
+
+					if (!$constraint_exists)
+					{
+						$sql_array[] = 'ADD ' . $column_data['constraint'];
+					}
+				}
+
+				$sql .= implode(', ', $sql_array);
+
+				$statements[] = $sql;
+			break;
+
+			case 'sqlite':
+
+				$sql = "SELECT sql
+					FROM sqlite_master 
+					WHERE type = 'table' 
+						AND name = '{$table_name}'
+					ORDER BY type DESC, name;";
+				$result = $this->db->sql_query($sql);
+
+				if (!$result)
+				{
+					break;
+				}
+
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				$statements[] = 'begin';
+
+				// Create a temp table and populate it, destroy the existing one
+				$statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']);
+				$statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name;
+				$statements[] = 'DROP TABLE ' . $table_name;
+
+				preg_match('#\((.*)\)#s', $row['sql'], $matches);
+
+				$new_table_cols = trim($matches[1]);
+				$old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols);
+				$column_list = array();
+
+				foreach ($old_table_cols as $key => $declaration)
+				{
+					$entities = preg_split('#\s+#', trim($declaration));
+					$column_list[] = $entities[0];
+					if ($entities[0] == $column_name)
+					{
+						$old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql'];
+					}
+				}
+
+				$columns = implode(',', $column_list);
+
+				// create a new table and fill it up. destroy the temp one
+				$statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');';
+				$statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;';
+				$statements[] = 'DROP TABLE ' . $table_name . '_temp';
+
+				$statements[] = 'commit';
+
+			break;
+		}
+
+		return $this->_sql_run_sql($statements);
+	}
+}
+
+?>
+\ No newline at end of file
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 4dfd58e28c..19080f580e 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2423,7 +2423,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
 
 			if (isset($user->lang[$row['log_operation']]))
 			{
-				// We supress the warning about inappropiate number of passed parameters here due to possible changes within LOG strings from one version to another.
+				// We supress the warning about inappropriate number of passed parameters here due to possible changes within LOG strings from one version to another.
 				$log[$i]['action'] = @vsprintf($log[$i]['action'], $log_data_ary);
 
 				// If within the admin panel we do not censor text out
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 20086e605e..ba73f3dc3c 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -630,7 +630,7 @@ function compose_pm($id, $mode, $action)
 			$return_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=outbox');
 			meta_refresh(3, $return_message_url);
 
-			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
+			$message = $user->lang['MESSAGE_STORED'] . '<br /><br />' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '<a href="' . $return_message_url . '">', '</a>') . '<br /><br />' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '<a href="' . $return_folder_url . '">', '</a>', $user->lang['PM_OUTBOX']);
 			trigger_error($message);
 		}
 
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index b3e79e17a9..fae5a83885 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}"
 
 Hello {USERNAME},
 
-You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view this topic, no more notifications will be sent until you visit the topic.
+You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic.
 
 {U_NEWEST_POST}
 
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 444933b633..260e69c380 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -1,6 +1,6 @@
 Subject: Reactivate your account on "{SITENAME}" - {U_BOARD}
 
-A board administrator forced your account to be reactivated. Your account is currently inactive.
+A board administrator requested that your account be reactivated. Your account is currently inactive.
 Please follow the steps listed here to reactivate your account.
 
 Please keep this e-mail for your records. Your account information is as follows:
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 36e4d0e799..945e25297c 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -294,7 +294,7 @@ $lang = array_merge($lang, array(
 	'POST_ID'						=> 'Post ID',
 	'PREFIX_FOUND'					=> 'A scan of your tables has shown a valid installation using <strong>%s</strong> as table prefix.',
 	'PREPROCESS_STEP'				=> 'Executing pre-processing functions/queries',
-	'PRE_CONVERT_COMPLETE'			=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually adjust several things. After conversion, especially check the permissions assigned, rebuild your search index if necessary and also make sure files got copied correctly, for example avatars and smilies.',
+	'PRE_CONVERT_COMPLETE'			=> 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.',
 	'PROCESS_LAST'					=> 'Processing last statements',
 
 	'REFRESH_PAGE'				=> 'Refresh page to continue conversion',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 35514443a6..e896d72e37 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -207,6 +207,7 @@ $lang = array_merge($lang, array(
 	'USER_CANNOT_FORUM_POST'	=> 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
 
 	'VIEW_MESSAGE'				=> '%sView your submitted message%s',
+	'VIEW_PRIVATE_MESSAGE'		=> '%sView your submitted private message%s',
 
 	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s.',
 	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.',
author	Meik Sievertsen <acydburn@phpbb.com>	2007-09-13 15:01:15 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-09-13 15:01:15 +0000
commit	685282c2cbe8a6d8c7abd77d3801d7242d0ae693 (patch)
tree	0533a1ca066f5c78882782b1a9fcbcb4e2f768f5
parent	e503216834c466de1eb5746d1b2998a8db5de086 (diff)
download	forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.gz forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.bz2 forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.tar.xz forums-685282c2cbe8a6d8c7abd77d3801d7242d0ae693.zip