MySQL-Quoter can now handle datetime values with automatic time-zone conversion

Author: rkrx

src/Databases/MySQL.php

@@ -1,17 +1,17 @@
 <?php
 namespace Kir\MySQL\Databases;
 
+use DateTimeZone;
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\DBExpr;
 use Kir\MySQL\Builder\QueryStatement;
 use Kir\MySQL\Builder\Select;
 use Kir\MySQL\Database;
 use Kir\MySQL\Databases\MySQL\MySQLExceptionInterpreter;
-use Kir\MySQL\Databases\MySQL\MySQLExpressionQuoter;
 use Kir\MySQL\Databases\MySQL\MySQLFieldQuoter;
 use Kir\MySQL\Databases\MySQL\MySQLRunnableSelect;
 use Kir\MySQL\Databases\MySQL\MySQLUUIDGenerator;
-use Kir\MySQL\Databases\MySQL\MySQLValueQuoter;
+use Kir\MySQL\Databases\MySQL\MySQLQuoter;
 use Kir\MySQL\QueryLogger\QueryLoggers;
 use Kir\MySQL\Tools\AliasRegistry;
 use Kir\MySQL\Tools\VirtualTables;
@@ -42,6 +42,8 @@ class MySQL implements Database {
 	private $exceptionInterpreter;
 	/** @var array<string, mixed> */
 	private $options;
+	/** @var MySQLQuoter */
+	private $quoter;
 
 	/**
 	 * @param PDO $pdo
@@ -62,6 +64,11 @@ public function __construct(PDO $pdo, array $options = []) {
 			'delete-options' => [],
 		];
 		$this->options = array_merge($defaultOptions, $options);
+		$this->options['timezone'] = $this->options['timezone'] ?? date_default_timezone_get();
+		if(!($this->options['timezone'] instanceof DateTimeZone)) {
+			$this->options['timezone'] = new DateTimeZone((string) $this->options['timezone']);
+		}
+		$this->quoter = new MySQLQuoter($pdo, $this->options['timezone']);
 	}
 
 	/**
@@ -172,15 +179,15 @@ public function getTableFields(string $table): array {
 	 * @return string
 	 */
 	public function quoteExpression(string $expression, array $arguments = []): string {
-		return MySQLExpressionQuoter::quoteExpression($this->pdo, $expression, $arguments);
+		return $this->quoter->quoteExpression($expression, $arguments);
 	}
 
 	/**
 	 * @param null|scalar|array<int, string>|DBExpr|Select $value
 	 * @return string
 	 */
 	public function quote($value): string {
-		return MySQLValueQuoter::quote($this->pdo, $value);
+		return $this->quoter->quote($value);
 	}
 
 	/**

src/Databases/MySQL/MySQLExpressionQuoter.php

@@ -0,0 +1,81 @@
+<?php
+namespace Kir\MySQL\Databases\MySQL;
+
+use DateTimeInterface;
+use DateTimeZone;
+use Kir\MySQL\Builder\DBExpr;
+use Kir\MySQL\Builder\Select;
+use PDO;
+use phpDocumentor\Reflection\Types\Scalar;
+
+class MySQLQuoter {
+	/** @var PDO */
+	private $pdo;
+	/** @var DateTimeZone */
+	private $timeZone;
+
+	public function __construct(PDO $pdo, DateTimeZone $timeZone) {
+		$this->timeZone = $timeZone;
+		$this->pdo = $pdo;
+	}
+
+	/**
+	 * @param null|bool|int|float|string|array<int, null|scalar>|DBExpr|Select|DateTimeInterface $value
+	 * @return string
+	 */
+	public function quote($value): string {
+		if(is_null($value)) {
+			return 'NULL';
+		}
+
+		if(is_bool($value)) {
+			return $value ? '1' : '0';
+		}
+
+		if(is_array($value)) {
+			return implode(', ', array_map([$this, __FUNCTION__], $value));
+		}
+
+		if($value instanceof DBExpr) {
+			return $value->getExpression();
+		}
+
+		if($value instanceof Select) {
+			return sprintf('(%s)', (string) $value);
+		}
+
+		if(is_int($value) || is_float($value)) {
+			return (string) $value;
+		}
+
+		if($value instanceof DateTimeInterface) {
+			$value = date_create_immutable($value->format('c'))->setTimezone($this->timeZone)->format('Y-m-d H:i:s');
+		}
+
+		return $this->pdo->quote($value);
+	}
+
+	/**
+	 * @param string $expression
+	 * @param array<int, null|scalar|array<int, string>|DBExpr|Select> $arguments
+	 * @return string
+	 */
+	public function quoteExpression(string $expression, array $arguments = []): string {
+		$index = -1;
+		$func = function () use ($arguments, &$index) {
+			$index++;
+			if(array_key_exists($index, $arguments)) {
+				$argument = $arguments[$index];
+				$value = $this->quote($argument);
+			} elseif(count($arguments) > 0) {
+				$args = $arguments;
+				$value = array_pop($args);
+				$value = $this->quote($value);
+			} else {
+				$value = 'NULL';
+			}
+			return $value;
+		};
+		return (string) preg_replace_callback('{(\\?)}', $func, $expression);
+	}
+}