[Phpgroupware-cvs] phpgwapi/inc class.schema_proc_mysql.inc.php

[Sigurd Nes]

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

Modified files:
        inc            : class.schema_proc_mysql.inc.php 

Log message:
        collation per column only for mysql 4.1 and later

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

Patches:
Index: phpgwapi/inc/class.schema_proc_mysql.inc.php
diff -u phpgwapi/inc/class.schema_proc_mysql.inc.php:1.13 
phpgwapi/inc/class.schema_proc_mysql.inc.php:1.14
--- phpgwapi/inc/class.schema_proc_mysql.inc.php:1.13   Sat Apr 22 18:41:49 2006
+++ phpgwapi/inc/class.schema_proc_mysql.inc.php        Sun Apr 23 10:30:30 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.13 2006/04/22 
18:41:49 sigurdne Exp $
+       * @version $Id: class.schema_proc_mysql.inc.php,v 1.14 2006/04/23 
10:30:30 sigurdne Exp $
        */
  
        /**
@@ -59,11 +59,13 @@
                        $parts   = explode('.',$version);
                        if($parts[0] == 5 || ($parts[0] == 4 && $parts[1] == 1))
                        {
-                               $this->now_statement =  "now()";                
                
+                               $this->now_statement =  "now()";
+                               $this->do_collation = True;                     
        
                        }
                        else
                        {
                                $this->now_statement =  "'now()'";              
                
+                               $this->do_collation = False;                    
        
                        }
                }
 
@@ -141,11 +143,14 @@
                                        break;
                        }
 
-                       switch($sCollate)
+                       if($this->do_collation)
                        {
-                               case 'latin1':
-                                       $sTranslated .= ' CHARACTER SET latin1 
COLLATE latin1_general_ci';
-                                       break;
+                               switch($sCollate)
+                               {
+                                       case 'latin1':
+                                               $sTranslated .= ' CHARACTER SET 
latin1 COLLATE latin1_general_ci';
+                                               break;
+                               }
                        }
 
                        return $sTranslated;