Skip to content

Apply datafusion with unpivot fix #1396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2025
Merged

Apply datafusion with unpivot fix #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions Cargo.lock
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ uuid = { version = "1.10.0", features = ["v4", "serde"] }
validator = { version = "0.20.0", features = ["derive"] }

[patch.crates-io]
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "185dc7dcfcf1e94501959e53584a22f4f0878c35" }
datafusion = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }
datafusion-common = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }
datafusion-expr = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }
datafusion-physical-plan = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }
datafusion-doc = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }
datafusion-macros = { git = "https://github.com/Embucket/datafusion.git", rev = "d2f0bc60afc515007e5235ce890529ec338c4402" }

[workspace.lints.clippy]
all = { level = "deny", priority = -1 }
Expand Down
32 changes: 16 additions & 16 deletions crates/core-executor/src/tests/sql/commands/snapshots/unpivot/query_unpivot_basic.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
source: crates/embucket-functions/src/tests/sql/commands/unpivot.rs
source: crates/core-executor/src/tests/sql/commands/unpivot.rs
description: "\"SELECT *\n FROM monthly_sales\n UNPIVOT (sales FOR month IN (jan, feb, mar, apr))\n ORDER BY empid;\""
info: "Setup queries: CREATE OR REPLACE TABLE monthly_sales(\n empid INT,\n dept TEXT,\n jan INT,\n feb INT,\n mar INT,\n apr INT); INSERT INTO monthly_sales VALUES\n (1, 'electronics', 100, 200, 300, 100),\n (2, 'clothes', 100, 300, 150, 200),\n (3, 'cars', 200, 400, 100, 50),\n (4, 'appliances', 100, NULL, 100, 50);"
---
Expand All @@ -8,21 +8,21 @@ Ok(
"+-------+-------------+-------+-------+",
"| empid | dept | month | sales |",
"+-------+-------------+-------+-------+",
"| 1 | electronics | jan | 100 |",
"| 1 | electronics | feb | 200 |",
"| 1 | electronics | mar | 300 |",
"| 1 | electronics | apr | 100 |",
"| 2 | clothes | jan | 100 |",
"| 2 | clothes | feb | 300 |",
"| 2 | clothes | mar | 150 |",
"| 2 | clothes | apr | 200 |",
"| 3 | cars | jan | 200 |",
"| 3 | cars | feb | 400 |",
"| 3 | cars | mar | 100 |",
"| 3 | cars | apr | 50 |",
"| 4 | appliances | jan | 100 |",
"| 4 | appliances | mar | 100 |",
"| 4 | appliances | apr | 50 |",
"| 1 | electronics | JAN | 100 |",
"| 1 | electronics | FEB | 200 |",
"| 1 | electronics | MAR | 300 |",
"| 1 | electronics | APR | 100 |",
"| 2 | clothes | JAN | 100 |",
"| 2 | clothes | FEB | 300 |",
"| 2 | clothes | MAR | 150 |",
"| 2 | clothes | APR | 200 |",
"| 3 | cars | JAN | 200 |",
"| 3 | cars | FEB | 400 |",
"| 3 | cars | MAR | 100 |",
"| 3 | cars | APR | 50 |",
"| 4 | appliances | JAN | 100 |",
"| 4 | appliances | MAR | 100 |",
"| 4 | appliances | APR | 50 |",
"+-------+-------------+-------+-------+",
],
)
18 changes: 9 additions & 9 deletions ...core-executor/src/tests/sql/commands/snapshots/unpivot/query_unpivot_partial_columns.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
source: crates/embucket-functions/src/tests/sql/commands/unpivot.rs
source: crates/core-executor/src/tests/sql/commands/unpivot.rs
description: "\"SELECT *\n FROM monthly_sales\n UNPIVOT (sales FOR month IN (jan, mar))\n ORDER BY empid;\""
info: "Setup queries: CREATE OR REPLACE TABLE monthly_sales(\n empid INT,\n dept TEXT,\n jan INT,\n feb INT,\n mar INT,\n apr INT); INSERT INTO monthly_sales VALUES\n (1, 'electronics', 100, 200, 300, 100),\n (2, 'clothes', 100, 300, 150, 200),\n (3, 'cars', 200, 400, 100, 50),\n (4, 'appliances', 100, NULL, 100, 50);"
---
Expand All @@ -8,14 +8,14 @@ Ok(
"+-------+-------------+-----+-----+-------+-------+",
"| empid | dept | feb | apr | month | sales |",
"+-------+-------------+-----+-----+-------+-------+",
"| 1 | electronics | 200 | 100 | jan | 100 |",
"| 1 | electronics | 200 | 100 | mar | 300 |",
"| 2 | clothes | 300 | 200 | jan | 100 |",
"| 2 | clothes | 300 | 200 | mar | 150 |",
"| 3 | cars | 400 | 50 | jan | 200 |",
"| 3 | cars | 400 | 50 | mar | 100 |",
"| 4 | appliances | | 50 | jan | 100 |",
"| 4 | appliances | | 50 | mar | 100 |",
"| 1 | electronics | 200 | 100 | JAN | 100 |",
"| 1 | electronics | 200 | 100 | MAR | 300 |",
"| 2 | clothes | 300 | 200 | JAN | 100 |",
"| 2 | clothes | 300 | 200 | MAR | 150 |",
"| 3 | cars | 400 | 50 | JAN | 200 |",
"| 3 | cars | 400 | 50 | MAR | 100 |",
"| 4 | appliances | | 50 | JAN | 100 |",
"| 4 | appliances | | 50 | MAR | 100 |",
"+-------+-------------+-----+-----+-------+-------+",
],
)
Loading