- Added $options as the second parameter to MySQL::__construct to specify global behavior

- Added the ability to set user defined factories for the SIUD-Query-Builders
- Added `$options`-Parameter `'select-options' > 'preserve-types-default'`
- Added `$options`-Parameter `'select-options' > 'fetch-object-class-default'` for `fetchObject*`
- Look at the `README.md`/initialization for more information

Author: rkrx

doc/initialization.md

@@ -9,4 +9,33 @@ $mysql = new MySQL($pdo);
 $mysql->getAliasRegistry()->add('t', 'testdb.test__');
 ```
 
-[Back](../README.md)
+You can also add options to specify global behavior
+
+```PHP
+// All keys are optional
+$options = [
+	'select-factory' => function ($db) {
+		return new MyRunnableSelect($db, ...);
+	},
+	'select-options' => [
+		'preserve-types-default' => true, // Always preserve types if not defined otherwise per query
+		'fetch-object-class-default' => 'MyClass', // Standard is stdClass
+	],
+	'insert-factory' => function ($db) {
+		return new MyRunnableInsert($db, ...);
+	},
+	'insert-options' => [], // Reserved for future usage
+	'update-factory' => function ($db) {
+		return new MyRunnableUpdate($db, ...);
+	},
+	'update-options' => [], // Reserved for future usage
+	'delete-factory' => function ($db) {
+		return new MyRunnableDelete($db, ...);
+	},
+	'delete-options' => [], // Reserved for future usage
+];
+$mysql = new MySQL($pdo, $options);
+$mysql->getAliasRegistry()->add('t', 'testdb.test__');
+```
+
+[Back](../README.md)

src/Builder/RunnableDelete.php

@@ -4,9 +4,18 @@
 use Kir\MySQL\Builder\Internal\DDLPreparable;
 use Kir\MySQL\Builder\Internal\DDLRunnable;
 use Kir\MySQL\Builder\Traits\CreateDDLRunnable;
+use Kir\MySQL\Databases\MySQL;
 
 class RunnableDelete extends Delete implements DDLPreparable {
 	use CreateDDLRunnable;
+	
+	/**
+	 * @param MySQL $db
+	 * @param array $options
+	 */
+	public function __construct(MySQL $db, array $options = []) {
+		parent::__construct($db);
+	}
 
 	/**
 	 * @param array $params

src/Builder/RunnableInsert.php

@@ -5,10 +5,19 @@
 use Kir\MySQL\Builder\Internal\DDLPreparable;
 use Kir\MySQL\Builder\Internal\DDLRunnable;
 use Kir\MySQL\Builder\Traits\CreateDDLRunnable;
+use Kir\MySQL\Databases\MySQL;
 use Traversable;
 
 class RunnableInsert extends Insert implements DDLPreparable {
 	use CreateDDLRunnable;
+	
+	/**
+	 * @param MySQL $db
+	 * @param array $options
+	 */
+	public function __construct(MySQL $db, array $options = []) {
+		parent::__construct($db);
+	}
 
 	/**
 	 * @param array|Traversable $rows

src/Builder/RunnableSelect.php

@@ -9,6 +9,7 @@
 use Kir\MySQL\Builder\Helpers\FieldValueConverter;
 use Kir\MySQL\Builder\Helpers\LazyRowGenerator;
 use Kir\MySQL\Builder\Helpers\YieldPolyfillIterator;
+use Kir\MySQL\Databases\MySQL;
 use PDO;
 use Traversable;
 
@@ -19,9 +20,21 @@ class RunnableSelect extends Select implements IteratorAggregate {
 	private $values = array();
 	/** @var bool */
 	private $preserveTypes = false;
+	/** @var string */
+	private $defaultClassName = false;
 	/** @var int */
 	private $foundRows = 0;
-
+	
+	/**
+	 * @param MySQL $db
+	 * @param array $options
+	 */
+	public function __construct(MySQL $db, array $options = []) {
+		parent::__construct($db);
+		$this->preserveTypes = array_key_exists('preserve-types-default', $options) ? $options['preserve-types-default'] : false;
+		$this->defaultClassName = array_key_exists('fetch-object-class-default', $options) ? $options['fetch-object-class-default'] : 'stdClass';
+	}
+	
 	/**
 	 * @param array $values
 	 * @return $this
@@ -91,17 +104,17 @@ public function fetchRow(Closure $callback = null) {
 	 * @return object[]
 	 * @throws \Exception
 	 */
-	public function fetchObjects($className = 'stdClass', Closure $callback = null) {
-		return $this->fetchAll($callback, PDO::FETCH_CLASS, $className);
+	public function fetchObjects($className = null, Closure $callback = null) {
+		return $this->fetchAll($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName);
 	}
 
 	/**
 	 * @param string $className
 	 * @param Closure $callback
 	 * @return object[]|Generator
 	 */
-	public function fetchObjectsLazy($className = 'stdClass', Closure $callback = null) {
-		return $this->fetchLazy($callback, PDO::FETCH_CLASS, $className);
+	public function fetchObjectsLazy($className = null, Closure $callback = null) {
+		return $this->fetchLazy($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName);
 	}
 
 	/**
@@ -110,8 +123,8 @@ public function fetchObjectsLazy($className = 'stdClass', Closure $callback = nu
 	 * @return object[]
 	 * @throws \Exception
 	 */
-	public function fetchObject($className = 'stdClass', Closure $callback = null) {
-		return $this->fetch($callback, PDO::FETCH_CLASS, $className, function ($row) {
+	public function fetchObject($className = null, Closure $callback = null) {
+		return $this->fetch($callback, PDO::FETCH_CLASS, $className ?: $this->defaultClassName, function ($row) {
 			return ['valid' => is_object($row), 'default' => null];
 		});
 	}

src/Builder/RunnableUpdate.php

@@ -3,9 +3,18 @@
 
 use Kir\MySQL\Builder\Internal\DDLPreparable;
 use Kir\MySQL\Builder\Traits\CreateDDLRunnable;
+use Kir\MySQL\Databases\MySQL;
 
 class RunnableUpdate extends Update implements DDLPreparable {
 	use CreateDDLRunnable;
+	
+	/**
+	 * @param MySQL $db
+	 * @param array $options
+	 */
+	public function __construct(MySQL $db, array $options = []) {
+		parent::__construct($db);
+	}
 
 	/**
 	 * @param array $params

src/Databases/MySQL.php

@@ -29,18 +29,28 @@ class MySQL implements Database {
 	private $queryLoggers = 0;
 	/** @var MySQLExceptionInterpreter */
 	private $exceptionInterpreter = 0;
-
+	/** @var array */
+	private $options;
+	
 	/**
 	 * @param PDO $pdo
+	 * @param array $options
 	 */
-	public function __construct(PDO $pdo) {
+	public function __construct(PDO $pdo, array $options = []) {
 		if($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) {
 			$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 		}
 		$this->pdo = $pdo;
 		$this->aliasRegistry = new AliasRegistry();
 		$this->queryLoggers = new QueryLoggers();
 		$this->exceptionInterpreter = new MySQLExceptionInterpreter();
+		$defaultOptions = [
+			'select-options' => [],
+			'insert-options' => [],
+			'update-options' => [],
+			'delete-options' => [],
+		];
+		$this->options = array_merge($defaultOptions, $options);
 	}
 
 	/**
@@ -182,7 +192,9 @@ public function quoteField($field) {
 	 * @return Builder\RunnableSelect
 	 */
 	public function select(array $fields = null) {
-		$select = new Builder\RunnableSelect($this);
+		$select = array_key_exists('select-factory', $this->options)
+			? call_user_func($this->options['select-factory'], $this, $this->options['select-options'])
+			: new Builder\RunnableSelect($this, $this->options['select-options']);
 		if($fields !== null) {
 			$select->fields($fields);
 		}
@@ -194,7 +206,9 @@ public function select(array $fields = null) {
 	 * @return Builder\RunnableInsert
 	 */
 	public function insert(array $fields = null) {
-		$insert = new Builder\RunnableInsert($this);
+		$insert = array_key_exists('insert-factory', $this->options)
+			? call_user_func($this->options['insert-factory'], $this, $this->options['insert-options'])
+			: new Builder\RunnableInsert($this, $this->options['insert-options']);
 		if($fields !== null) {
 			$insert->addAll($fields);
 		}
@@ -206,7 +220,9 @@ public function insert(array $fields = null) {
 	 * @return Builder\RunnableUpdate
 	 */
 	public function update(array $fields = null) {
-		$update = new Builder\RunnableUpdate($this);
+		$update = array_key_exists('update-factory', $this->options)
+			? call_user_func($this->options['update-factory'], $this, $this->options['update-options'])
+			: new Builder\RunnableUpdate($this, $this->options['update-options']);
 		if($fields !== null) {
 			$update->setAll($fields);
 		}
@@ -217,7 +233,9 @@ public function update(array $fields = null) {
 	 * @return Builder\RunnableDelete
 	 */
 	public function delete() {
-		return new Builder\RunnableDelete($this);
+		return array_key_exists('delete-factory', $this->options)
+			? call_user_func($this->options['delete-factory'], $this, $this->options['delete-options'])
+			: new Builder\RunnableDelete($this, $this->options['delete-options']);
 	}
 
 	/**