[Fmsystem-commits] [15693] API: timestamp for type integer

[sigurdne]

Revision: 15693
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15693
Author:   sigurdne
Date:     2016-09-19 09:29:58 +0000 (Mon, 19 Sep 2016)
Log Message:
-----------
API: timestamp for type integer

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.schema_proc.inc.php
    trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php

Modified: trunk/phpgwapi/inc/class.schema_proc.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc.inc.php        2016-09-19 09:29:21 UTC 
(rev 15692)
+++ trunk/phpgwapi/inc/class.schema_proc.inc.php        2016-09-19 09:29:58 UTC 
(rev 15693)
@@ -522,7 +522,7 @@
                                {
                                        if($DEBUG) { echo '<br>_GetFieldSQL(): 
Calling TranslateDefault for "' . $sDefault . '"'; }
                                        // Get default DDL - useful for 
differences in date defaults (eg, now() vs. getdate())
-                                       $sTranslatedDefault = 
$this->m_oTranslator->TranslateDefault($sDefault);
+                                       $sTranslatedDefault = 
$this->m_oTranslator->TranslateDefault($sDefault, $sType);
                                        $sBufDefault = " DEFAULT 
$sTranslatedDefault";
                                        //$sFieldSQL .= " DEFAULT 
$sTranslatedDefault";
                                }

Modified: trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php  2016-09-19 09:29:21 UTC 
(rev 15692)
+++ trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php  2016-09-19 09:29:58 UTC 
(rev 15693)
@@ -116,7 +116,7 @@
                        return $sTranslated;
                }
 
-               function TranslateDefault($sDefault)
+               function TranslateDefault($sDefault, $sType)
                {
                        // Need Strict comparisons for true/false in case of 
datatype bolean
                        if ($sDefault === true || $sDefault === 'true' || 
$sDefault === 'True')
@@ -129,7 +129,14 @@
                        }
                        else if ($sDefault == 'current_date' || $sDefault == 
'current_timestamp')
                        {
-                               $ret= "now()";
+                               if(preg_match('/int/i', $sType))
+                               {
+                                       $ret= "extract( epoch from now())";
+                               }
+                               else
+                               {
+                                       $ret= "now()";
+                               }
                        }
                        else
                        {
@@ -681,7 +688,7 @@
                        }                                                       
        
                        elseif(!is_numeric($sDefault) && $sDefault != '')
                        {
-                               $sTranslatedDefault = 
$this->TranslateDefault($sDefault);
+                               $sTranslatedDefault = 
$this->TranslateDefault($sDefault, $sType);
                                $defaultSQL = " DEFAULT $sTranslatedDefault";
                        }
                        elseif($sDefault)