summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/adodb-ado.inc.php6
-rw-r--r--drivers/adodb-ado5.inc.php6
-rw-r--r--drivers/adodb-db2.inc.php2
-rw-r--r--drivers/adodb-oci8.inc.php4
-rw-r--r--drivers/adodb-odbtp.inc.php4
-rw-r--r--drivers/adodb-oracle.inc.php4
-rw-r--r--drivers/adodb-sqlite.inc.php8
-rw-r--r--drivers/adodb-sqlite3.inc.php4
-rw-r--r--drivers/adodb-sybase.inc.php4
9 files changed, 19 insertions, 23 deletions
diff --git a/drivers/adodb-ado.inc.php b/drivers/adodb-ado.inc.php
index 30edf28b..5164c651 100644
--- a/drivers/adodb-ado.inc.php
+++ b/drivers/adodb-ado.inc.php
@@ -574,7 +574,7 @@ class ADORecordSet_ado extends ADORecordSet {
$val=(float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
else
$val = $f->value;
- $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ $this->fields[] = date('Y-m-d H:i:s',$val);
}
break;
case 133:// A date value (yyyymmdd)
@@ -589,8 +589,8 @@ class ADORecordSet_ado extends ADORecordSet {
if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
else $val = $f->value;
- if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
- else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ if (($val % 86400) == 0) $this->fields[] = date('Y-m-d',$val);
+ else $this->fields[] = date('Y-m-d H:i:s',$val);
}
break;
case 1: // null
diff --git a/drivers/adodb-ado5.inc.php b/drivers/adodb-ado5.inc.php
index 53bdc6a1..6e5759e3 100644
--- a/drivers/adodb-ado5.inc.php
+++ b/drivers/adodb-ado5.inc.php
@@ -621,7 +621,7 @@ class ADORecordSet_ado extends ADORecordSet {
$val= (float) variant_cast($f->value,VT_R8)*3600*24-2209161600;
else
$val = $f->value;
- $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ $this->fields[] = date('Y-m-d H:i:s',$val);
}
break;
case 133:// A date value (yyyymmdd)
@@ -636,8 +636,8 @@ class ADORecordSet_ado extends ADORecordSet {
if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
else $val = $f->value;
- if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
- else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+ if (($val % 86400) == 0) $this->fields[] = date('Y-m-d',$val);
+ else $this->fields[] = date('Y-m-d H:i:s',$val);
}
break;
case 1: // null
diff --git a/drivers/adodb-db2.inc.php b/drivers/adodb-db2.inc.php
index f04541c8..eb865c0b 100644
--- a/drivers/adodb-db2.inc.php
+++ b/drivers/adodb-db2.inc.php
@@ -396,7 +396,7 @@ class ADODB_db2 extends ADOConnection {
{
if (empty($ts) && $ts !== 0) return 'null';
if (is_string($ts)) $ts = ADORecordSet::unixTimeStamp($ts);
- return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
+ return 'TO_DATE('.date($this->fmtTimeStamp,$ts).",'YYYY-MM-DD HH24:MI:SS')";
}
/**
diff --git a/drivers/adodb-oci8.inc.php b/drivers/adodb-oci8.inc.php
index d8b71c6e..38b3df4b 100644
--- a/drivers/adodb-oci8.inc.php
+++ b/drivers/adodb-oci8.inc.php
@@ -396,7 +396,7 @@ END;
$ds = $d->format($this->fmtDate);
}
else {
- $ds = adodb_date($this->fmtDate,$d);
+ $ds = date($this->fmtDate,$d);
}
return "TO_DATE(".$ds.",'".$this->dateformat."')";
@@ -425,7 +425,7 @@ END;
$tss = $ts->format("'Y-m-d H:i:s'");
}
else {
- $tss = adodb_date("'Y-m-d H:i:s'",$ts);
+ $tss = date("'Y-m-d H:i:s'",$ts);
}
return $tss;
diff --git a/drivers/adodb-odbtp.inc.php b/drivers/adodb-odbtp.inc.php
index b4e12601..46bf9c4a 100644
--- a/drivers/adodb-odbtp.inc.php
+++ b/drivers/adodb-odbtp.inc.php
@@ -81,7 +81,7 @@ class ADODB_odbtp extends ADOConnection{
if ($isfld) return "convert(date, $d, 120)";
if (is_string($d)) $d = ADORecordSet::UnixDate($d);
- $d = adodb_date($this->fmtDate,$d);
+ $d = date($this->fmtDate,$d);
return "convert(date, $d, 120)";
}
@@ -91,7 +91,7 @@ class ADODB_odbtp extends ADOConnection{
if ($isfld) return "convert(datetime, $d, 120)";
if (is_string($d)) $d = ADORecordSet::UnixDate($d);
- $d = adodb_date($this->fmtDate,$d);
+ $d = date($this->fmtDate,$d);
return "convert(datetime, $d, 120)";
}
*/
diff --git a/drivers/adodb-oracle.inc.php b/drivers/adodb-oracle.inc.php
index 5cd4bedf..7c061b07 100644
--- a/drivers/adodb-oracle.inc.php
+++ b/drivers/adodb-oracle.inc.php
@@ -41,7 +41,7 @@ class ADODB_oracle extends ADOConnection {
{
if (is_string($d)) $d = ADORecordSet::UnixDate($d);
if (is_object($d)) $ds = $d->format($this->fmtDate);
- else $ds = adodb_date($this->fmtDate,$d);
+ else $ds = date($this->fmtDate,$d);
return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
}
@@ -51,7 +51,7 @@ class ADODB_oracle extends ADOConnection {
if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
if (is_object($ts)) $ds = $ts->format($this->fmtDate);
- else $ds = adodb_date($this->fmtTimeStamp,$ts);
+ else $ds = date($this->fmtTimeStamp,$ts);
return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
}
diff --git a/drivers/adodb-sqlite.inc.php b/drivers/adodb-sqlite.inc.php
index 697d43a6..00638e70 100644
--- a/drivers/adodb-sqlite.inc.php
+++ b/drivers/adodb-sqlite.inc.php
@@ -36,8 +36,8 @@ class ADODB_sqlite extends ADOConnection {
var $hasInsertID = true; /// supports autoincrement ID?
var $hasAffectedRows = true; /// supports affected rows for update/delete?
var $metaTablesSQL = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name";
- var $sysDate = "adodb_date('Y-m-d')";
- var $sysTimeStamp = "adodb_date('Y-m-d H:i:s')";
+ var $sysDate = "date('Y-m-d')";
+ var $sysTimeStamp = "date('Y-m-d H:i:s')";
var $fmtTimeStamp = "'Y-m-d H:i:s'";
function ServerInfo()
@@ -164,14 +164,12 @@ class ADODB_sqlite extends ADOConnection {
function SQLDate($fmt, $col=false)
{
$fmt = $this->qstr($fmt);
- return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+ return ($col) ? "strftime($fmt,$col)" : "strftime($fmt)";
}
function _createFunctions()
{
- @sqlite_create_function($this->_connectionID, 'adodb_date', 'adodb_date', 1);
- @sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
}
diff --git a/drivers/adodb-sqlite3.inc.php b/drivers/adodb-sqlite3.inc.php
index 8141af6e..0cceafb1 100644
--- a/drivers/adodb-sqlite3.inc.php
+++ b/drivers/adodb-sqlite3.inc.php
@@ -304,13 +304,11 @@ class ADODB_sqlite3 extends ADOConnection {
$fmt = str_replace($fromChars,$toChars,$fmt);
$fmt = $this->qstr($fmt);
- return ($col) ? "adodb_date2($fmt,$col)" : "adodb_date($fmt)";
+ return ($col) ? "strftime($fmt,$col)" : "strftime($fmt)";
}
function _createFunctions()
{
- $this->_connectionID->createFunction('adodb_date', 'adodb_date', 1);
- $this->_connectionID->createFunction('adodb_date2', 'adodb_date2', 2);
}
/** @noinspection PhpUnusedParameterInspection */
diff --git a/drivers/adodb-sybase.inc.php b/drivers/adodb-sybase.inc.php
index 33442685..abadb51c 100644
--- a/drivers/adodb-sybase.inc.php
+++ b/drivers/adodb-sybase.inc.php
@@ -408,7 +408,7 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
$themth = $ADODB_sybase_mths[$themth];
if ($themth <= 0) return false;
// h-m-s-MM-DD-YY
- return adodb_mktime(0,0,0,$themth,$rr[2],$rr[3]);
+ return mktime(0,0,0,$themth,$rr[2],$rr[3]);
}
static function UnixTimeStamp($v)
@@ -435,6 +435,6 @@ class ADORecordSet_array_sybase extends ADORecordSet_array {
break;
}
// h-m-s-MM-DD-YY
- return adodb_mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
+ return mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);
}
}