|
@@ -28,8 +28,9 @@ discard block |
|
|
block discarded – undo |
|
28
|
28
|
{ |
|
29
|
29
|
$column = $this->queryStructure->prepare($column); |
|
30
|
30
|
|
|
31
|
|
- if ( !$this->validateColumn( $column, $allowedColumns ) ) |
|
32
|
|
- throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME ); |
|
|
31
|
+ if ( !$this->validateColumn( $column, $allowedColumns ) ) { |
|
|
32
|
+ throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME ); |
|
|
33
|
+ } |
|
33
|
34
|
|
|
34
|
35
|
$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column ); |
|
35
|
36
|
|
|
@@ -47,8 +48,9 @@ discard block |
|
|
block discarded – undo |
|
47
|
48
|
{ |
|
48
|
49
|
$column = $this->queryStructure->prepare($column); |
|
49
|
50
|
|
|
50
|
|
- if ( !$this->validateColumn( $column, $allowedColumns ) ) |
|
51
|
|
- throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME ); |
|
|
51
|
+ if ( !$this->validateColumn( $column, $allowedColumns ) ) { |
|
|
52
|
+ throw new QueryException( 'Invalid column name in GROUP BY clause', QueryException::QUERY_ERROR_INVALID_COLUMN_NAME ); |
|
|
53
|
+ } |
|
52
|
54
|
|
|
53
|
55
|
$this->queryStructure->setElement( QueryStructure::GROUP_BY, $column . ' DESC' ); |
|
54
|
56
|
|
|
@@ -73,8 +75,9 @@ discard block |
|
|
block discarded – undo |
|
73
|
75
|
*/ |
|
74
|
76
|
private function getGroupBySyntax() |
|
75
|
77
|
{ |
|
76
|
|
- if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) ) |
|
77
|
|
- return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' ); |
|
|
78
|
+ if ( count( $this->queryStructure->getElement( QueryStructure::GROUP_BY ) ) ) { |
|
|
79
|
+ return 'GROUP BY ' . QueryHelper::implode( $this->queryStructure->getElement( QueryStructure::GROUP_BY ), ', ' ); |
|
|
80
|
+ } |
|
78
|
81
|
|
|
79
|
82
|
return ''; |
|
80
|
83
|
} |
adumitru68 /
QueryBuilder
