✨

Author: codemasher

.travis.yml

@@ -3,23 +3,19 @@ language: php
 php:
   - 7.2
 
-services:
-  - mysql
-  - postgresql
-  - sqlite3
+matrix:
+  include:
+  - php: 7.2
+  - php: nightly
+  allow_failures:
+  - php: nightly
 
-before_install:
-  - pip install --user codecov
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
+install: travis_retry composer install --no-interaction --prefer-source
 
 before_script:
   - mysql -e 'create database dbtest;'
   - psql -c 'create database dbtest;' -U postgres
 
-script:
-  - vendor/bin/phpunit --configuration phpunit.xml --coverage-clover clover.xml
+script: vendor/bin/phpunit --configuration phpunit.xml --coverage-clover clover.xml
 
-after_success:
-  - codecov
+after_success: bash <(curl -s https://codecov.io/bash)

README.md

@@ -48,7 +48,7 @@ A PHP 7.2+ SQL client and querybuilder for the most common databases.
 {
 	"require": {
 		"php": ">=7.2.0",
-		"chillerlan/database": "dev-master"
+		"chillerlan/database": "^2.1"
 	}
 }
 ```
@@ -185,7 +185,9 @@ method | return | description
 ------ | ------ | -----------
 `sql()` | `string` | returns the SQL for the current statement
 `bindValues()` | `array` | returns the values for each '?' parameter in the SQL
-`execute(string $index = null, array $values = null, $callback = null)` | `Result` | Executes the current statement. `$index` is being used in "SELECT" statements to determine a column to index the `Result` by. `$values` and `$callback` can be used to provide multiple values on multi row "INSERT" or "UPDATE" queries.
+`query(string $index = null` | `Result` | Executes the current statement. `$index` is being used in "SELECT" statements to determine a column to index the `Result` by. `$values`.
+`multi(array $values = null)` | bool | Executes the current statement as multi query. `$values` needs to be a multi dimensional array with each row.
+`callback(array $values = null, $callback = null)` | bool | Executes the current statement. `$index` is being used in "SELECT" statements to determine a column to index the `Result` by. `$values` and `$callback` can be used to provide multiple values on multi row "INSERT" or "UPDATE" queries.
 
 
 ### `Create`
@@ -208,7 +210,7 @@ $conn->create
 	->database('test')
 	->ifNotExists()
 	->charset('utf8mb4_bin')
-	->execute();
+	->query();
 ```
 ```mysql
 CREATE DATABASE IF NOT EXISTS `test` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
@@ -240,7 +242,7 @@ $conn->create
 	->decimal('weight', '8,3')
 	->int('added', 10, 0, null, 'UNSIGNED')
 	->primaryKey('id')
-	->execute();
+	->query();
 ```
 The generated Query will look something like this
 ```mysql
@@ -283,13 +285,13 @@ method | description
 $conn->insert
 	->into('products')
 	->values(['name' => 'product1', 'type' => 'a', 'price' => 3.99, 'weight' => 0.1, 'added' => time()])
-	->execute();
+	->query();
 ```
 ```mysql
 INSERT INTO `products` (`name`, `type`, `price`, `weight`, `added`) VALUES (?,?,?,?,?)
 ```
 
-An array with multiple rows will automatically perform a multi insert
+
 ```php
 $values = [
 	['name' => 'product2', 'type' => 'b', 'price' => 4.20, 'weight' => 2.35, 'added' => time()],
@@ -298,8 +300,7 @@ $values = [
 
 $conn->insert
 	->into('products')
-	->values($values)
-	->execute();
+	->multi($values);
 ```
 As an alternative, you can provide the values via a callback
 ```php
@@ -311,8 +312,8 @@ $values = [
 
 $conn->insert
 	->into('products')
-	->values(['name' => '?', 'type' => '?', 'price' => '?', 'weight' => '?', 'added' => '?'])
-	->execute(null, $values, function($row){
+	->values([['name' => '?', 'type' => '?', 'price' => '?', 'weight' => '?', 'added' => '?']])
+	->callback($values, function($row){
 		return [
 			$row[0],
 			$row[1],

composer.json

@@ -22,14 +22,14 @@
 	},
 	"require": {
 		"php": "^7.2",
-		"chillerlan/php-traits": "^1.1",
+		"chillerlan/php-traits": "^2.0",
 		"psr/simple-cache": "^1.0",
 		"psr/log": "^1.0"
 	},
 	"require-dev": {
-		"chillerlan/php-cache": "^1.0",
-		"chillerlan/php-log": "^1.0",
-		"phpunit/phpunit": "^7.1"
+		"chillerlan/php-cache": "^2.0",
+		"chillerlan/php-log": "^2.0",
+		"phpunit/phpunit": "^7.3"
 	},
 	"autoload": {
 		"psr-4": {

phpunit.xml

@@ -8,7 +8,6 @@
 		 convertWarningsToExceptions="true"
 		 processIsolation="false"
 		 stopOnFailure="false"
-		 syntaxCheck="false"
 		>
 	<filter>
 		<whitelist processUncoveredFilesFromWhitelist="true">

src/DatabaseAbstract.php

@@ -16,7 +16,7 @@
 	Drivers\DriverInterface, Query\QueryBuilder
 };
 use chillerlan\Traits\{
-	ClassLoader, ContainerInterface
+	ClassLoader, ImmutableSettingsInterface
 };
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
@@ -49,11 +49,11 @@ abstract class DatabaseAbstract implements LoggerAwareInterface{
 	/**
 	 * Database constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 

src/DatabaseOptions.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\Database;
 
-use chillerlan\Traits\ContainerAbstract;
+use chillerlan\Traits\ImmutableSettingsAbstract;
 
 /**
  * @property string $driver
@@ -41,6 +41,6 @@
  * @property string $cachekey_hash_algo
  * @property string $storage_path
  */
-class DatabaseOptions extends ContainerAbstract{
+class DatabaseOptions extends ImmutableSettingsAbstract{
 	use DatabaseOptionsTrait;
 }

src/Drivers/DriverAbstract.php

@@ -15,7 +15,7 @@
 use chillerlan\Database\{
 	Dialects\Dialect, Result
 };
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface
 };
@@ -60,11 +60,11 @@ abstract class DriverAbstract implements DriverInterface, LoggerAwareInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->cache   = $cache;
 		$this->logger  = $logger;

src/Drivers/DriverInterface.php

@@ -13,7 +13,7 @@
 namespace chillerlan\Database\Drivers;
 
 use chillerlan\Database\Dialects\Dialect;
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -22,11 +22,11 @@ interface DriverInterface{
 	/**
 	 * Constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null  $cache
 	 * @param \Psr\Log\LoggerInterface|null         $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null);
+	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null);
 
 	/**
 	 * Establishes a database connection and returns the connection object

src/Drivers/MSSqlSrvPDO.php

@@ -13,7 +13,7 @@
 namespace chillerlan\Database\Drivers;
 
 use chillerlan\Database\Dialects\MSSQL;
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use PDO;
 use Psr\{
 	Log\LoggerInterface, SimpleCache\CacheInterface
@@ -30,11 +30,11 @@ class MSSqlSrvPDO extends PDODriverAbstract{
 	/**
 	 * MSSqlSrvPDO constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface|null $cache
 	 * @param \Psr\Log\LoggerInterface|null        $log
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $log = null){
+	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $log = null){
 		unset($this->pdo_options[PDO::ATTR_EMULATE_PREPARES]);
 
 		// @todo

src/Dumper.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\Database;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -28,7 +28,7 @@ class Dumper extends DatabaseAbstract{
 	 */
 	protected $dialect;
 
-	public function __construct(ContainerInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(ImmutableSettingsInterface $options, CacheInterface $cache = null, LoggerInterface $logger = null){
 		parent::__construct($options, $cache, $logger);
 
 		$this->dialect = $this->driver->getDialect();