hasura · hallettj · May 28, 2024 · May 1, 2024 · May 7, 2024 · May 7, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,13 +5,11 @@ version = "0.0.6"
 members = [
   "crates/cli",
   "crates/configuration",
-  "crates/dc-api",
-  "crates/dc-api-test-helpers",
-  "crates/dc-api-types",
   "crates/integration-tests",
   "crates/mongodb-agent-common",
   "crates/mongodb-connector",
   "crates/mongodb-support",
+  "crates/ndc-query-plan",
   "crates/ndc-test-helpers",
   "crates/test-helpers",
 ]
@@ -23,8 +21,10 @@ resolver = "2"
 ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs.git" }
 ndc-models = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.2" }
 
+indexmap = { version = "2", features = ["serde"] } # should match the version that ndc-models uses
 itertools = "^0.12.1"
 mongodb = { version = "2.8", features = ["tracing-unstable"] }
+schemars = "^0.8.12"
 
 # Connecting to MongoDB Atlas database with time series collections fails in the
 # latest released version of the MongoDB Rust driver. A fix has been merged, but

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -12,7 +12,7 @@ mongodb-support = { path = "../mongodb-support" }
 anyhow = "1.0.80"
 clap = { version = "4.5.1", features = ["derive", "env"] }
 futures-util = "0.3.28"
-indexmap = { version = "1", features = ["serde"] } # must match the version that ndc-client uses
+indexmap = { workspace = true }
 itertools = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0.113", features = ["raw_value"] }

diff --git a/crates/configuration/Cargo.toml b/crates/configuration/Cargo.toml
@@ -4,13 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+mongodb-support = { path = "../mongodb-support" }
+ndc-query-plan = { path = "../ndc-query-plan" }
+
 anyhow = "1"
 futures = "^0.3"
 itertools = { workspace = true }
 mongodb = { workspace = true }
-mongodb-support = { path = "../mongodb-support" }
 ndc-models = { workspace = true }
-schemars = "^0.8.12"
+schemars = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 serde_yaml = "^0.9"