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

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/04/23 11:30:22

Modified files:
        setup          : tables_current.inc.php 
        inc            : class.schema_proc.inc.php 
                         class.schema_proc_mysql.inc.php 

Log message:
        revert crazy hack - and alter column lenght for appname

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/setup/tables_current.inc.php.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.schema_proc.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.schema_proc_mysql.inc.php.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.schema_proc.inc.php
diff -u phpgwapi/inc/class.schema_proc.inc.php:1.13 
phpgwapi/inc/class.schema_proc.inc.php:1.14
--- phpgwapi/inc/class.schema_proc.inc.php:1.13 Sat Apr 22 18:41:49 2006
+++ phpgwapi/inc/class.schema_proc.inc.php      Sun Apr 23 11:30:22 2006
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage database
-       * @version $Id: class.schema_proc.inc.php,v 1.13 2006/04/22 18:41:49 
sigurdne Exp $
+       * @version $Id: class.schema_proc.inc.php,v 1.14 2006/04/23 11:30:22 
sigurdne Exp $
        */
 
        /**
@@ -434,7 +434,6 @@
                        $iScale = 0;
                        $sDefault = '';
                        $bNullable = true;
-                       $sCollate = '';
 
                        reset($aField);
                        while(list($sAttr, $vAttrVal) = each($aField))
@@ -457,16 +456,13 @@
                                        case 'nullable':
                                                $bNullable = $vAttrVal;
                                                break;
-                                       case 'collate':
-                                               $sCollate = $vAttrVal;
-                                               break;
                                }
                        }
 
                        // Translate the type for the DBMS
                        $sBufNullable = '';
                        $sBufDefault = '';
-                       if($sFieldSQL = 
$this->m_oTranslator->TranslateType($sType, $iPrecision, $iScale, $sCollate))
+                       if($sFieldSQL = 
$this->m_oTranslator->TranslateType($sType, $iPrecision, $iScale))
                        {
                                if($bNullable == False)
                                {
Index: phpgwapi/inc/class.schema_proc_mysql.inc.php
diff -u phpgwapi/inc/class.schema_proc_mysql.inc.php:1.14 
phpgwapi/inc/class.schema_proc_mysql.inc.php:1.15
--- phpgwapi/inc/class.schema_proc_mysql.inc.php:1.14   Sun Apr 23 10:30:30 2006
+++ phpgwapi/inc/class.schema_proc_mysql.inc.php        Sun Apr 23 11:30:22 2006
@@ -8,7 +8,7 @@
        * @license http://www.fsf.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage database
-       * @version $Id: class.schema_proc_mysql.inc.php,v 1.14 2006/04/23 
10:30:30 sigurdne Exp $
+       * @version $Id: class.schema_proc_mysql.inc.php,v 1.15 2006/04/23 
11:30:22 sigurdne Exp $
        */
  
        /**
@@ -60,17 +60,15 @@
                        if($parts[0] == 5 || ($parts[0] == 4 && $parts[1] == 1))
                        {
                                $this->now_statement =  "now()";
-                               $this->do_collation = True;                     
        
                        }
                        else
                        {
                                $this->now_statement =  "'now()'";              
                
-                               $this->do_collation = False;                    
        
                        }
                }
 
                /* Return a type suitable for DDL */
-               function TranslateType($sType, $iPrecision = 0, $iScale = 0, 
$sCollate = '')
+               function TranslateType($sType, $iPrecision = 0, $iScale = 0)
                {
                        $sTranslated = '';
                        switch($sType)
@@ -142,17 +140,7 @@
                                        }
                                        break;
                        }
-
-                       if($this->do_collation)
-                       {
-                               switch($sCollate)
-                               {
-                                       case 'latin1':
-                                               $sTranslated .= ' CHARACTER SET 
latin1 COLLATE latin1_general_ci';
-                                               break;
-                               }
-                       }
-
+                       
                        return $sTranslated;
                }
 
Index: phpgwapi/setup/tables_current.inc.php
diff -u phpgwapi/setup/tables_current.inc.php:1.61 
phpgwapi/setup/tables_current.inc.php:1.62
--- phpgwapi/setup/tables_current.inc.php:1.61  Sat Apr 22 18:41:49 2006
+++ phpgwapi/setup/tables_current.inc.php       Sun Apr 23 11:30:22 2006
@@ -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.61 2006/04/22 18:41:49 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.62 2006/04/23 11:30:22 
sigurdne Exp $
        * @internal $Source: 
/sources/phpgwapi/phpgwapi/setup/tables_current.inc.php,v $
        */
 
@@ -163,9 +163,9 @@
                ),
                'phpgw_lang' => array(
                        'fd' => array(
-                               'message_id' => array('type' => 
'varchar','precision' => '255','nullable' => False,'default' => '','collate' => 
'latin1'),
-                               'app_name' => array('type' => 
'varchar','precision' => '100','nullable' => False,'default' => 
'common','collate' => 'latin1'),
-                               'lang' => array('type' => 'varchar','precision' 
=> '5','nullable' => False,'default' => '','collate' => 'latin1'),
+                               'message_id' => array('type' => 
'varchar','precision' => '255','nullable' => False,'default' => ''),
+                               'app_name' => array('type' => 
'varchar','precision' => '25','nullable' => False,'default' => 'common'),
+                               'lang' => array('type' => 'varchar','precision' 
=> '5','nullable' => False,'default' => ''),
                                'content' => array('type' => 'text')
                        ),
                        'pk' => array('message_id','app_name','lang'),