@@ -21,7 +21,7 @@ |
||
| 21 | 21 | protected $pdo; |
| 22 | 22 | |
| 23 | 23 | /** |
| 24 | - * @param PDO $pdo |
|
| 24 | + * @param \PDO $pdo |
|
| 25 | 25 | */ |
| 26 | 26 | public function __construct(\PDO $pdo) |
| 27 | 27 | { |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $columns = []; |
| 39 | 39 | |
| 40 | 40 | // Gets list of columns |
| 41 | - $query = 'PRAGMA table_info("' . $table . '");'; |
|
| 41 | + $query = 'PRAGMA table_info("'.$table.'");'; |
|
| 42 | 42 | $information = $this->pdo->prepare($query); |
| 43 | 43 | |
| 44 | 44 | $information->execute(); |
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // Gets list of foreign keys, if any |
| 60 | - $query = 'PRAGMA foreign_key_list("' . $table . '");'; |
|
| 60 | + $query = 'PRAGMA foreign_key_list("'.$table.'");'; |
|
| 61 | 61 | $foreignTable = $this->pdo->prepare($query); |
| 62 | 62 | |
| 63 | 63 | $foreignTable->execute(); |
| 64 | 64 | $foreignTable->setFetchMode(\PDO::FETCH_OBJ); |
| 65 | 65 | |
| 66 | - return $this->setForeignColumns($foreignTable, $columns, $column);; |
|
| 66 | + return $this->setForeignColumns($foreignTable, $columns, $column); ; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -121,9 +121,9 @@ discard block |
||
| 121 | 121 | * @param \Rougin\Describe\Column &$column |
| 122 | 122 | * @return void |
| 123 | 123 | */ |
| 124 | - protected function setProperties($row, Column &$column) |
|
| 124 | + protected function setProperties($row, Column & $column) |
|
| 125 | 125 | { |
| 126 | - if (! $row->notnull) { |
|
| 126 | + if ( ! $row->notnull) { |
|
| 127 | 127 | $column->setNull(true); |
| 128 | 128 | } |
| 129 | 129 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | { |
| 50 | 50 | $this->columns = []; |
| 51 | 51 | |
| 52 | - $information = $this->pdo->prepare('DESCRIBE ' . $table); |
|
| 52 | + $information = $this->pdo->prepare('DESCRIBE '.$table); |
|
| 53 | 53 | $information->execute(); |
| 54 | 54 | $information->setFetchMode(\PDO::FETCH_OBJ); |
| 55 | 55 | |
@@ -75,15 +75,15 @@ discard block |
||
| 75 | 75 | $column->setLength($match[2]); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $query = 'SELECT COLUMN_NAME as "column",' . |
|
| 79 | - 'REFERENCED_COLUMN_NAME as "referenced_column",' . |
|
| 80 | - 'CONCAT(' . |
|
| 81 | - 'REFERENCED_TABLE_SCHEMA, ".",' . |
|
| 82 | - 'REFERENCED_TABLE_NAME' . |
|
| 83 | - ') as "referenced_table"' . |
|
| 84 | - 'FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE ' . |
|
| 85 | - 'WHERE CONSTRAINT_SCHEMA = "' . $this->database . '" ' . |
|
| 86 | - 'AND TABLE_NAME = "' . $table . '";'; |
|
| 78 | + $query = 'SELECT COLUMN_NAME as "column",'. |
|
| 79 | + 'REFERENCED_COLUMN_NAME as "referenced_column",'. |
|
| 80 | + 'CONCAT('. |
|
| 81 | + 'REFERENCED_TABLE_SCHEMA, ".",'. |
|
| 82 | + 'REFERENCED_TABLE_NAME'. |
|
| 83 | + ') as "referenced_table"'. |
|
| 84 | + 'FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE '. |
|
| 85 | + 'WHERE CONSTRAINT_SCHEMA = "'.$this->database.'" '. |
|
| 86 | + 'AND TABLE_NAME = "'.$table.'";'; |
|
| 87 | 87 | |
| 88 | 88 | $foreignTable = $this->pdo->prepare($query); |
| 89 | 89 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @param \Rougin\Describe\Column &$column |
| 125 | 125 | * @return void |
| 126 | 126 | */ |
| 127 | - protected function setKey($row, Column &$column) |
|
| 127 | + protected function setKey($row, Column & $column) |
|
| 128 | 128 | { |
| 129 | 129 | switch ($row->Key) { |
| 130 | 130 | case 'PRI': |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * @param \Rougin\Describe\Column &$column |
| 153 | 153 | * @return void |
| 154 | 154 | */ |
| 155 | - protected function setForeignColumns($foreignTable, $row, Column &$column) |
|
| 155 | + protected function setForeignColumns($foreignTable, $row, Column & $column) |
|
| 156 | 156 | { |
| 157 | 157 | while ($foreignRow = $foreignTable->fetch()) { |
| 158 | 158 | if ($foreignRow->column == $row->Field) { |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | * @param \Rougin\Describe\Column &$column |
| 172 | 172 | * @return void |
| 173 | 173 | */ |
| 174 | - protected function setProperties($row, Column &$column) |
|
| 174 | + protected function setProperties($row, Column & $column) |
|
| 175 | 175 | { |
| 176 | 176 | if ($row->Extra == 'auto_increment') { |
| 177 | 177 | $column->setAutoIncrement(true); |
@@ -42,13 +42,13 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function getDriver($driverName, $configuration = []) |
| 44 | 44 | { |
| 45 | - $mysql = [ 'mysql', 'mysqli' ]; |
|
| 46 | - $sqlite = [ 'pdo', 'sqlite', 'sqlite3' ]; |
|
| 45 | + $mysql = ['mysql', 'mysqli']; |
|
| 46 | + $sqlite = ['pdo', 'sqlite', 'sqlite3']; |
|
| 47 | 47 | |
| 48 | 48 | list($database, $hostname, $username, $password) = $this->parseConfiguration($configuration); |
| 49 | 49 | |
| 50 | 50 | if (in_array($database['dbdriver'], $mysql)) { |
| 51 | - $dsn = 'mysql:host=' . $hostname . ';dbname=' . $database; |
|
| 51 | + $dsn = 'mysql:host='.$hostname.';dbname='.$database; |
|
| 52 | 52 | $pdo = new \PDO($dsn, $username, $password); |
| 53 | 53 | $driver = new MySQLDriver($pdo, $database); |
| 54 | 54 | } |
@@ -115,6 +115,6 @@ discard block |
||
| 115 | 115 | $username = $configuration['username']; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - return [ $database, $hostname, $username, $password ]; |
|
| 118 | + return [$database, $hostname, $username, $password]; |
|
| 119 | 119 | } |
| 120 | 120 | } |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function __construct(array $database) |
| 27 | 27 | { |
| 28 | - $mysql = [ 'mysql', 'mysqli' ]; |
|
| 29 | - $sqlite = [ 'pdo', 'sqlite', 'sqlite3' ]; |
|
| 28 | + $mysql = ['mysql', 'mysqli']; |
|
| 29 | + $sqlite = ['pdo', 'sqlite', 'sqlite3']; |
|
| 30 | 30 | |
| 31 | 31 | // NOTE: To be removed in v1.0.0 |
| 32 | 32 | if (isset($database['default'])) { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if (in_array($database['dbdriver'], $mysql)) { |
| 37 | - $dsn = 'mysql:host=' . $database['hostname'] . ';dbname=' . $database['database']; |
|
| 37 | + $dsn = 'mysql:host='.$database['hostname'].';dbname='.$database['database']; |
|
| 38 | 38 | $pdo = new \PDO($dsn, $database['username'], $database['password']); |
| 39 | 39 | |
| 40 | 40 | $this->driver = new MySQLDriver($pdo, $database['database']); |