From 6e468828f9a268724705ab6769447d253eb08bc3 Mon Sep 17 00:00:00 2001
From: Benoit Ranque <ranque.benoit@gmail.com>
Date: Wed, 10 Apr 2024 08:44:16 -0400
Subject: [PATCH] fix ordering of result sets

---
 CHANGELOG.md                                   | 4 ++++
 Cargo.lock                                     | 6 +++---
 Cargo.toml                                     | 2 +-
 crates/ndc-clickhouse/src/sql/query_builder.rs | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e10afb..892adf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.3]
+
+- Fix ordering of result sets for foreach queries (remote joins)
+
 ## [0.2.2]
 
 - Return error if empty list of query variables passed. Variables should be ommited or be a list with at least one member
diff --git a/Cargo.lock b/Cargo.lock
index b8fa7f6..867bfb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -340,7 +340,7 @@ checksum = "97af0562545a7d7f3d9222fcf909963bec36dcb502afaacab98c6ffac8da47ce"
 
 [[package]]
 name = "common"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "peg",
  "reqwest 0.12.3",
@@ -1044,7 +1044,7 @@ dependencies = [
 
 [[package]]
 name = "ndc-clickhouse"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "async-trait",
  "common",
@@ -1061,7 +1061,7 @@ dependencies = [
 
 [[package]]
 name = "ndc-clickhouse-cli"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "clap",
  "common",
diff --git a/Cargo.toml b/Cargo.toml
index 5d56d27..a958b6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,5 +6,5 @@ members = [
 ]
 resolver = "2"
 
-package.version = "0.2.2"
+package.version = "0.2.3"
 package.edition = "2021"
diff --git a/crates/ndc-clickhouse/src/sql/query_builder.rs b/crates/ndc-clickhouse/src/sql/query_builder.rs
index 6462759..c4e2ca3 100644
--- a/crates/ndc-clickhouse/src/sql/query_builder.rs
+++ b/crates/ndc-clickhouse/src/sql/query_builder.rs
@@ -193,7 +193,7 @@ impl<'r, 'c> QueryBuilder<'r, 'c> {
         let order_by = if self.request.variables.is_some() {
             vec![OrderByExpr {
                 expr: Expr::CompoundIdentifier(vec![
-                    Ident::new_quoted("_rowset"),
+                    Ident::new_quoted("_vars"),
                     Ident::new_quoted("_varset_id"),
                 ]),
                 asc: Some(true),