@@ -116,10 +116,11 @@ |
||
| 116 | 116 | { |
| 117 | 117 | $join = $typeJoin . ' ' . $tableJoin; |
| 118 | 118 | |
| 119 | - if ( is_null( $onRight ) ) |
|
| 120 | - $join .= " USING ( $onLeft )"; |
|
| 121 | - else |
|
| 122 | - $join .= " ON $onLeft = $onRight"; |
|
| 119 | + if ( is_null( $onRight ) ) { |
|
| 120 | + $join .= " USING ( $onLeft )"; |
|
| 121 | + } else { |
|
| 122 | + $join .= " ON $onLeft = $onRight"; |
|
| 123 | + } |
|
| 123 | 124 | |
| 124 | 125 | $this->queryStructure->setElement( QueryStructure::JOIN, $join ); |
| 125 | 126 | |
@@ -28,11 +28,13 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | $limit = trim( $limit ); |
| 30 | 30 | |
| 31 | - if ( !QueryHelper::isInteger( $limit ) ) |
|
| 32 | - throw new QueryException( 'Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT ); |
|
| 31 | + if ( !QueryHelper::isInteger( $limit ) ) { |
|
| 32 | + throw new QueryException( 'Invalid Limit value', QueryException::QUERY_ERROR_INVALID_LIMIT ); |
|
| 33 | + } |
|
| 33 | 34 | |
| 34 | - if ( $limit == 0 ) |
|
| 35 | - throw new QueryException( 'Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO ); |
|
| 35 | + if ( $limit == 0 ) { |
|
| 36 | + throw new QueryException( 'Invalid Limit zero', QueryException::QUERY_ERROR_INVALID_LIMIT_ZERO ); |
|
| 37 | + } |
|
| 36 | 38 | |
| 37 | 39 | if ( is_null( $offset ) ) { |
| 38 | 40 | $this->queryStructure->setElement( QueryStructure::LIMIT, $limit ); |
@@ -42,8 +44,9 @@ discard block |
||
| 42 | 44 | |
| 43 | 45 | $offset = trim( $offset ); |
| 44 | 46 | |
| 45 | - if ( !QueryHelper::isInteger( $offset ) ) |
|
| 46 | - throw new QueryException( 'Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET ); |
|
| 47 | + if ( !QueryHelper::isInteger( $offset ) ) { |
|
| 48 | + throw new QueryException( 'Invalid Limit offset', QueryException::QUERY_ERROR_INVALID_LIMIT_OFFSET ); |
|
| 49 | + } |
|
| 47 | 50 | |
| 48 | 51 | $this->queryStructure->setElement( QueryStructure::LIMIT, $offset . ',' . $limit ); |
| 49 | 52 | |
@@ -52,8 +55,9 @@ discard block |
||
| 52 | 55 | |
| 53 | 56 | private function getLimitSyntax() |
| 54 | 57 | { |
| 55 | - if ( !$this->queryStructure->getElement( QueryStructure::LIMIT ) ) |
|
| 56 | - return ''; |
|
| 58 | + if ( !$this->queryStructure->getElement( QueryStructure::LIMIT ) ) { |
|
| 59 | + return ''; |
|
| 60 | + } |
|
| 57 | 61 | |
| 58 | 62 | return 'LIMIT ' . $this->queryStructure->getElement( QueryStructure::LIMIT ); |
| 59 | 63 | } |
@@ -16,11 +16,13 @@ |
||
| 16 | 16 | |
| 17 | 17 | protected function validateColumn( $columnName, array $allowed ) |
| 18 | 18 | { |
| 19 | - if ( is_integer( $columnName ) ) |
|
| 20 | - return true; |
|
| 19 | + if ( is_integer( $columnName ) ) { |
|
| 20 | + return true; |
|
| 21 | + } |
|
| 21 | 22 | |
| 22 | - if ( !count( $allowed ) ) |
|
| 23 | - return true; |
|
| 23 | + if ( !count( $allowed ) ) { |
|
| 24 | + return true; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | return false; |
| 26 | 28 | } |
@@ -27,8 +27,9 @@ |
||
| 27 | 27 | { |
| 28 | 28 | $syntax = QueryHelper::clearMultipleSpaces( $syntax ); |
| 29 | 29 | |
| 30 | - if ( !$withReplacement ) |
|
| 31 | - return $syntax; |
|
| 30 | + if ( !$withReplacement ) { |
|
| 31 | + return $syntax; |
|
| 32 | + } |
|
| 32 | 33 | |
| 33 | 34 | return $this->replaceValues( $syntax ); |
| 34 | 35 | } |
@@ -29,8 +29,9 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $this->setFieldsList( $fieldsList ); |
| 31 | 31 | |
| 32 | - foreach ( $rowsForInsert as $row ) |
|
| 33 | - $this->addSingleRow( $row ); |
|
| 32 | + foreach ( $rowsForInsert as $row ) { |
|
| 33 | + $this->addSingleRow( $row ); |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | 36 | return $this; |
| 36 | 37 | } |
@@ -45,8 +46,9 @@ discard block |
||
| 45 | 46 | { |
| 46 | 47 | $this->setFieldsList( $fieldsList ); |
| 47 | 48 | |
| 48 | - foreach ( $query->getBindParams() as $key => $value ) |
|
| 49 | - $this->queryStructure->setParams( $key, $value ); |
|
| 49 | + foreach ( $query->getBindParams() as $key => $value ) { |
|
| 50 | + $this->queryStructure->setParams( $key, $value ); |
|
| 51 | + } |
|
| 50 | 52 | |
| 51 | 53 | $this->queryStructure->replaceElement( QueryStructure::SET_FIELDS, $query ); |
| 52 | 54 | |
@@ -59,8 +61,9 @@ discard block |
||
| 59 | 61 | */ |
| 60 | 62 | private function setFieldsList( $fieldList ) |
| 61 | 63 | { |
| 62 | - if ( !is_array( $fieldList ) ) |
|
| 63 | - $fieldList = QueryHelper::explode( $fieldList ); |
|
| 64 | + if ( !is_array( $fieldList ) ) { |
|
| 65 | + $fieldList = QueryHelper::explode( $fieldList ); |
|
| 66 | + } |
|
| 64 | 67 | |
| 65 | 68 | $this->queryStructure->replaceElement( QueryStructure::FIELDS, $fieldList ); |
| 66 | 69 | |
@@ -74,13 +77,15 @@ discard block |
||
| 74 | 77 | private function addSingleRow( array $rowValues ) |
| 75 | 78 | { |
| 76 | 79 | |
| 77 | - if ( $this->getNumberOfFields() !== count( $rowValues ) ) |
|
| 78 | - throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT ); |
|
| 80 | + if ( $this->getNumberOfFields() !== count( $rowValues ) ) { |
|
| 81 | + throw new QueryException( 'Ivalid number of fields.', QueryException::QUERY_ERROR_INVALID_FIELDS_COUNT ); |
|
| 82 | + } |
|
| 79 | 83 | |
| 80 | 84 | $pdoRowValues = array(); |
| 81 | 85 | |
| 82 | - foreach ( $rowValues as $value ) |
|
| 83 | - $pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value ); |
|
| 86 | + foreach ( $rowValues as $value ) { |
|
| 87 | + $pdoRowValues[] = $this->queryStructure->bindParam( 'value', $value ); |
|
| 88 | + } |
|
| 84 | 89 | |
| 85 | 90 | $pdoRowValuesString = '( ' . QueryHelper::implode( $pdoRowValues, ', ' ) . ' )'; |
| 86 | 91 | |
@@ -94,8 +99,9 @@ discard block |
||
| 94 | 99 | */ |
| 95 | 100 | private function getInsertMultipleRowsSyntax() |
| 96 | 101 | { |
| 97 | - if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) ) |
|
| 98 | - return $this->getSyntaxWithSelect(); |
|
| 102 | + if ( is_a( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), QuerySelect::class ) ) { |
|
| 103 | + return $this->getSyntaxWithSelect(); |
|
| 104 | + } |
|
| 99 | 105 | |
| 100 | 106 | $fields = '( ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::FIELDS ), ', ' ) . ' )'; |
| 101 | 107 | $values = QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ), ', ' ); |
@@ -48,8 +48,9 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function setFieldsByArray( array $updateFieldsArray ) |
| 50 | 50 | { |
| 51 | - foreach ( $updateFieldsArray as $fieldName => $fieldValue ) |
|
| 52 | - $this->setField( $fieldName, $fieldValue ); |
|
| 51 | + foreach ( $updateFieldsArray as $fieldName => $fieldValue ) { |
|
| 52 | + $this->setField( $fieldName, $fieldValue ); |
|
| 53 | + } |
|
| 53 | 54 | |
| 54 | 55 | return $this; |
| 55 | 56 | } |
@@ -59,8 +60,9 @@ discard block |
||
| 59 | 60 | */ |
| 60 | 61 | private function getSettingFieldsSyntax() |
| 61 | 62 | { |
| 62 | - if ( !count( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) ) ) |
|
| 63 | - return ''; |
|
| 63 | + if ( !count( $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) ) ) { |
|
| 64 | + return ''; |
|
| 65 | + } |
|
| 64 | 66 | |
| 65 | 67 | return 'SET ' . implode( ', ', $this->queryStructure->getElement( QueryStructure::SET_FIELDS ) ); |
| 66 | 68 | } |
@@ -42,8 +42,9 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function getMasterConnection() |
| 44 | 44 | { |
| 45 | - if ( !is_a( $this->pdoMaster, \PDO::class ) ) |
|
| 46 | - $this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() ); |
|
| 45 | + if ( !is_a( $this->pdoMaster, \PDO::class ) ) { |
|
| 46 | + $this->pdoMaster = $this->connect( $this->config->getMasterDataConnect() ); |
|
| 47 | + } |
|
| 47 | 48 | |
| 48 | 49 | return $this->pdoMaster; |
| 49 | 50 | } |
@@ -53,11 +54,13 @@ discard block |
||
| 53 | 54 | */ |
| 54 | 55 | public function getSlaveConnection() |
| 55 | 56 | { |
| 56 | - if ( !$this->config->getReplicationEnable() ) |
|
| 57 | - return $this->getMasterConnection(); |
|
| 57 | + if ( !$this->config->getReplicationEnable() ) { |
|
| 58 | + return $this->getMasterConnection(); |
|
| 59 | + } |
|
| 58 | 60 | |
| 59 | - if ( !is_a( $this->pdoSlave, \PDO::class ) ) |
|
| 60 | - $this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() ); |
|
| 61 | + if ( !is_a( $this->pdoSlave, \PDO::class ) ) { |
|
| 62 | + $this->pdoSlave = $this->connect( $this->config->getSlaveDataConnect() ); |
|
| 63 | + } |
|
| 61 | 64 | |
| 62 | 65 | return $this->pdoSlave; |
| 63 | 66 | } |
@@ -70,8 +73,9 @@ discard block |
||
| 70 | 73 | { |
| 71 | 74 | $statement = trim( strtolower( $statement ) ); |
| 72 | 75 | |
| 73 | - if ( $statement === DbService::QUERY_TYPE_SELECT ) |
|
| 74 | - return $this->getSlaveConnection(); |
|
| 76 | + if ( $statement === DbService::QUERY_TYPE_SELECT ) { |
|
| 77 | + return $this->getSlaveConnection(); |
|
| 78 | + } |
|
| 75 | 79 | |
| 76 | 80 | return $this->getMasterConnection(); |
| 77 | 81 | } |
@@ -55,8 +55,9 @@ discard block |
||
| 55 | 55 | $this->queryStructure->setElement( QueryStructure::TABLE, $tableName ); |
| 56 | 56 | |
| 57 | 57 | $tableSelectParams = $table->getBindParams(); |
| 58 | - foreach ( $tableSelectParams as $key => $value ) |
|
| 59 | - $this->queryStructure->setParams( $key, $value ); |
|
| 58 | + foreach ( $tableSelectParams as $key => $value ) { |
|
| 59 | + $this->queryStructure->setParams( $key, $value ); |
|
| 60 | + } |
|
| 60 | 61 | |
| 61 | 62 | } |
| 62 | 63 | } |
@@ -107,8 +108,9 @@ discard block |
||
| 107 | 108 | $this->queryStructure->setElement( QueryStructure::DISTINCT, 0 ); //??? |
| 108 | 109 | } |
| 109 | 110 | |
| 110 | - if ( $this->queryStructure->getElement( QueryStructure::FIRST ) ) |
|
| 111 | - $this->queryStructure->setElement( QueryStructure::LIMIT, 1 ); |
|
| 111 | + if ( $this->queryStructure->getElement( QueryStructure::FIRST ) ) { |
|
| 112 | + $this->queryStructure->setElement( QueryStructure::LIMIT, 1 ); |
|
| 113 | + } |
|
| 112 | 114 | |
| 113 | 115 | $syntax = array(); |
| 114 | 116 | |
@@ -190,8 +192,9 @@ discard block |
||
| 190 | 192 | return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) ); |
| 191 | 193 | break; |
| 192 | 194 | case $this->queryStructure->getElement( QueryStructure::FIRST ): |
| 193 | - if ( $this->queryStructure->getElement( QueryStructure::COLUMN ) ) |
|
| 194 | - return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) ); |
|
| 195 | + if ( $this->queryStructure->getElement( QueryStructure::COLUMN ) ) { |
|
| 196 | + return DbService::getInstance()->single( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) ); |
|
| 197 | + } |
|
| 195 | 198 | |
| 196 | 199 | return DbService::getInstance()->row( $this->getSyntax(), $this->queryStructure->getElement( QueryStructure::BIND_PARAMS ) ); |
| 197 | 200 | break; |
@@ -45,22 +45,26 @@ |
||
| 45 | 45 | { |
| 46 | 46 | $table = trim( $table ); |
| 47 | 47 | |
| 48 | - if ( '' === $table ) |
|
| 49 | - throw new QueryException( 'Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 48 | + if ( '' === $table ) { |
|
| 49 | + throw new QueryException( 'Table name is empty string!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 50 | + } |
|
| 50 | 51 | |
| 51 | - if ( DbConfig::getInstance()->useTablePrefix() ) |
|
| 52 | - $table = str_ireplace( '::', DbConfig::getInstance()->getTablePrefix(), $table ); |
|
| 52 | + if ( DbConfig::getInstance()->useTablePrefix() ) { |
|
| 53 | + $table = str_ireplace( '::', DbConfig::getInstance()->getTablePrefix(), $table ); |
|
| 54 | + } |
|
| 53 | 55 | |
| 54 | 56 | return $table; |
| 55 | 57 | } |
| 56 | 58 | |
| 57 | 59 | private function validateTableSubQuery( $table ) |
| 58 | 60 | { |
| 59 | - if ( $this->statement !== QueryStatement::QUERY_STATEMENT_SELECT ) |
|
| 60 | - throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 61 | + if ( $this->statement !== QueryStatement::QUERY_STATEMENT_SELECT ) { |
|
| 62 | + throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 63 | + } |
|
| 61 | 64 | |
| 62 | - if ( !is_a( $table, QuerySelect::class ) ) |
|
| 63 | - throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 65 | + if ( !is_a( $table, QuerySelect::class ) ) { |
|
| 66 | + throw new QueryException( 'Invalid subQuery statement!', QueryException::QUERY_ERROR_INVALID_TABLE_STATEMENT ); |
|
| 67 | + } |
|
| 64 | 68 | |
| 65 | 69 | return $table; |
| 66 | 70 | } |