From 1278907f39ca1bf9e8ef315c111f90467d846195 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 12 Jun 2017 13:27:56 +0200
Subject: [PATCH] OracleDriver: by default uses native date format

---
 src/Dibi/Drivers/OracleDriver.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php
index 028bab20..ffe42879 100644
--- a/src/Dibi/Drivers/OracleDriver.php
+++ b/src/Dibi/Drivers/OracleDriver.php
@@ -21,7 +21,7 @@ use Dibi;
  *   - password (or pass)
  *   - charset => character encoding to set
  *   - schema => alters session schema
- *   - nativeDate => use native date format (defaults to FALSE)
+ *   - nativeDate => use native date format (defaults to TRUE)
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  *   - lazy, profiler, result, substitutes, ... => see Dibi\Connection options
@@ -42,8 +42,8 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	/** @var bool */
 	private $autocommit = TRUE;
 
-	/** @var string  Date and datetime format */
-	private $fmtDate, $fmtDateTime;
+	/** @var bool  use native datetime format */
+	private $nativeDate;
 
 	/** @var int|NULL Number of affected rows */
 	private $affectedRows;
@@ -68,10 +68,10 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 	{
 		$foo = &$config['charset'];
 
-		if (empty($config['nativeDate'])) {
-			$this->fmtDate = $config['formatDate'] ?? 'U';
-			$this->fmtDateTime = $config['formatDateTime'] ?? 'U';
+		if (isset($config['formatDate']) || isset($config['formatDateTime'])) {
+			trigger_error('OracleDriver: options formatDate and formatDateTime are deprecated.', E_USER_DEPRECATED);
 		}
+		$this->nativeDate = $config['nativeDate'] ?? TRUE;
 
 		if (isset($config['resource'])) {
 			$this->connection = $config['resource'];
@@ -270,9 +270,9 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $this->fmtDate
-			? $value->format($this->fmtDate)
-			: "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')";
+		return $this->nativeDate
+			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
+			: $value->format('U');
 	}
 
 
@@ -284,9 +284,9 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
 		if (!$value instanceof \DateTimeInterface) {
 			$value = new Dibi\DateTime($value);
 		}
-		return $this->fmtDateTime
-			? $value->format($this->fmtDateTime)
-			: "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')";
+		return $this->nativeDate
+			? "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')"
+			: $value->format('U');
 	}