@@ -12,11 +12,11 @@ |
||
12 | 12 | |
13 | 13 | namespace chillerlan\Database\Drivers; |
14 | 14 | |
15 | +use Psr\SimpleCache\CacheInterface; |
|
15 | 16 | use chillerlan\Database\DBException; |
16 | 17 | use chillerlan\Database\DBOptions; |
17 | 18 | use chillerlan\Database\DBResult; |
18 | 19 | use chillerlan\Database\Traits\Magic; |
19 | -use Psr\SimpleCache\CacheInterface; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @property string $dialect |
@@ -14,7 +14,8 @@ |
||
14 | 14 | |
15 | 15 | use chillerlan\Database\DBException; |
16 | 16 | use chillerlan\Database\Drivers\{DBDriverAbstract, DBDriverInterface}; |
17 | -use PDO, PDOStatement; |
|
17 | +use PDO; |
|
18 | +use PDOStatement; |
|
18 | 19 | |
19 | 20 | /** |
20 | 21 | * |
@@ -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 |
@@ -35,8 +35,8 @@ |
||
35 | 35 | $sql = 'SELECT '; |
36 | 36 | |
37 | 37 | $sql .= $this->distinct ? 'DISTINCT ' : ''; |
38 | - $sql .= implode($glue , $this->cols).PHP_EOL; |
|
39 | - $sql .= !empty($this->from) ? 'FROM '.implode($glue , $this->from) : ''; |
|
38 | + $sql .= implode($glue, $this->cols).PHP_EOL; |
|
39 | + $sql .= !empty($this->from) ? 'FROM '.implode($glue, $this->from) : ''; |
|
40 | 40 | $sql .= !empty($this->where) ? PHP_EOL.'WHERE ' : ''; |
41 | 41 | $sql .= !empty($this->groupby) ? PHP_EOL.'GROUP BY '.implode($glue, $this->groupby) : ''; |
42 | 42 | $sql .= !empty($this->orderby) ? PHP_EOL.'ORDER BY '.implode($glue, $this->orderby) : ''; |
@@ -22,8 +22,8 @@ |
||
22 | 22 | protected $primaryKey; |
23 | 23 | protected $cols = []; |
24 | 24 | |
25 | - public function ifNotExists():CreateTableInterface{return $this->_ifNotExists();} |
|
26 | - public function name(string $dbname = null):CreateTableInterface{return $this->_name($dbname);} |
|
25 | + public function ifNotExists():CreateTableInterface{return $this->_ifNotExists(); } |
|
26 | + public function name(string $dbname = null):CreateTableInterface{return $this->_name($dbname); } |
|
27 | 27 | |
28 | 28 | public function execute(){ |
29 | 29 | // TODO: Implement execute() method. |
@@ -28,9 +28,9 @@ |
||
28 | 28 | return (new class($this->DBDriver, $this->dialect) extends StatementAbstract implements CreateDatabaseInterface{ |
29 | 29 | use CharsetTrait, IfNotExistsTrait, NameTrait; |
30 | 30 | |
31 | - public function ifNotExists():CreateDatabaseInterface{return $this->_ifNotExists();} |
|
32 | - public function name(string $dbname = null):CreateDatabaseInterface{return $this->_name($dbname);} |
|
33 | - public function collate(string $collation):CreateDatabaseInterface{return $this->_collate($collation);} |
|
31 | + public function ifNotExists():CreateDatabaseInterface{return $this->_ifNotExists(); } |
|
32 | + public function name(string $dbname = null):CreateDatabaseInterface{return $this->_name($dbname); } |
|
33 | + public function collate(string $collation):CreateDatabaseInterface{return $this->_collate($collation); } |
|
34 | 34 | |
35 | 35 | public function sql():string{ |
36 | 36 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | class CreateTable extends CreateTableAbstract{ |
20 | 20 | use CharsetTrait; |
21 | 21 | |
22 | - public function collate(string $collation):CreateTableInterface{return $this->_collate($collation);} |
|
22 | + public function collate(string $collation):CreateTableInterface{return $this->_collate($collation); } |
|
23 | 23 | |
24 | 24 | public function sql():string{ |
25 | 25 | # var_dump($this->cols); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'SERIAL', 'BOOLEAN', 'UUID']; |
57 | 57 | |
58 | 58 | $field[] = (is_int($length) || is_string($length) && count(explode(',', $length)) === 2) && !in_array($type, $nolengthtypes) |
59 | - ? $type.'('. $length . ')' |
|
59 | + ? $type.'('.$length.')' |
|
60 | 60 | : $type; |
61 | 61 | |
62 | 62 | if($attribute){ |