From 2e44b80d0713a570ffb8be4462557cc1948bb716 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 11 Jan 2013 10:21:33 +0000 Subject: [PATCH] add deleted column, to match nathans backport --- resources/setup/setup.inc.php | 2 +- resources/setup/tables_current.inc.php | 3 ++- resources/setup/tables_update.inc.php | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php index 049042e37c..7b982df3e3 100755 --- a/resources/setup/setup.inc.php +++ b/resources/setup/setup.inc.php @@ -13,7 +13,7 @@ $setup_info['resources']['name'] = 'resources'; $setup_info['resources']['title'] = 'Resources'; -$setup_info['resources']['version'] = '1.9.001'; +$setup_info['resources']['version'] = '1.9.002'; $setup_info['resources']['app_order'] = 5; $setup_info['resources']['tables'] = array('egw_resources','egw_resources_extra'); $setup_info['resources']['enable'] = 1; diff --git a/resources/setup/tables_current.inc.php b/resources/setup/tables_current.inc.php index 81e1deefaa..aa1ad6bd3b 100755 --- a/resources/setup/tables_current.inc.php +++ b/resources/setup/tables_current.inc.php @@ -28,7 +28,8 @@ $phpgw_baseline = array( 'picture_src' => array('type' => 'varchar','precision' => '20'), 'accessory_of' => array('type' => 'int','precision' => '11','default' => '-1'), 'storage_info' => array('type' => 'varchar','precision' => '200'), - 'inventory_number' => array('type' => 'varchar','precision' => '20') + 'inventory_number' => array('type' => 'varchar','precision' => '20'), + 'deleted' => array('type' => 'int','precision' => '8') ), 'pk' => array('res_id'), 'fk' => array(), diff --git a/resources/setup/tables_update.inc.php b/resources/setup/tables_update.inc.php index def1e89040..cef53c6417 100755 --- a/resources/setup/tables_update.inc.php +++ b/resources/setup/tables_update.inc.php @@ -335,3 +335,14 @@ function resources_upgrade1_8() return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001'; } + +function resources_upgrade1_9_001() +{ + $GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','deleted',array( + 'type' => 'int', + 'precision' => '8' + )); + + return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.002'; +} +