extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02: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:00 +00:00
parent a2ab5c1df2
commit 9f4a6db299
3 changed files with 20 additions and 10 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 */
$setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'EGroupware API';
$setup_info['phpgwapi']['version'] = '14.3.005';
$setup_info['phpgwapi']['version'] = '14.3.006';
$setup_info['phpgwapi']['versions']['current_header'] = '1.29';
$setup_info['phpgwapi']['enable'] = 3;
$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_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_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_auto_id' => array('type' => 'auto','nullable' => False)
),

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

@ -415,13 +415,6 @@ function phpgwapi_upgrade14_2_014()
'comment' => 'app.class.method class::method to execute'
));*/
/* done by RefreshTable() anyway
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_async','async_data',array(
'type' => 'ascii',
'precision' => '8192',
'nullable' => False,
'comment' => 'serialized array with data to pass to method'
));*/
/* done by RefreshTable() anyway
$GLOBALS['egw_setup']->oProc->AddColumn('egw_async','async_auto_id',array(
'type' => 'auto',
'nullable' => False
@ -432,7 +425,7 @@ function phpgwapi_upgrade14_2_014()
'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_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_auto_id' => array('type' => 'auto','nullable' => False)
),
@ -885,3 +878,20 @@ function phpgwapi_upgrade14_3_004()
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['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';
}