Updates to prql-compiler 0.4.2 and fixes

PRQL · Jan 31, 2023 · 40102d0 · 40102d0
1 parent 4f810ea
commit 40102d0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.0.15 - UNRELEASED
 
 * Adds --version parameter (#29, @eitsupi)
+* Updates prql-compiler to 0.4.2 (#27, @aljazerzen)
 
 ## 0.0.14 - 2022-11-09
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/prql/prql-query"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.64.0"
-version = "0.0.14"
+version = "0.0.15"
 
 [[bin]]
 name = "pq"
@@ -29,7 +29,7 @@ env_logger = "0.9.0"
 log = "0.4.17"
 parquet = { version = "23", optional = true }
 polars = { version = "0.24.2", optional = true, features = ["docs-selection"] }
-prql-compiler = { version = "0.4.1" }
+prql-compiler = { version = "0.4.2" }
 regex = { version = "1.6.0", optional = true }
 tokio = { version = "1.19", features = ["rt-multi-thread", "macros"] }
 url = "2"

diff --git a/src/backends/duckdb.rs b/src/backends/duckdb.rs
@@ -66,6 +66,7 @@ pub fn query(
     } else {
         query.to_string()
     };
+    debug!("sql_query = {sql_query}");
 
     // prepare the connection and statement
     let conn = if database == "" {

diff --git a/src/main.rs b/src/main.rs
@@ -152,7 +152,7 @@ fn main() -> Result<()> {
     // args.sql
     if !args.sql && !query.starts_with("prql ") {
         // prepend a PRQL header to signal this is a PRQL query rather than a SQL one
-        query = format!("prql version:'0.4' dialect:ansi\n{query}")
+        query = format!("prql version:'0.4' target:sql.generic\n{query}")
     }
     debug!("query = {query:?}");
 
@@ -276,7 +276,7 @@ fn get_dest_from_to(to: &str) -> Result<Box<dyn Write>> {
 
 fn get_sql_from_query(query: &str) -> Result<String> {
     let sql = if query.starts_with("prql ") {
-        compile(query)?
+        compile(query, None).map_err(|e| anyhow!(e))?
     } else {
         query.to_string()
     };