[Phpbb-checkins] r9956 - /branches/phpBB-3_0_0/phpBB/install/database_update.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Aug 11 15:49:58 2009
New Revision: 9956

Log:
do not change column if column already exists.

Modified:
    branches/phpBB-3_0_0/phpBB/install/database_update.php

Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Tue Aug 11 15:49:58 2009
***************
*** 1860,1869 ****
  			{
  				foreach ($columns as $column_name => $column_data)
  				{
! 					// Only add the column if it does not exist yet, else change it (to be consistent)
  					if ($column_exists = $this->sql_column_exists($table, $column_name))
  					{
! 						$result = $this->sql_column_change($table, $column_name, $column_data, true);
  					}
  					else
  					{
--- 1860,1871 ----
  			{
  				foreach ($columns as $column_name => $column_data)
  				{
! 					// Only add the column if it does not exist yet
  					if ($column_exists = $this->sql_column_exists($table, $column_name))
  					{
! 						continue;
! 						// This is commented out here because it can take tremendous time on updates
! //						$result = $this->sql_column_change($table, $column_name, $column_data, true);
  					}
  					else
  					{