@@ -12,7 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\Database; |
| 14 | 14 | |
| 15 | -use ArrayAccess, Countable, Iterator; |
|
| 15 | +use ArrayAccess; |
|
| 16 | +use Countable; |
|
| 17 | +use Iterator; |
|
| 16 | 18 | use chillerlan\Database\Traits\{Enumerable, Magic}; |
| 17 | 19 | |
| 18 | 20 | /** |
@@ -12,8 +12,11 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\DatabaseTest; |
| 14 | 14 | |
| 15 | +use ArrayAccess; |
|
| 16 | +use Countable; |
|
| 17 | +use Iterator; |
|
| 15 | 18 | use chillerlan\Database\DBResult; |
| 16 | -use Iterator, ArrayAccess, Countable, stdClass; |
|
| 19 | +use stdClass; |
|
| 17 | 20 | |
| 18 | 21 | class DBResultTest extends TestAbstract{ |
| 19 | 22 | |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\DatabaseTest\Drivers; |
| 14 | 14 | |
| 15 | -use chillerlan\Database\Drivers\DBDriverInterface; |
|
| 16 | -use chillerlan\DatabaseTest\TestAbstract; |
|
| 17 | 15 | use Psr\SimpleCache\CacheInterface; |
| 16 | +use chillerlan\DatabaseTest\TestAbstract; |
|
| 17 | +use chillerlan\Database\Drivers\DBDriverInterface; |
|
| 18 | 18 | |
| 19 | 19 | abstract class DriverTestAbstract extends TestAbstract{ |
| 20 | 20 | |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\Database\Drivers; |
| 14 | 14 | |
| 15 | +use Psr\SimpleCache\CacheInterface; |
|
| 15 | 16 | use chillerlan\Database\DBOptions; |
| 16 | 17 | use chillerlan\Database\DBResult; |
| 17 | 18 | use chillerlan\Database\Traits\Magic; |
| 18 | -use Psr\SimpleCache\CacheInterface; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @property string $dialect |
@@ -15,7 +15,8 @@ |
||
| 15 | 15 | use chillerlan\Database\Drivers\{ |
| 16 | 16 | DBDriverAbstract, DBDriverException, DBDriverInterface |
| 17 | 17 | }; |
| 18 | -use PDO, PDOStatement; |
|
| 18 | +use PDO; |
|
| 19 | +use PDOStatement; |
|
| 19 | 20 | |
| 20 | 21 | /** |
| 21 | 22 | * @see http://php.net/manual/pdo.constants.php |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | |
| 66 | 66 | // @todo: whitelist types? |
| 67 | 67 | $nolengthtypes = ['DATE', 'TINYBLOB', 'TINYTEXT', 'BLOB', 'TEXT', 'MEDIUMBLOB', |
| 68 | - 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
|
| 68 | + 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
|
| 69 | 69 | |
| 70 | 70 | $field[] = (is_int($length) || is_string($length) && count(explode(',', $length)) === 2) && !in_array($type, $nolengthtypes) |
| 71 | 71 | ? $type.'('. $length . ')' |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | |
| 13 | 13 | namespace chillerlan\Database\Query\Dialects\SQLite; |
| 14 | 14 | |
| 15 | -use chillerlan\Database\Query\CreateTableInterface; |
|
| 16 | 15 | use chillerlan\Database\Query\CreateTableAbstract; |
| 16 | +use chillerlan\Database\Query\CreateTableInterface; |
|
| 17 | 17 | use chillerlan\Database\Query\QueryException; |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if($this->primaryKey){ |
| 53 | 53 | $sql .=','.PHP_EOL."\t".'PRIMARY KEY ('.$this->quote($this->primaryKey) |
| 54 | - .(in_array($this->dir, ['ASC', 'DESC']) ? $this->dir : '').')'; |
|
| 54 | + .(in_array($this->dir, ['ASC', 'DESC']) ? $this->dir : '').')'; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | $sql .= PHP_EOL.')'; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | |
| 89 | 89 | if(is_int($length)&& in_array($type, ['CHAR', 'NCHAR','VARCHAR', 'NVARCHAR', 'CHARACTER']) |
| 90 | - || is_string($length) && count(explode(',', $length)) === 2 && $type === 'DECIMAL'){ |
|
| 90 | + || is_string($length) && count(explode(',', $length)) === 2 && $type === 'DECIMAL'){ |
|
| 91 | 91 | $field[] = $type_translation.'('. $length . ')'; |
| 92 | 92 | } |
| 93 | 93 | else{ |
@@ -14,11 +14,11 @@ |
||
| 14 | 14 | |
| 15 | 15 | use chillerlan\Database\Drivers\DBDriverInterface; |
| 16 | 16 | use chillerlan\Database\Query\AlterInterface; |
| 17 | +use chillerlan\Database\Query\CreateDatabaseInterface; |
|
| 17 | 18 | use chillerlan\Database\Query\CreateInterface; |
| 19 | +use chillerlan\Database\Query\CreateTableInterface; |
|
| 18 | 20 | use chillerlan\Database\Query\DropInterface; |
| 19 | 21 | use chillerlan\Database\Query\StatementAbstract; |
| 20 | -use chillerlan\Database\Query\CreateDatabaseInterface; |
|
| 21 | -use chillerlan\Database\Query\CreateTableInterface; |
|
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | 24 | * @property \chillerlan\Database\Query\SelectInterface $select |