@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | */ |
| 205 | 205 | protected function returnFunction() |
| 206 | 206 | { |
| 207 | - return $this->isGroupOpen === true ? $this : $this->query; |
|
| 207 | + return $this->isGroupOpen === true ? $this : $this->query; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | $sql .= ')'; |
| 263 | 263 | break; |
| 264 | 264 | |
| 265 | - case 'NULL': |
|
| 265 | + case 'NULL': |
|
| 266 | 266 | case 'NOT_NULL': |
| 267 | 267 | $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : ''; |
| 268 | 268 | $sql .= $item['sql']; |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | if (is_string($item['value']) && |
| 280 | 280 | strlen($item['value']) > strlen(Patabase\Constants::COLUMN_LITERALL) && |
| 281 | 281 | substr($item['value'], 0, strlen(Patabase\Constants::COLUMN_LITERALL)) === |
| 282 | - Patabase\Constants::COLUMN_LITERALL) { |
|
| 282 | + Patabase\Constants::COLUMN_LITERALL) { |
|
| 283 | 283 | |
| 284 | 284 | $arg = substr($item['value'], strlen(Patabase\Constants::COLUMN_LITERALL)); |
| 285 | 285 | $sql .= $isSqlNeedOperator ? ' '.$currentOperator.' ' : ''; |
@@ -143,9 +143,9 @@ |
||
| 143 | 143 | $sqlWhere = (isset($this->where)) ? $this->where->sql() : ''; |
| 144 | 144 | $sqlTableName = $this->escape($this->tableName); |
| 145 | 145 | return trim(sprintf('UPDATE %s SET %s %s', |
| 146 | - $sqlTableName, |
|
| 147 | - $this->sqlColumns(), |
|
| 148 | - $sqlWhere |
|
| 146 | + $sqlTableName, |
|
| 147 | + $this->sqlColumns(), |
|
| 148 | + $sqlWhere |
|
| 149 | 149 | )); |
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | \ No newline at end of file |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | * @param string $tableName The name of the table |
| 98 | 98 | * |
| 99 | 99 | * @return bool True if the table has been dropped, otherwise false |
| 100 | - */ |
|
| 100 | + */ |
|
| 101 | 101 | public function dropTable(string $tableName): bool |
| 102 | 102 | { |
| 103 | 103 | $sql = trim(sprintf('DROP TABLE %s', $tableName)); |
@@ -131,8 +131,8 @@ |
||
| 131 | 131 | */ |
| 132 | 132 | public function escape(string $str): string |
| 133 | 133 | { |
| 134 | - $list = explode('.', $str); |
|
| 135 | - return implode('.', $this->escapeList($list)); |
|
| 134 | + $list = explode('.', $str); |
|
| 135 | + return implode('.', $this->escapeList($list)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |
@@ -122,9 +122,9 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function lastInsertedId(): string |
| 124 | 124 | { |
| 125 | - // Postgres does not set pdo->lastInsertedId |
|
| 126 | - // use sequence |
|
| 127 | - try { |
|
| 125 | + // Postgres does not set pdo->lastInsertedId |
|
| 126 | + // use sequence |
|
| 127 | + try { |
|
| 128 | 128 | $rq = $this->pdo->prepare('SELECT LASTVAL()'); |
| 129 | 129 | $rq->execute(); |
| 130 | 130 | // return string |
@@ -158,7 +158,6 @@ discard block |
||
| 158 | 158 | /** |
| 159 | 159 | * Get whether foreign keys are enabled or not |
| 160 | 160 | * For compatibility with Sqlite, not implemented in that driver, return false |
| 161 | - |
|
| 162 | 161 | * @access public |
| 163 | 162 | * @return bool true if foreign keys are enabled, otherwise false |
| 164 | 163 | */ |
@@ -182,11 +181,11 @@ discard block |
||
| 182 | 181 | public function addForeignKey(string $fkName, string $srcTable, string $srcColumn, string $refTable, string $refColumn): bool |
| 183 | 182 | { |
| 184 | 183 | $sql = sprintf('ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', |
| 185 | - $this->escape($srcTable), |
|
| 186 | - $fkName, |
|
| 187 | - $this->escape($srcColumn), |
|
| 188 | - $this->escape($refTable), |
|
| 189 | - $this->escape($refColumn) |
|
| 184 | + $this->escape($srcTable), |
|
| 185 | + $fkName, |
|
| 186 | + $this->escape($srcColumn), |
|
| 187 | + $this->escape($refTable), |
|
| 188 | + $this->escape($refColumn) |
|
| 190 | 189 | ); |
| 191 | 190 | return $this->prepareAndExecuteSql($sql); |
| 192 | 191 | } |
@@ -203,9 +202,9 @@ discard block |
||
| 203 | 202 | public function dropForeignKey(string $fkName, string $tableName, bool $ifExists = false): bool |
| 204 | 203 | { |
| 205 | 204 | $sql = sprintf('ALTER TABLE %s DROP CONSTRAINT %s %s', |
| 206 | - $this->escape($tableName), |
|
| 207 | - $ifExists ? 'IF EXISTS' : '', |
|
| 208 | - $fkName |
|
| 205 | + $this->escape($tableName), |
|
| 206 | + $ifExists ? 'IF EXISTS' : '', |
|
| 207 | + $fkName |
|
| 209 | 208 | ); |
| 210 | 209 | return $this->prepareAndExecuteSql($sql); |
| 211 | 210 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $port = !empty($settings['port']) ? ';port='.$settings['port'] : ''; |
| 87 | 87 | $dbname = !empty($settings['database']) ? ';dbname='.$settings['database'] : ''; |
| 88 | 88 | $options = [ |
| 89 | - // \PDO::ATTR_EMULATE_PREPARES => false, |
|
| 89 | + // \PDO::ATTR_EMULATE_PREPARES => false, |
|
| 90 | 90 | ]; |
| 91 | 91 | |
| 92 | 92 | $this->pdo = new \PDO( |
@@ -138,7 +138,6 @@ discard block |
||
| 138 | 138 | /** |
| 139 | 139 | * Get whether foreign keys are enabled or not |
| 140 | 140 | * For compatibility with Sqlite, not implemented in that driver, return false |
| 141 | - |
|
| 142 | 141 | * @access public |
| 143 | 142 | * @return bool true if foreign keys are enabled, otherwise false |
| 144 | 143 | */ |
@@ -162,11 +161,11 @@ discard block |
||
| 162 | 161 | public function addForeignKey(string $fkName, string $srcTable, string $srcColumn, string $refTable, string $refColumn): bool |
| 163 | 162 | { |
| 164 | 163 | $sql = sprintf('ALTER TABLE %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)', |
| 165 | - $this->escape($srcTable), |
|
| 166 | - $fkName, |
|
| 167 | - $this->escape($srcColumn), |
|
| 168 | - $this->escape($refTable), |
|
| 169 | - $this->escape($refColumn) |
|
| 164 | + $this->escape($srcTable), |
|
| 165 | + $fkName, |
|
| 166 | + $this->escape($srcColumn), |
|
| 167 | + $this->escape($refTable), |
|
| 168 | + $this->escape($refColumn) |
|
| 170 | 169 | ); |
| 171 | 170 | return $this->prepareAndExecuteSql($sql); |
| 172 | 171 | } |
@@ -183,8 +182,8 @@ discard block |
||
| 183 | 182 | public function dropForeignKey(string $fkName, string $tableName): bool |
| 184 | 183 | { |
| 185 | 184 | $sql = sprintf('ALTER TABLE %s DROP FOREIGN KEY %s', |
| 186 | - $this->escape($tableName), |
|
| 187 | - $fkName |
|
| 185 | + $this->escape($tableName), |
|
| 186 | + $fkName |
|
| 188 | 187 | ); |
| 189 | 188 | return $this->prepareAndExecuteSql($sql); |
| 190 | 189 | } |
@@ -239,7 +238,7 @@ discard block |
||
| 239 | 238 | "'" . $userPassword ."'" |
| 240 | 239 | )); |
| 241 | 240 | return $this->prepareAndExecuteSql($sql); |
| 242 | - } |
|
| 241 | + } |
|
| 243 | 242 | |
| 244 | 243 | /** |
| 245 | 244 | * Drop a user |
@@ -269,7 +268,7 @@ discard block |
||
| 269 | 268 | * |
| 270 | 269 | * @return bool True if the user has been granted, otherwise false. |
| 271 | 270 | */ |
| 272 | - public function grantUser(string $databaseName, string $userName): bool |
|
| 271 | + public function grantUser(string $databaseName, string $userName): bool |
|
| 273 | 272 | { |
| 274 | 273 | $sql = trim(sprintf('GRANT ALL ON %s.* TO %s@%s; FLUSH PRIVILEGES;', |
| 275 | 274 | $this->escape($databaseName), |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | */ |
| 62 | 62 | protected function getArgName(string $column): string |
| 63 | 63 | { |
| 64 | - return '_' . str_replace('.', '_', $column); |
|
| 64 | + return '_' . str_replace('.', '_', $column); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -90,12 +90,12 @@ |
||
| 90 | 90 | */ |
| 91 | 91 | public function sql(): string |
| 92 | 92 | { |
| 93 | - // Build sql where and escape table name |
|
| 94 | - $sqlWhere = (isset($this->where)) ? $this->where->sql() : ''; |
|
| 95 | - $sqlTableName = $this->escape($this->tableName); |
|
| 93 | + // Build sql where and escape table name |
|
| 94 | + $sqlWhere = (isset($this->where)) ? $this->where->sql() : ''; |
|
| 95 | + $sqlTableName = $this->escape($this->tableName); |
|
| 96 | 96 | |
| 97 | - // DELETE query |
|
| 98 | - return trim(sprintf('DELETE FROM %s %s', |
|
| 97 | + // DELETE query |
|
| 98 | + return trim(sprintf('DELETE FROM %s %s', |
|
| 99 | 99 | $sqlTableName, |
| 100 | 100 | $sqlWhere)); |
| 101 | 101 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @access protected |
| 101 | 101 | * @var QueryBuilder |
| 102 | 102 | */ |
| 103 | - protected $topQuery = null; |
|
| 103 | + protected $topQuery = null; |
|
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * Constructor |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - /** |
|
| 124 | + /** |
|
| 125 | 125 | * Parse the columns arguments for the select query |
| 126 | 126 | * |
| 127 | 127 | * @access protected |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | */ |
| 200 | 200 | public function count(string $alias) |
| 201 | 201 | { |
| 202 | - $this->columns[] = array( |
|
| 202 | + $this->columns[] = array( |
|
| 203 | 203 | 'type' => 'count', |
| 204 | 204 | 'alias' => $alias |
| 205 | 205 | ); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | */ |
| 217 | 217 | public function sum(string $column, string $alias) |
| 218 | 218 | { |
| 219 | - $this->columns[] = array( |
|
| 219 | + $this->columns[] = array( |
|
| 220 | 220 | 'type' => 'sum', |
| 221 | 221 | 'name' => $column, |
| 222 | 222 | 'alias' => $alias |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | */ |
| 235 | 235 | public function min(string $column, string $alias) |
| 236 | 236 | { |
| 237 | - $this->columns[] = array( |
|
| 237 | + $this->columns[] = array( |
|
| 238 | 238 | 'type' => 'min', |
| 239 | 239 | 'name' => $column, |
| 240 | 240 | 'alias' => $alias |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | */ |
| 253 | 253 | public function max(string $column, string $alias) |
| 254 | 254 | { |
| 255 | - $this->columns[] = array( |
|
| 255 | + $this->columns[] = array( |
|
| 256 | 256 | 'type' => 'max', |
| 257 | 257 | 'name' => $column, |
| 258 | 258 | 'alias' => $alias |