phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/setup tables_update.inc.php tables_cur...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] phpgwapi/setup tables_update.inc.php tables_cur...
Date: Mon, 09 Oct 2006 10:44:53 +0000

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/10/09 10:44:53

Modified files:
        setup          : tables_update.inc.php tables_current.inc.php 
                         setup.inc.php 

Log message:
        Revert change on custom attributes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/tables_update.inc.php?cvsroot=phpgwapi&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/tables_current.inc.php?cvsroot=phpgwapi&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/setup/setup.inc.php?cvsroot=phpgwapi&r1=1.78&r2=1.79

Patches:
Index: tables_update.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- tables_update.inc.php       8 Oct 2006 16:47:21 -0000       1.96
+++ tables_update.inc.php       9 Oct 2006 10:44:53 -0000       1.97
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage setup
-       * @version $Id: tables_update.inc.php,v 1.96 2006/10/08 16:47:21 
sigurdne Exp $
+       * @version $Id: tables_update.inc.php,v 1.97 2006/10/09 10:44:53 
sigurdne Exp $
        * @internal $Source: 
/sources/phpgwapi/phpgwapi/setup/tables_update.inc.php,v $
        */
 
@@ -1493,4 +1493,46 @@
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
        }
+
+       $test[] = '0.9.17.508';
+       function phpgwapi_upgrade0_9_17_508()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               
+               
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_cust_attribute');
+               
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_cust_attribute_table');        
        
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                       'phpgw_cust_attribute', array(
+                               'fd' => array(
+                                       'appname' => array('type' => 
'varchar','precision' => '20','nullable' => False),
+                                       'location' => array('type' => 
'varchar','precision' => '30','nullable' => False),
+                                       'id' => array('type' => 
'int','precision' => '4','nullable' => False),
+                                       'column_name' => array('type' => 
'varchar','precision' => '20','nullable' => False),
+                                       'input_text' => array('type' => 
'varchar','precision' => '50','nullable' => False),
+                                       'statustext' => array('type' => 
'varchar','precision' => '150','nullable' => False),
+                                       'datatype' => array('type' => 
'varchar','precision' => '10','nullable' => False),
+                                       'search' => array('type' => 
'int','precision' => '2','nullable' => True),
+                                       'history' => array('type' => 
'int','precision' => '2','nullable' => True),
+                                       'list' => array('type' => 
'int','precision' => '4','nullable' => True),
+                                       'attrib_sort' => array('type' => 
'int','precision' => '4','nullable' => True),
+                                       'size' => array('type' => 
'int','precision' => '4','nullable' => True),
+                                       'precision_' => array('type' => 
'int','precision' => '4','nullable' => True),
+                                       'scale' => array('type' => 
'int','precision' => '4','nullable' => True),
+                                       'default_value' => array('type' => 
'varchar','precision' => '20','nullable' => True),
+                                       'nullable' => array('type' => 
'varchar','precision' => '5','nullable' => True)
+                               ),
+                               'pk' => array('appname','location','id'),
+                               'fk' => array(),
+                               'ix' => array(),
+                               'uc' => array()
+                               )
+               );
+
+               $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.17.509';
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+               return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+       }
+       
+       
 ?>

Index: tables_current.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/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      8 Oct 2006 16:47:21 -0000       1.67
+++ tables_current.inc.php      9 Oct 2006 10:44:53 -0000       1.68
@@ -5,7 +5,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage setup
-       * @version $Id: tables_current.inc.php,v 1.67 2006/10/08 16:47:21 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.68 2006/10/09 10:44:53 
sigurdne Exp $
        * @internal $Source: 
/sources/phpgwapi/phpgwapi/setup/tables_current.inc.php,v $
        */
 
@@ -600,21 +600,10 @@
                        'ix' => 
array('cust_field_value_val','cust_field_id','appname','location','rec_id'),
                        'uc' => array()
                ),
-               'phpgw_cust_attribute_table' => array(
+               'phpgw_cust_attribute' => array(
                        'fd' => array(
-                               'table_id' => array('type' => 'auto','nullable' 
=> False),
                                'appname' => array('type' => 
'varchar','precision' => '20','nullable' => False),
                                'location' => array('type' => 
'varchar','precision' => '30','nullable' => False),
-                               'table_name' => array('type' => 
'varchar','precision' => '50','nullable' => False)
-                       ),
-                       'pk' => array('table_id'),
-                       'fk' => array(),
-                       'ix' => array(),
-                       'uc' => array('appname','location')
-               ),
-               'phpgw_cust_attribute' => array(
-                       'fd' => array(
-                               'table_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'column_name' => array('type' => 
'varchar','precision' => '20','nullable' => False),
                                'input_text' => array('type' => 
'varchar','precision' => '50','nullable' => False),
@@ -630,7 +619,7 @@
                                'default_value' => array('type' => 
'varchar','precision' => '20','nullable' => True),
                                'nullable' => array('type' => 
'varchar','precision' => '5','nullable' => True)
                        ),
-                       'pk' => array('table_id','id'),
+                       'pk' => array('appname','location','id'),
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()

Index: setup.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/setup/setup.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- setup.inc.php       8 Oct 2006 16:47:21 -0000       1.78
+++ setup.inc.php       9 Oct 2006 10:44:53 -0000       1.79
@@ -5,14 +5,14 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage setup
-       * @version $Id: setup.inc.php,v 1.78 2006/10/08 16:47:21 sigurdne Exp $
+       * @version $Id: setup.inc.php,v 1.79 2006/10/09 10:44:53 sigurdne Exp $
        * @internal $Source: /sources/phpgwapi/phpgwapi/setup/setup.inc.php,v $
        */
 
        // Basic information about this app
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
        $setup_info['phpgwapi']['title']     = 'phpgwapi';
-       $setup_info['phpgwapi']['version']   = '0.9.17.508';
+       $setup_info['phpgwapi']['version']   = '0.9.17.509';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.25';
        $setup_info['phpgwapi']['enable']    = 3;
        $setup_info['phpgwapi']['app_order'] = 1;
@@ -56,7 +56,6 @@
                'phpgw_cust_fields',
                'phpgw_cust_field_types',
                'phpgw_cust_field_values',
-               'phpgw_cust_attribute_table',
                'phpgw_cust_attribute',
                'phpgw_cust_choice',
                'phpgw_cust_function',




reply via email to

[Prev in Thread] Current Thread [Next in Thread]