mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-11 16:44:30 +02:00
Code Issues Releases Wiki Activity

uses only DateTimeInterface & Throwable

Browse Source
This commit is contained in:
David Grudl
2017-06-09 17:19:02 +02:00
parent 3891625cd1
commit 24180c76bd
13 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dibi/DataSource.php
View File

@@ -266,7 +266,7 @@ FROM %SQL', $this->sql, '
%ex', $this->sorting ? ['ORDER BY %by', $this->sorting] : NULL, ' %ex', $this->sorting ? ['ORDER BY %by', $this->sorting] : NULL, '
%ofs %lmt', $this->offset, $this->limit %ofs %lmt', $this->offset, $this->limit
); );
} catch (\Exception $e) { } catch (\Throwable $e) {
trigger_error($e->getMessage(), E_USER_ERROR); trigger_error($e->getMessage(), E_USER_ERROR);
} }
} }

8
src/Dibi/Drivers/FirebirdDriver.php
View File

@@ -292,12 +292,12 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d'"); return $value->format("'Y-m-d'");
@@ -305,12 +305,12 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d H:i:s.u'"); return $value->format("'Y-m-d H:i:s.u'");

8
src/Dibi/Drivers/MsSqlDriver.php
View File

@@ -242,12 +242,12 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d'"); return $value->format("'Y-m-d'");
@@ -255,12 +255,12 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d H:i:s.u'"); return $value->format("'Y-m-d H:i:s.u'");

8
src/Dibi/Drivers/MySqliDriver.php
View File

@@ -334,12 +334,12 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d'"); return $value->format("'Y-m-d'");
@@ -347,12 +347,12 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d H:i:s.u'"); return $value->format("'Y-m-d H:i:s.u'");

8
src/Dibi/Drivers/OdbcDriver.php
View File

@@ -266,12 +266,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("#m/d/Y#"); return $value->format("#m/d/Y#");
@@ -279,12 +279,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("#m/d/Y H:i:s.u#"); return $value->format("#m/d/Y H:i:s.u#");

8
src/Dibi/Drivers/OracleDriver.php
View File

@@ -292,12 +292,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $this->fmtDate return $this->fmtDate
@@ -307,12 +307,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $this->fmtDateTime return $this->fmtDateTime

8
src/Dibi/Drivers/PdoDriver.php
View File

@@ -326,12 +326,12 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'"); return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'");
@@ -339,12 +339,12 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format($this->driverName === 'odbc' ? "#m/d/Y H:i:s.u#" : "'Y-m-d H:i:s.u'"); return $value->format($this->driverName === 'odbc' ? "#m/d/Y H:i:s.u#" : "'Y-m-d H:i:s.u'");

8
src/Dibi/Drivers/PostgreDriver.php
View File

@@ -340,12 +340,12 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d'"); return $value->format("'Y-m-d'");
@@ -353,12 +353,12 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d H:i:s.u'"); return $value->format("'Y-m-d H:i:s.u'");

8
src/Dibi/Drivers/Sqlite3Driver.php
View File

@@ -286,12 +286,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format($this->fmtDate); return $value->format($this->fmtDate);
@@ -299,12 +299,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format($this->fmtDateTime); return $value->format($this->fmtDateTime);

8
src/Dibi/Drivers/SqlsrvDriver.php
View File

@@ -264,12 +264,12 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDate($value) public function escapeDate($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d'"); return $value->format("'Y-m-d'");
@@ -277,12 +277,12 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
public function escapeDateTime($value) public function escapeDateTime($value)
{ {
if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { if (!$value instanceof \DateTimeInterface) {
$value = new Dibi\DateTime($value); $value = new Dibi\DateTime($value);
} }
return $value->format("'Y-m-d H:i:s.u'"); return $value->format("'Y-m-d H:i:s.u'");

2
src/Dibi/Fluent.php
View File

@@ -448,7 +448,7 @@ class Fluent implements IDataSource
{ {
try { try {
return $this->connection->translate($this->_export()); return $this->connection->translate($this->_export());
} catch (\Exception $e) { } catch (\Throwable $e) {
trigger_error($e->getMessage(), E_USER_ERROR); trigger_error($e->getMessage(), E_USER_ERROR);
} }
} }

4
src/Dibi/Translator.php
View File

@@ -316,7 +316,7 @@ final class Translator
if ($value !== NULL && !is_scalar($value)) { // array is already processed if ($value !== NULL && !is_scalar($value)) { // array is already processed
if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) { if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) {
$modifier = 'SQL'; $modifier = 'SQL';
} elseif (($value instanceof \DateTime || $value instanceof \DateTimeInterface) && ($modifier === 'd' || $modifier === 't')) { } elseif ($value instanceof \DateTimeInterface && ($modifier === 'd' || $modifier === 't')) {
// continue // continue
} else { } else {
$type = is_object($value) ? get_class($value) : gettype($value); $type = is_object($value) ? get_class($value) : gettype($value);
@@ -439,7 +439,7 @@ final class Translator
} elseif ($value === NULL) { } elseif ($value === NULL) {
return 'NULL'; return 'NULL';
} elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) { } elseif ($value instanceof \DateTimeInterface) {
return $this->driver->escapeDateTime($value); return $this->driver->escapeDateTime($value);
} elseif ($value instanceof Literal) { } elseif ($value instanceof Literal) {

4
src/Dibi/interfaces.php
View File

@@ -121,13 +121,13 @@ interface Driver
function escapeBool($value); function escapeBool($value);
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
function escapeDate($value); function escapeDate($value);
/** /**
* @param \DateTime|\DateTimeInterface|string|int * @param \DateTimeInterface|string|int
* @return string * @return string
*/ */
function escapeDateTime($value); function escapeDateTime($value);