Commit a5f6c98

authored

Merge pull request #86 from prasad83/master

Accept Column object through setColumns.

2 parents 877d54f + 13fd053 commit a5f6c98Copy full SHA for a5f6c98

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public static function createColumns(array &$arguments, $table = null)`
`35`	`35`	`$column->setAlias($index);`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ $createdColumns[] = $column;`
	`39`	`+ } else if ($column instanceof Column) {`
`38`	`40`	`$createdColumns[] = $column;`
`39`	`41`	`}`
`40`	`42`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,8 @@ protected function compare($column, $value, $operator)`
`278`	`278`	`protected function prepareColumn($column)`
`279`	`279`	`{`
`280`	`280`	`//This condition handles the "Select as a a column" special case.`
`281`		`- if ($column instanceof Select) {`
	`281`	`+ //or when compare column is customized.`
	`282`	`+ if ($column instanceof Select \|\| $column instanceof Column) {`
`282`	`283`	`return $column;`
`283`	`284`	`}`
`284`	`285`

Comments

(0)