extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* API: fix SQL error in upgrade from 1.8/11.1: Incorrect string value *** for column async_data

Browse Source
This commit is contained in:
Ralf Becker 2015-10-27 08:40:15 +00:00
parent d8255179d8
commit 9ec5116d7e
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/setup/setup.inc.php
View File

@ -12,7 +12,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'EGroupware API'; $setup_info['phpgwapi']['title'] = 'EGroupware API';
$setup_info['phpgwapi']['version'] = '14.3.904'; $setup_info['phpgwapi']['version'] = '14.3.905';
$setup_info['phpgwapi']['versions']['current_header'] = '1.29'; $setup_info['phpgwapi']['versions']['current_header'] = '1.29';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;

2
phpgwapi/setup/tables_current.inc.php
View File

@ -190,7 +190,7 @@ $phpgw_baseline = array(
'async_next' => array('type' => 'int','meta' => 'timestamp','precision' => '4','nullable' => False,'comment' => 'timestamp of next run'), 'async_next' => array('type' => 'int','meta' => 'timestamp','precision' => '4','nullable' => False,'comment' => 'timestamp of next run'),
'async_times' => array('type' => 'ascii','precision' => '255','nullable' => False,'comment' => 'serialized array with values for keys hour,min,day,month,year'), 'async_times' => array('type' => 'ascii','precision' => '255','nullable' => False,'comment' => 'serialized array with values for keys hour,min,day,month,year'),
'async_method' => array('type' => 'ascii','precision' => '80','nullable' => False,'comment' => 'app.class.method class::method to execute'), 'async_method' => array('type' => 'ascii','precision' => '80','nullable' => False,'comment' => 'app.class.method class::method to execute'),
'async_data' => array('type' => 'ascii','precision' => '8192','nullable' => False,'comment' => 'serialized array with data to pass to method'), 'async_data' => array('type' => 'varchar','precision' => '8192','nullable' => False,'comment' => 'serialized array with data to pass to method'),
'async_account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'creator of job'), 'async_account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'creator of job'),
'async_auto_id' => array('type' => 'auto','nullable' => False) 'async_auto_id' => array('type' => 'auto','nullable' => False)
), ),

33
phpgwapi/setup/tables_update.inc.php
View File

@ -896,6 +896,25 @@ function phpgwapi_upgrade14_3_004()
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.005'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.005';
} }
/**
* Change egw_async.async_data back to varchar, as it can contain utf-8 data
*
* @return string
*/
function phpgwapi_upgrade14_3_005()
{
$GLOBALS['run-from-upgrade14_3_005'] = true;
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_async','async_data',array(
'type' => 'varchar',
'precision' => '8192',
'nullable' => False,
'comment' => 'serialized array with data to pass to method'
));
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.006';
}
/** /**
* Updates on the way to 15.1 * Updates on the way to 15.1
*/ */
@ -905,7 +924,7 @@ function phpgwapi_upgrade14_3_004()
* *
* @return string * @return string
*/ */
function phpgwapi_upgrade14_3_005() function phpgwapi_upgrade14_3_006()
{ {
$GLOBALS['egw_setup']->oProc->DropTable('egw_api_content_history'); $GLOBALS['egw_setup']->oProc->DropTable('egw_api_content_history');
@ -969,3 +988,15 @@ function phpgwapi_upgrade14_3_903()
} }
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.904'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.904';
} }
/**
* Run 14.3.005 upgrade for everyone who was already on 14.3.9xx
*/
function phpgwapi_upgrade14_3_904()
{
if (empty($GLOBALS['run-from-upgrade14_3_005']))
{
phpgwapi_upgrade14_3_005();
}
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '14.3.905';
}