@@ -12,8 +12,8 @@ |
||
12 | 12 | class Connection extends AbstractConnection |
13 | 13 | { |
14 | 14 | /** |
15 | - * @inheritDoc |
|
16 | - */ |
|
15 | + * @inheritDoc |
|
16 | + */ |
|
17 | 17 | public function open(string $database, string $schema = '') |
18 | 18 | { |
19 | 19 | $server = $this->driver->options('server'); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $clauses[] = 'DROP INDEX ' . $this->driver->escapeId($index->name); |
78 | 78 | } |
79 | 79 | foreach ($alter as $index) { |
80 | - $clauses[] = 'ADD ' . ($index->type == 'PRIMARY' ? 'PRIMARY KEY ' : $index->type . ' ') . |
|
80 | + $clauses[] = 'ADD ' . ($index->type == 'PRIMARY' ? 'PRIMARY KEY ' : $index->type . ' ') . |
|
81 | 81 | ($index->name != '' ? $this->driver->escapeId($index->name) . ' ' : '') . |
82 | 82 | '(' . implode(', ', $index->columns) . ')'; |
83 | 83 | } |
@@ -91,8 +91,7 @@ discard block |
||
91 | 91 | public function tables() |
92 | 92 | { |
93 | 93 | return $this->driver->keyValues($this->driver->minVersion(5) ? |
94 | - 'SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME' : |
|
95 | - 'SHOW TABLES'); |
|
94 | + 'SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME' : 'SHOW TABLES'); |
|
96 | 95 | } |
97 | 96 | |
98 | 97 | /** |
@@ -112,7 +111,7 @@ discard block |
||
112 | 111 | */ |
113 | 112 | public function dropViews(array $views) |
114 | 113 | { |
115 | - $this->driver->execute('DROP VIEW ' . implode(', ', array_map(function ($view) { |
|
114 | + $this->driver->execute('DROP VIEW ' . implode(', ', array_map(function($view) { |
|
116 | 115 | return $this->driver->table($view); |
117 | 116 | }, $views))); |
118 | 117 | return true; |
@@ -123,7 +122,7 @@ discard block |
||
123 | 122 | */ |
124 | 123 | public function dropTables(array $tables) |
125 | 124 | { |
126 | - $this->driver->execute('DROP TABLE ' . implode(', ', array_map(function ($table) { |
|
125 | + $this->driver->execute('DROP TABLE ' . implode(', ', array_map(function($table) { |
|
127 | 126 | return $this->driver->table($table); |
128 | 127 | }, $tables))); |
129 | 128 | return true; |
@@ -24,8 +24,7 @@ |
||
24 | 24 | $query = ($fast && $this->driver->minVersion(5)) ? |
25 | 25 | "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment " . |
26 | 26 | "FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . |
27 | - ($table != "" ? "AND TABLE_NAME = " . $this->driver->quote($table) : "ORDER BY Name") : |
|
28 | - "SHOW TABLE STATUS" . ($table != "" ? " LIKE " . $this->driver->quote(addcslashes($table, "%_\\")) : ""); |
|
27 | + ($table != "" ? "AND TABLE_NAME = " . $this->driver->quote($table) : "ORDER BY Name") : "SHOW TABLE STATUS" . ($table != "" ? " LIKE " . $this->driver->quote(addcslashes($table, "%_\\")) : ""); |
|
29 | 28 | return $this->driver->rows($query); |
30 | 29 | } |
31 | 30 |
@@ -77,10 +77,10 @@ |
||
77 | 77 | |
78 | 78 | $foreignKey->database = $this->driver->unescapeId($match[4] != "" ? $match[3] : $match[4]); |
79 | 79 | $foreignKey->table = $this->driver->unescapeId($match[4] != "" ? $match[4] : $match[3]); |
80 | - $foreignKey->source = array_map(function ($idf) { |
|
80 | + $foreignKey->source = array_map(function($idf) { |
|
81 | 81 | return $this->driver->unescapeId($idf); |
82 | 82 | }, $source[0]); |
83 | - $foreignKey->target = array_map(function ($idf) { |
|
83 | + $foreignKey->target = array_map(function($idf) { |
|
84 | 84 | return $this->driver->unescapeId($idf); |
85 | 85 | }, $target[0]); |
86 | 86 | $foreignKey->onDelete = $match[6] ?: "RESTRICT"; |
@@ -19,8 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | // !!! Caching and slow query handling are temporarily disabled !!! |
21 | 21 | $query = $this->driver->minVersion(5) ? |
22 | - 'SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME' : |
|
23 | - 'SHOW DATABASES'; |
|
22 | + 'SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME' : 'SHOW DATABASES'; |
|
24 | 23 | return $this->driver->values($query); |
25 | 24 | |
26 | 25 | // SHOW DATABASES can take a very long time so it is cached |
@@ -39,7 +39,7 @@ |
||
39 | 39 | "char" => "md5/sha1/password/encrypt/uuid", |
40 | 40 | "binary" => "md5/sha1", |
41 | 41 | "date|time" => "now", |
42 | - ],[ |
|
42 | + ], [ |
|
43 | 43 | $this->numberRegex() => "+/-", |
44 | 44 | "date" => "+ interval/- interval", |
45 | 45 | "time" => "addtime/subtime", |