[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/03/13 14:25:06

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

Log message:
        check the db-version and applies the correct statement for the function 
now()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.schema_proc_mysql.inc.php.diff?tr1=1.11&tr2=1.12&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.11 
phpgwapi/inc/class.schema_proc_mysql.inc.php:1.12
--- phpgwapi/inc/class.schema_proc_mysql.inc.php:1.11   Wed Feb 22 09:39:43 2006
+++ phpgwapi/inc/class.schema_proc_mysql.inc.php        Mon Mar 13 14:25:06 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.11 2006/02/22 
09:39:43 skwashd Exp $
+       * @version $Id: class.schema_proc_mysql.inc.php,v 1.12 2006/03/13 
14:25:06 sigurdne Exp $
        */
  
        /**
@@ -30,6 +30,40 @@
                function schema_proc_mysql()
                {
                        $this->m_sStatementTerminator = ';';
+                       /* The use of a temp_db is to allow this process to be 
run from other than setup*/
+                       $temp_db = CreateObject('phpgwapi.db');
+                       if($GLOBALS['phpgw_info']['server']['db_name'])
+                       {
+                               $temp_db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
+                               $temp_db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
+                               $temp_db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
+                               $temp_db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
+                               $temp_db->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
+                       }
+                       else
+                       {
+                               $ConfigDomain = 
get_var('ConfigDomain',array('COOKIE','POST'));
+                               $phpgw_domain = $GLOBALS['phpgw_domain'];
+       
+                               $temp_db->Host     = 
$phpgw_domain[$ConfigDomain]['db_host'];
+                               $temp_db->Database = 
$phpgw_domain[$ConfigDomain]['db_name'];
+                               $temp_db->User     = 
$phpgw_domain[$ConfigDomain]['db_user'];
+                               $temp_db->Password = 
$phpgw_domain[$ConfigDomain]['db_pass'];
+                       }
+
+                       $temp_db->query("SELECT version() as 
version",__LINE__,__FILE__);
+                       $temp_db->next_record();
+                       $version = $temp_db->f('version');
+                       $parts   = explode('.',$version);
+                       if($parts[0] == 5 || ($parts[0] == 4 && $parts[1] == 1))
+                       {
+                               $this->now_statement =  "now()";                
                
+                       }
+                       else
+                       {
+                               $this->now_statement =  "'now()'";              
                
+                       }
+
                }
 
                /* Return a type suitable for DDL */
@@ -114,7 +148,7 @@
                        {
                                case 'current_date':
                                case 'current_timestamp':
-                                       return "now()";
+                                       return $this->now_statement;
                        }
                        return "'" . $sDefault . "'";
                }