Rename 'Optiq' to 'Calcite'.
Re-order actual rows to match expected rows, but only if query does not contain ORDER BY.