Support jrsonnet 0.5.0-pre95 and -pre96

Author: cpg314

Cargo.lock

@@ -2,11 +2,14 @@
 version = "0.1.14"
 edition = "2021"
 license = "MIT OR Apache-2.0"
+description = "Express SQL queries with a simple Jsonnet representation, which can be easily templated using the Jsonnet configuration language. "
+categories = ["database", "compilers"]
+repository = "https://github.com/cpg314/sqlsonnet"
 
 [workspace.dependencies]
 sqlsonnet = { version = "0.1.14", path = "sqlsonnet" }
 sqlsonnet-macros = { version = "0.1.14", path = "macros" }
-clickhouse-client = { version = "0.1.14", path = "clickhouse-client" }
+sqlsonnet-clickhouse-client = { version = "0.1.14", path = "clickhouse-client" }
 
 anyhow = "1.0.86"
 clap = { version = "4.5.7", features = ["derive", "env"] }
@@ -21,8 +24,8 @@ lazy_static = "1.5.0"
 tokio = { version = "1.38.0", features = ["full"] }
 reqwest = { version = "0.12.4", features = ["rustls-tls", "json", "gzip", "zstd", "stream"], default-features = false }
 http = "1.0.0"
-jrsonnet-parser = { version = "0.5.0-pre96", git = "https://github.com/cpg314/jrsonnet.git", package = "jrsonnet-parser", tag = "v0.5.0-patch", features = ["exp-null-coaelse"] }
-
+jrsonnet-parser-95 = { package = "jrsonnet-parser", version = "0.5.0-pre95", features = ["exp-null-coaelse"] }
+jrsonnet-parser-96 = { version = "0.5.0-pre96", git = "https://github.com/cpg314/jrsonnet.git", package = "jrsonnet-parser", tag = "v0.5.0-patch", features = ["exp-null-coaelse"] }
 
 [workspace]
 members = ["sqlsonnet", "clickhouse-proxy", "sqlsonnet-cli", "clickhouse-client", "bindings/wasm", "macros"]

Cargo.toml

