diff --git a/ssp.php b/ssp.php index 4569bc2..59bf12a 100644 --- a/ssp.php +++ b/ssp.php @@ -109,6 +109,10 @@ static function order ( $request, $columns, $isJoin = false ) $columnIdx = array_search( $requestColumn['data'], $dtColumns ); $column = $columns[ $columnIdx ]; + if (strpos($column['db'], 'AS') !== FALSE) { + $column['db'] = explode('AS', $column['db'])[0]; + } + if ( $requestColumn['orderable'] == 'true' ) { $dir = $request['order'][$i]['dir'] === 'asc' ? 'ASC' : @@ -155,6 +159,10 @@ static function filter ( $request, $columns, &$bindings, $isJoin = false ) $columnIdx = array_search( $requestColumn['data'], $dtColumns ); $column = $columns[ $columnIdx ]; + if (strpos($column['db'], 'AS') !== FALSE) { + $column['db'] = explode('AS', $column['db'])[0]; + } + if ( $requestColumn['searchable'] == 'true' ) { $binding = SSP::bind( $bindings, '%'.$str.'%', PDO::PARAM_STR ); $globalSearch[] = ($isJoin) ? $column['db']." LIKE ".$binding : "`".$column['db']."` LIKE ".$binding; @@ -168,6 +176,10 @@ static function filter ( $request, $columns, &$bindings, $isJoin = false ) $columnIdx = array_search( $requestColumn['data'], $dtColumns ); $column = $columns[ $columnIdx ]; + if (strpos($column['db'], 'AS') !== FALSE) { + $column['db'] = explode('AS', $column['db'])[0]; + } + $str = $requestColumn['search']['value']; if ( $requestColumn['searchable'] == 'true' &&