[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7308] api: handle default values for bolean
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7308] api: handle default values for bolean |
|
Date: |
Thu, 26 May 2011 08:58:58 +0000 |
Revision: 7308
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7308
Author: sigurdne
Date: 2011-05-26 08:58:58 +0000 (Thu, 26 May 2011)
Log Message:
-----------
api: handle default values for bolean
Modified Paths:
--------------
trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php
trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php
trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php
trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php
Modified: trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php 2011-05-26 08:30:19 UTC
(rev 7307)
+++ trunk/phpgwapi/inc/class.schema_proc_mssql.inc.php 2011-05-26 08:58:58 UTC
(rev 7308)
@@ -109,14 +109,24 @@
function TranslateDefault($sDefault)
{
- switch ($sDefault)
+ // Need Strict comparisons for true/false in case of
datatype bolean
+ if ($sDefault === true || $sDefault === 'true' ||
$sDefault === 'True')
{
- case 'current_date':
- case 'current_timestamp':
- return "GetDate()";
+ $ret= 1;
}
-
- return "'" . $sDefault . "'";
+ else if ($sDefault === false || $sDefault === 'false'
|| $sDefault === 'False')
+ {
+ $ret= 0;
+ }
+ else if ($sDefault == 'current_date' || $sDefault ==
'current_timestamp')
+ {
+ $ret= 'GetDate()';
+ }
+ else
+ {
+ $ret= "'" . $sDefault . "'";
+ }
+ return $ret;
}
// Inverse of above, convert sql column types to array info
Modified: trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php 2011-05-26 08:30:19 UTC
(rev 7307)
+++ trunk/phpgwapi/inc/class.schema_proc_mysql.inc.php 2011-05-26 08:58:58 UTC
(rev 7308)
@@ -139,21 +139,25 @@
function TranslateDefault($sDefault)
{
- switch ($sDefault)
+
+ // Need Strict comparisons for true/false in case of
datatype bolean
+ if ($sDefault === true || $sDefault === 'true' ||
$sDefault === 'True')
{
- case 'current_date':
- case 'current_timestamp':
- return 'now()';
- break;
- case 'true':
- case 'True':
- return 1;
- break;
- case 'false':
- case 'False':
- return 0;
+ $ret= 1;
}
- return "'" . $sDefault . "'";
+ else if ($sDefault === false || $sDefault === 'false'
|| $sDefault === 'False')
+ {
+ $ret= 0;
+ }
+ else if ($sDefault == 'current_date' || $sDefault ==
'current_timestamp')
+ {
+ $ret= 'now()';
+ }
+ else
+ {
+ $ret= "'" . $sDefault . "'";
+ }
+ return $ret;
}
/* Inverse of above, convert sql column types to array info */
Modified: trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php 2011-05-26 08:30:19 UTC
(rev 7307)
+++ trunk/phpgwapi/inc/class.schema_proc_oracle.inc.php 2011-05-26 08:58:58 UTC
(rev 7308)
@@ -83,14 +83,28 @@
function TranslateDefault($sDefault)
{
- switch ($sDefault)
+ // Need Strict comparisons for true/false in case of
datatype bolean
+ if ($sDefault === true || $sDefault === 'true' ||
$sDefault === 'True')
{
- case 'current_date':
- return "sysdate";
- case 'current_timestamp':
- return "systimestamp";
+ $ret= 1;
}
- return "'" . $sDefault . "'";
+ else if ($sDefault === false || $sDefault === 'false'
|| $sDefault === 'False')
+ {
+ $ret= 0;
+ }
+ else if ($sDefault == 'current_date')
+ {
+ $ret= 'sysdate';
+ }
+ else if ($sDefault == 'current_timestamp')
+ {
+ $ret= 'systimestamp';
+ }
+ else
+ {
+ $ret= "'" . $sDefault . "'";
+ }
+ return $ret;
}
/* Inverse of above, convert sql column types to array info */
Modified: trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php 2011-05-26 08:30:19 UTC
(rev 7307)
+++ trunk/phpgwapi/inc/class.schema_proc_pgsql.inc.php 2011-05-26 08:58:58 UTC
(rev 7308)
@@ -112,13 +112,24 @@
function TranslateDefault($sDefault)
{
- switch ($sDefault)
+ // Need Strict comparisons for true/false in case of
datatype bolean
+ if ($sDefault === true || $sDefault === 'true' ||
$sDefault === 'True')
{
- case 'current_date':
- case 'current_timestamp':
- return "now()";
+ $ret= 'True';
}
- return "'" . $sDefault . "'";
+ else if ($sDefault === false || $sDefault === 'false'
|| $sDefault === 'False')
+ {
+ $ret= 'False';
+ }
+ else if ($sDefault == 'current_date' || $sDefault ==
'current_timestamp')
+ {
+ $ret= "now()";
+ }
+ else
+ {
+ $ret= "'" . $sDefault . "'";
+ }
+ return $ret;
}
/* Inverse of above, convert sql column types to array info */
Modified: trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php 2011-05-26 08:30:19 UTC
(rev 7307)
+++ trunk/phpgwapi/inc/class.schema_proc_sapdb.inc.php 2011-05-26 08:58:58 UTC
(rev 7308)
@@ -146,13 +146,24 @@
*/
function TranslateDefault($sDefault)
{
- switch ($sDefault)
+ // Need Strict comparisons for true/false in case of
datatype bolean
+ if ($sDefault === true || $sDefault === 'true' ||
$sDefault === 'True')
{
- case 'current_date':
- case 'current_timestamp':
- return 'TIMESTAMP';
+ $ret= 1;
}
- return "'" . $sDefault . "'";
+ else if ($sDefault === false || $sDefault === 'false'
|| $sDefault === 'False')
+ {
+ $ret= 0;
+ }
+ else if ($sDefault == 'current_date' || $sDefault ==
'current_timestamp')
+ {
+ $ret= 'TIMESTAMP';
+ }
+ else
+ {
+ $ret= "'" . $sDefault . "'";
+ }
+ return $ret;
}
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7308] api: handle default values for bolean,
Sigurd Nes <=