[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/setup setup.inc.php tables_current.inc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/setup setup.inc.php tables_current.inc... |
|
Date: |
Thu, 26 Oct 2006 14:19:35 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/26 14:19:35
Modified files:
setup : setup.inc.php tables_current.inc.php
tables_update.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_current.inc.php?cvsroot=phpgroupware&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.54&r2=1.55
Patches:
Index: setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- setup.inc.php 18 Oct 2006 09:11:44 -0000 1.48
+++ setup.inc.php 26 Oct 2006 14:19:35 -0000 1.49
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.48 2006/10/18 09:11:44 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.49 2006/10/26 14:19:35 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.527';
+ $setup_info['property']['version'] = '0.9.17.528';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Index: tables_current.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_current.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- tables_current.inc.php 18 Oct 2006 09:11:44 -0000 1.67
+++ tables_current.inc.php 26 Oct 2006 14:19:35 -0000 1.68
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_current.inc.php,v 1.67 2006/10/18 09:11:44
sigurdne Exp $
+ * @version $Id: tables_current.inc.php,v 1.68 2006/10/26 14:19:35
sigurdne Exp $
*/
$phpgw_baseline = array(
@@ -27,11 +27,11 @@
'fm_gab_location' => array(
'fd' => array(
- 'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => False),
+ 'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => False),
'gab_id' => array('type' =>
'varchar','precision' => '20','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -221,7 +221,7 @@
'fm_location1' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc1_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'part_of_town_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -243,7 +243,7 @@
'fm_location1_history' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '16','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc1_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'part_of_town_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -276,7 +276,7 @@
'fm_location2' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc2_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -295,7 +295,7 @@
'fm_location2_history' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc2_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
@@ -325,7 +325,7 @@
'fm_location3' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
@@ -345,7 +345,7 @@
'fm_location3_history' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3_name' => array('type' =>
'varchar','precision' => '50','nullable' => True),
@@ -377,7 +377,7 @@
'fm_location4' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
@@ -401,7 +401,7 @@
'fm_location4_history' => array(
'fd' => array(
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => False),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => False),
@@ -853,7 +853,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -950,7 +950,7 @@
'p_num' => array('type' =>
'varchar','precision' => '15','nullable' => True),
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1234,7 +1234,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1273,7 +1273,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1330,7 +1330,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1636,7 +1636,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => False),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1663,7 +1663,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1692,7 +1692,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1721,7 +1721,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
@@ -1750,7 +1750,7 @@
'p_entity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'p_cat_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
'location_code' => array('type' =>
'varchar','precision' => '20','nullable' => True),
- 'loc1' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
+ 'loc1' => array('type' => 'varchar','precision'
=> '6','nullable' => True),
'loc2' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc3' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
'loc4' => array('type' => 'varchar','precision'
=> '4','nullable' => True),
Index: tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- tables_update.inc.php 18 Oct 2006 09:11:44 -0000 1.54
+++ tables_update.inc.php 26 Oct 2006 14:19:35 -0000 1.55
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.54 2006/10/18 09:11:44
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.55 2006/10/26 14:19:35
sigurdne Exp $
*/
/**
@@ -1263,7 +1263,6 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_template_hours','entry_date',array('type'
=> 'int','precision' => 4,'nullable' => True));
-//
$GLOBALS['phpgw_setup']->oProc->DropColumn('fm_template_hours',null,'workorder_id');
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
$GLOBALS['setup_info']['property']['currentver'] = '0.9.17.519';
@@ -1466,3 +1465,40 @@
$GLOBALS['setup_info']['property']['currentver'] = '0.9.17.527';
return $GLOBALS['setup_info']['property']['currentver'];
}
+
+ /**
+ * Update property version from 0.9.17.527 to 0.9.17.528
+ */
+
+ $test[] = '0.9.17.527';
+ function property_upgrade0_9_17_527()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_gab_location','location_code',array('type'
=> 'varchar','precision' => '20','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_gab_location','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location1','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location1_history','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location2','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location2_history','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location3','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location3_history','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location4','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_location4_history','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_request','loc1',array('type' =>
'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_tts_tickets','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_project','loc1',array('type' =>
'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_investment','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_document','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_entity_1_1','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_entity_1_2','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_entity_1_3','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_entity_2_1','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_entity_2_2','loc1',array('type'
=> 'varchar','precision' => '6','nullable' => True));
+
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE
fm_location_attrib set precision_ = '6' where column_name = 'loc1'");
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.528';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/setup setup.inc.php tables_current.inc...,
Sigurd Nes <=