[Phpgroupware-cvs] phpgwapi/setup tables_current.inc.php tables_up...

[Caeies]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Caeies <Caeies> 06/10/18 12:03:14

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

Log message:
        fix for bug ##18046, size of pk using varchar should not exceed 333 
chars due to utf8

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

Patches:
Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/setup/tables_current.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- tables_current.inc.php      9 Oct 2006 10:44:53 -0000       1.68
+++ tables_current.inc.php      18 Oct 2006 12:03:13 -0000      1.69
@@ -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.68 2006/10/09 10:44:53 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.69 2006/10/18 12:03:13 
Caeies Exp $
        * @internal $Source: 
/cvsroot/phpgwapi/phpgwapi/setup/tables_current.inc.php,v $
        */
 
@@ -657,8 +657,8 @@
                                'ext_user' => array('type' => 'varchar', 
'precision' => 100, 'nullable' => false),
                                'auth_type' => array('type' => 'varchar', 
'precision' => 25, 'nullable' => false),
                                'status' => array('type' => 'char', 'precision' 
=> 1, 'nullable' => false, 'default' => 'A'),
-                               'location' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => false),
-                               'account_lid' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => false)
+                               'location' => array('type' => 'varchar', 
'precision' => 200, 'nullable' => false),
+                               'account_lid' => array('type' => 'varchar', 
'precision' => 25, 'nullable' => false)
                        ),
                        'pk' => array('ext_user', 'location', 'auth_type'),
                        'fk' => array(),

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- tables_update.inc.php       9 Oct 2006 10:44:53 -0000       1.97
+++ tables_update.inc.php       18 Oct 2006 12:03:14 -0000      1.98
@@ -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.97 2006/10/09 10:44:53 
sigurdne Exp $
+       * @version $Id: tables_update.inc.php,v 1.98 2006/10/18 12:03:14 Caeies 
Exp $
        * @internal $Source: 
/cvsroot/phpgwapi/phpgwapi/setup/tables_update.inc.php,v $
        */
 
@@ -1421,14 +1421,16 @@
        function phpgwapi_upgrade0_9_17_506()
        {
                $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               // size of pk fields were modified, due to problems with some 
SQL server not able to handle more than 1000 caracters size for pk
+               // so as using utf8, (100 + 25 + 200) * 3 < 1000, it shouldn't 
complain anymore.
                $GLOBALS['phpgw_setup']->oProc->CreateTable(
                        'phpgw_mapping', array(
                                'fd' => array(
                                        'ext_user' => array('type' => 
'varchar', 'precision' => 100, 'nullable' => false),
                                        'auth_type' => array('type' => 
'varchar', 'precision' => 25, 'nullable' => false),
                                        'status' => array('type' => 'char', 
'precision' => 1, 'nullable' => false, 'default' => 'A'),
-                                       'location' => array('type' => 
'varchar', 'precision' => 255, 'nullable' => false),
-                                       'account_lid' => array('type' => 
'varchar', 'precision' => 255, 'nullable' => false)
+                                       'location' => array('type' => 
'varchar', 'precision' => 200, 'nullable' => false),
+                                       'account_lid' => array('type' => 
'varchar', 'precision' => 25, 'nullable' => false)
                                ),
                                'pk' => array('ext_user', 'location', 
'auth_type'),
                                'fk' => array(),