Skip to content

Commit

Permalink
Merge branch 'main' into plc/issues/NDAT-1065
Browse files Browse the repository at this point in the history
  • Loading branch information
plcplc authored Dec 12, 2023
2 parents ec5b9be + a04bb82 commit 035b9c1
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 20 deletions.
19 changes: 5 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/connectors/ndc-postgres/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ serde = "1.0.193"
serde_json = { version = "1.0.108", features = ["raw_value"] }
sqlx = { version = "0.7.3", features = [ "json", "postgres", "runtime-tokio-rustls" ] }
thiserror = "1.0"
tokio = { version = "1.34.0", features = ["full"] }
tokio = { version = "1.35.0", features = ["full"] }
tracing = "0.1.40"
url = "2.5.0"

Expand Down
2 changes: 1 addition & 1 deletion crates/query-engine/execution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ query-engine-sql = { path = "../sql" }

prometheus = "0.13.3"
serde_json = "1.0.108"
sqlformat = "0.2.2"
sqlformat = "0.2.3"
sqlx = { version = "0.7.3", features = [ "json", "postgres", "runtime-tokio-rustls", "uuid" ] }
tracing = "0.1.40"
bytes = "1.5.0"
2 changes: 1 addition & 1 deletion crates/query-engine/translation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ serde_json = "1.0.108"

[dev-dependencies]
insta = { version = "1.34.0", features = ["json"] }
sqlformat = "0.2.2"
sqlformat = "0.2.3"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
source: crates/query-engine/translation/tests/tests.rs
expression: result
---
BEGIN ISOLATION LEVEL READ COMMITTED READ WRITE;
BEGIN
ISOLATION LEVEL READ COMMITTED READ WRITE;

WITH "%0_NATIVE_QUERY_delete_playlist_track" AS (
DELETE FROM
Expand Down
2 changes: 1 addition & 1 deletion crates/tests/databases-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ insta = { version = "1.34.0", features = ["json"] }
schemars = { version = "0.8.16", features = ["smol_str", "preserve_order"] }
serde_json = "1.0.108"
test-each = "0.2.1"
tokio = { version = "1.34.0", features = ["full"] }
tokio = { version = "1.35.0", features = ["full"] }
2 changes: 1 addition & 1 deletion crates/tests/tests-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ serde_derive = "^1.0"
serde_json = { version = "1.0.108", features = ["raw_value"] }
similar-asserts = "1.5.0"
sqlx = { version = "0.7.3", features = [ "json", "postgres", "runtime-tokio-rustls" ] }
tokio = { version = "1.34.0", features = ["full"] }
tokio = { version = "1.35.0", features = ["full"] }
tokio-postgres = "0.7.10"
tracing = "0.1.40"
uuid = {version = "1.6.1", features = [ "v4", "fast-rng", "macro-diagnostics" ]}

0 comments on commit 035b9c1

Please sign in to comment.