data: sql: include grouping columns