@@ -335,6 +335,13 @@ $ cargo make docker-compose
 $ cargo nextest run --workspace -r
 ```
 
+### `jrsonnet` version
+
+Via the feature flags `jrsonnet-95` and `jrsonnet-96` (default), the crate supports both:
+
+- the latest published version of `jrsonnet` on crates.io, 0.5.0-pre95
+- the [soon-to-be-released](https://github.com/CertainLach/jrsonnet/issues/70) 0.5.0-pre96 version.
+
 ## TODO
 
 - Proxy:

README.md

@@ -25,8 +25,8 @@ checks:
 
   - type: command
     name: clippy
-    command: cargo clippy --color always --release --workspace --no-deps --benches --tests --all-features -- -D warnings
-    fix_command: cargo clippy --color always --release --workspace --no-deps --benches --tests --all-features --fix --allow-dirty --allow-staged -- -D warnings
+    command: cargo clippy --color always --release --workspace --no-deps --benches --tests -- -D warnings
+    fix_command: cargo clippy --color always --release --workspace --no-deps --benches --tests --fix --allow-dirty --allow-staged -- -D warnings
 
   - type: command
     name: docker-compose

checkalot.yaml

@@ -1,6 +1,9 @@
 [package]
-name = "clickhouse-client"
+name = "sqlsonnet-clickhouse-client"
 version.workspace = true
+repository.workspace = true
+license.workspace = true
+description = "Simple Clickhouse HTTP client"
 edition = "2021"
 
 

clickhouse-client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "clickhouse-proxy"
+name = "sqlsonnet-clickhouse-proxy"
 version.workspace = true
 edition = "2021"
 publish = false
@@ -10,7 +10,7 @@ path = "src/clickhouse_proxy.rs"
 doc = false
 
 [dependencies]
-clickhouse-client.workspace = true
+sqlsonnet-clickhouse-client.workspace = true
 sqlsonnet.workspace = true
 
 anyhow.workspace = true

clickhouse-proxy/Cargo.toml

@@ -166,7 +166,7 @@ impl Response {
             Ok::<_, CacheError>(())
         });
         let body = axum::body::Body::from_stream(body.map(move |buf| {
-            let buf = buf.map_err(clickhouse_client::Error::from)?;
+            let buf = buf.map_err(sqlsonnet_clickhouse_client::Error::from)?;
             tx.send(buf.clone()).map_err(|_| CacheError::SendBuf)?;
             Ok::<_, Error>(buf)
         }));

clickhouse-proxy/src/cache.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
 use tracing::*;
 
-use clickhouse_proxy::{main_impl, Flags};
+use sqlsonnet_clickhouse_proxy::{main_impl, Flags};
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {

clickhouse-proxy/src/clickhouse_proxy.rs

@@ -10,7 +10,7 @@ pub enum Error {
     #[error("Sqlsonnet error: {0}")]
     SqlSonnet(#[from] sqlsonnet::Error),
     #[error("Clickhouse error: {0}")]
-    Clickhouse(#[from] clickhouse_client::Error),
+    Clickhouse(#[from] sqlsonnet_clickhouse_client::Error),
     #[error("Received unexpected response from Clickhouse: {0}")]
     ClickhousePing(String),
     #[error("Cache error: {0}")]

clickhouse-proxy/src/error.rs

@@ -14,11 +14,12 @@ use std::sync::Arc;
 use anyhow::Context;
 use axum::response::IntoResponse;
 use clap::Parser;
+use clickhouse_client::ClickhouseQuery;
 use itertools::Itertools;
 use metrics_exporter_prometheus::PrometheusBuilder;
+use sqlsonnet_clickhouse_client as clickhouse_client;
 use tracing::*;
 
-use clickhouse_client::ClickhouseQuery;
 use sqlsonnet::{Queries, Query};
 
 lazy_static::lazy_static! {

clickhouse-proxy/src/lib.rs

@@ -244,7 +244,7 @@ mod websocket {
                     params: BTreeMap::from([("default_format".into(), FORMAT.into())]),
                     // We can't ask for compression here, because the client does not have
                     // decompression enabled.
-                    compression: clickhouse_client::Compression::None,
+                    compression: sqlsonnet_clickhouse_client::Compression::None,
                     ..Default::default()
                 })
                 .await?;

clickhouse-proxy/src/playground.rs

@@ -1,5 +1,7 @@
 use std::collections::BTreeMap;
 
+use sqlsonnet_clickhouse_client as clickhouse_client;
+use sqlsonnet_clickhouse_proxy as clickhouse_proxy;
 use tracing::*;
 
 /// Integration test which requires a Clickhouse server running (use `cargo make docker-compose`)

clickhouse-proxy/tests/main.rs

@@ -3,12 +3,19 @@ name = "sqlsonnet-macros"
 version.workspace = true
 license.workspace = true
 edition = "2021"
+description = "Proc macros for sqlsonnet"
 
 [lib]
 proc-macro = true
 
 [dependencies]
 quote = "1.0.36"
-jrsonnet-parser.workspace = true
+jrsonnet-parser-96 = { workspace = true, optional = true }
+jrsonnet-parser-95 = { workspace = true, optional = true }
 syn = "2.0.66"
 proc-macro2 = "1.0.85"
+
+[features]
+default = []
+jrsonnet-95 = ["dep:jrsonnet-parser-95"]
+jrsonnet-96 = ["dep:jrsonnet-parser-96"]

macros/Cargo.toml

@@ -1,4 +1,8 @@
 extern crate proc_macro;
+#[cfg(feature = "jrsonnet-95")]
+use jrsonnet_parser_95 as jrsonnet_parser;
+#[cfg(feature = "jrsonnet-96")]
+use jrsonnet_parser_96 as jrsonnet_parser;
 use proc_macro::TokenStream;
 use quote::quote;
 
@@ -13,14 +17,12 @@ fn crate_() -> proc_macro2::TokenStream {
     }
 }
 
-#[derive(Debug)]
 struct Input {
     sqlsonnet: String,
     variables: Vec<Variable>,
     resolver: syn::Expr,
 }
 
-#[derive(Debug)]
 struct Variable {
     name: syn::Ident,
     value: syn::Expr,