JDBC adapter incorrectly adds ORDER BY columns to the SELECT list of generated SQL query

@Test void testOrderByNotInSelectList() {
  String query = "select count(1)\n"
      + "from \"foodmart\".\"product\"\n"
      + "group by \"product_id\"\n"
      + "order by \"product_id\" desc\n";
  final String expected = "SELECT COUNT(1)\n"
      + "FROM \"foodmart\".\"product\"\n"
      + "GROUP BY \"product_id\"\n"
      + "ORDER BY \"product_id\" desc\n";
  sql(query).withBigQuery().ok(expected);
}

SELECT COUNT(*), product_id
FROM foodmart.product
GROUP BY product_id
ORDER BY product_id IS NULL DESC, product_id DESC 

LogicalProject(EXPR$0=[$0])
  LogicalSort(sort0=[$1], dir0=[DESC])
    LogicalProject(EXPR$0=[$1], product_id=[$0])
      LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
        LogicalProject(product_id=[$1])
          JdbcTableScan(table=[[foodmart, product]]) 

SELECT `EXPR$0`
FROM (SELECT COUNT(*) AS `EXPR$0`, product_id
FROM foodmart.product
GROUP BY product_id
ORDER BY product_id IS NULL DESC, product_id DESC) AS t2