sqlbuild-cli 0.158.1__tar.gz → 0.158.2__tar.gz

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/Cargo.lock

@@ -1122,7 +1122,7 @@ checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b"
 
 [[package]]
 name = "sqlbuild-analysis"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "polyglot-sql",
  "polyglot-sql-function-catalogs",
@@ -1144,7 +1144,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-attachments"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "sqlbuild-core",
  "sqlbuild-sqltext",
@@ -1152,7 +1152,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-cache"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "blake3",
  "rayon",
@@ -1165,7 +1165,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-cli"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "blake3",
  "ctrlc",
@@ -1180,7 +1180,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-config"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "saphyr-parser",
  "sqlbuild-core",
@@ -1191,7 +1191,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-core"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "regex",
  "sha2",
@@ -1199,14 +1199,14 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-cursor"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "sqlbuild-core",
 ]
 
 [[package]]
 name = "sqlbuild-discovery"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "junction",
  "rayon",
@@ -1219,7 +1219,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-model-config"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "regex",
  "sqlbuild-core",
@@ -1227,7 +1227,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-pysource"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "ruff_python_ast",
  "ruff_python_parser",
@@ -1238,7 +1238,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-python"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "fensu-policy",
  "mimalloc",
@@ -1262,11 +1262,12 @@ dependencies = [
  "sqlbuild-scopes",
  "sqlbuild-sqltext",
  "sqlbuild-state",
+ "stacker",
 ]
 
 [[package]]
 name = "sqlbuild-refactor"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "serde",
  "serde_json",
@@ -1280,7 +1281,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-render"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "serde_json",
  "sqlbuild-cache",
@@ -1290,7 +1291,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-rules"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "blake3",
  "fensu-policy",
@@ -1314,7 +1315,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-scopes"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "serde_json",
  "sha2",
@@ -1327,7 +1328,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-sqltext"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "rayon",
  "serde",
@@ -1336,7 +1337,7 @@ dependencies = [
 
 [[package]]
 name = "sqlbuild-state"
-version = "0.158.1"
+version = "0.158.2"
 dependencies = [
  "serde_json",
  "sha2",

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/Cargo.toml

@@ -29,7 +29,7 @@ python-boundary = "sqlbuild-python"
 polyglot-floor = "sqlbuild-analysis"
 
 [workspace.package]
-version = "0.158.1"
+version = "0.158.2"
 edition = "2024"
 license = "Apache-2.0"
 publish = false

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbuild-cli
-Version: 0.158.1
+Version: 0.158.2
 License-File: LICENSE
 Summary: The native sqb and sqlbuild executables of SQLBuild
 License-Expression: Apache-2.0
@@ -27,6 +27,8 @@ and safe renames to your SQL, so change stops being risky. It is a free, open-so
 SQL and Python data pipelines, and it keeps its state in append-only tables in your own warehouse:
 no external state database, no manifest files and no paid tier.
 
+Its compiler and planner run in Rust. Warehouse execution and extensions use Python.
+
 <p align="center">
   <img src="https://raw.githubusercontent.com/chio-labs/sqlbuild/main/.github/demos/rename.gif" alt="Moving and renaming an incremental model with sqb mv: sqb plan migrates the existing table instead of rebuilding it" width="100%">
 </p>

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/README.md

@@ -18,6 +18,8 @@ and safe renames to your SQL, so change stops being risky. It is a free, open-so
 SQL and Python data pipelines, and it keeps its state in append-only tables in your own warehouse:
 no external state database, no manifest files and no paid tier.
 
+Its compiler and planner run in Rust. Warehouse execution and extensions use Python.
+
 <p align="center">
   <img src="https://raw.githubusercontent.com/chio-labs/sqlbuild/main/.github/demos/rename.gif" alt="Moving and renaming an incremental model with sqb mv: sqb plan migrates the existing table instead of rebuilding it" width="100%">
 </p>

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/crates/sqlbuild-core/src/scenario_command/_helpers/expectations.rs

@@ -3,14 +3,14 @@
 use crate::cli_text::models::CliStyle;
 use crate::scenario_command::_helpers::rows::{result_error, rows_label};
 use crate::scenario_command::constants::{
-    EXPECTATION_ERROR_INDENT, EXPECTATION_LABEL_WIDTH, EXPECTATION_NAME_WIDTH, FAIL_STATUS,
-    PASS_STATUS,
+    ERROR_STATUS, EXPECTATION_ERROR_INDENT, EXPECTATION_LABEL_WIDTH, EXPECTATION_NAME_WIDTH,
+    FAIL_STATUS, PASS_STATUS,
 };
 use crate::scenario_command::models::{CodedText, ScenarioResultRow};
 
-/// One `expect` row.
-fn expectation_line(item: &str, (failed, detail): (bool, String), style: CliStyle) -> String {
-    let status: String = style.status(if failed { FAIL_STATUS } else { PASS_STATUS });
+/// One `expect` row under `status`.
+fn expectation_line(item: &str, (status, detail): (&str, String), style: CliStyle) -> String {
+    let status: String = style.status(status);
     format!(
         "    {:<EXPECTATION_LABEL_WIDTH$}{item:<EXPECTATION_NAME_WIDTH$} {status}{detail}\n",
         "expect"
@@ -32,31 +32,35 @@ fn expectation_error(error: Option<&CodedText>, style: CliStyle) -> String {
 pub(crate) fn expectation_rows(row: &ScenarioResultRow, style: CliStyle) -> String {
     let mut text: String = String::new();
     for expected in &row.expected {
-        let detail: String = if expected.failed {
-            format!("  {} mismatched", expected.mismatched_row_count)
-        } else {
-            String::new()
-        };
+        let (status, detail): (&str, String) =
+            match (expected.failed, expected.mismatched_row_count) {
+                (false, _) => (PASS_STATUS, String::new()),
+                (true, Some(mismatched)) => (
+                    FAIL_STATUS,
+                    format!(
+                        "  {mismatched} mismatched, {} missing",
+                        expected.missing_row_count.unwrap_or_default()
+                    ),
+                ),
+                (true, None) => (ERROR_STATUS, String::new()),
+            };
         text.push_str(&expectation_line(
             &format!("expected {}", expected.model_name),
-            (expected.failed, detail),
+            (status, detail),
             style,
         ));
         text.push_str(&expectation_error(expected.error.as_ref(), style));
     }
     for assertion in &row.assertions {
-        let detail: String = if assertion.failed {
-            format!(
-                "  {} {}",
-                assertion.failing_row_count,
-                rows_label(assertion.failing_row_count)
-            )
-        } else {
-            String::new()
+        let (status, detail): (&str, String) = match (assertion.failed, assertion.failing_row_count)
+        {
+            (false, _) => (PASS_STATUS, String::new()),
+            (true, Some(count)) => (FAIL_STATUS, format!("  {count} {}", rows_label(count))),
+            (true, None) => (ERROR_STATUS, String::new()),
         };
         text.push_str(&expectation_line(
             &format!("assertion {}", assertion.name),
-            (assertion.failed, detail),
+            (status, detail),
             style,
         ));
         text.push_str(&expectation_error(assertion.error.as_ref(), style));
@@ -68,18 +72,27 @@ pub(crate) fn expectation_rows(row: &ScenarioResultRow, style: CliStyle) -> Stri
 pub(crate) fn expectation_failures(row: &ScenarioResultRow) -> String {
     let mut text: String = String::new();
     for expected in row.expected.iter().filter(|expected| expected.failed) {
-        text.push_str(&format!(
-            "    expected {}: actual={} expected={} mismatched={}\n",
-            expected.model_name,
+        let (Some(actual), Some(expected_count), Some(mismatched)) = (
             expected.actual_row_count,
             expected.expected_row_count,
-            expected.mismatched_row_count
+            expected.mismatched_row_count,
+        ) else {
+            continue;
+        };
+        text.push_str(&format!(
+            "    expected {}: actual={actual} expected={expected_count} mismatched={mismatched} \
+             missing={}\n",
+            expected.model_name,
+            expected.missing_row_count.unwrap_or_default()
         ));
     }
     for assertion in row.assertions.iter().filter(|assertion| assertion.failed) {
+        let Some(failing) = assertion.failing_row_count else {
+            continue;
+        };
         text.push_str(&format!(
-            "    assertion {}: failing_rows={}\n",
-            assertion.name, assertion.failing_row_count
+            "    assertion {}: failing_rows={failing}\n",
+            assertion.name
         ));
         if let Some(sample) = &assertion.first_sample {
             text.push_str(&format!("    sample: {sample}\n"));

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/crates/sqlbuild-core/src/scenario_command/constants.rs

@@ -23,6 +23,7 @@ pub(crate) const BINARY_UNIT_SIZE: f64 = 1024.0;
 
 pub(crate) const PASS_STATUS: &str = "PASS";
 pub(crate) const FAIL_STATUS: &str = "FAIL";
+pub(crate) const ERROR_STATUS: &str = "ERROR";
 
 pub(crate) const DEFAULT_MAX_SNAPSHOT_ROWS_PER_RELATION: i64 = 10_000;
 pub(crate) const DEFAULT_MAX_SNAPSHOT_TOTAL_ROWS: i64 = 50_000;

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/crates/sqlbuild-core/src/scenario_command/models.rs

@@ -42,14 +42,15 @@ pub struct CodedText {
     pub help: Option<String>,
 }
 
-/// One expected-relation comparison of a scenario result.
+/// One expected-relation comparison of a scenario result; counts are `None` if it did not run.
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct ExpectedRow {
     pub model_name: String,
     pub failed: bool,
-    pub actual_row_count: i64,
-    pub expected_row_count: i64,
-    pub mismatched_row_count: i64,
+    pub actual_row_count: Option<i64>,
+    pub expected_row_count: Option<i64>,
+    pub mismatched_row_count: Option<i64>,
+    pub missing_row_count: Option<i64>,
     pub error: Option<CodedText>,
 }
 
@@ -58,7 +59,8 @@ pub struct ExpectedRow {
 pub struct AssertionRow {
     pub name: String,
     pub failed: bool,
-    pub failing_row_count: i64,
+    /// `None` when the assertion query did not run.
+    pub failing_row_count: Option<i64>,
     /// `str()` of the first failing sample row, when there is one.
     pub first_sample: Option<String>,
     pub error: Option<CodedText>,

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/crates/sqlbuild-core/src/scenario_command/tests/helpers.rs

@@ -76,15 +76,16 @@ pub(super) fn failing_result_row() -> ScenarioResultRow {
             ExpectedRow {
                 model_name: "fact_orders".to_owned(),
                 failed: true,
-                actual_row_count: 3,
-                expected_row_count: 2,
-                mismatched_row_count: 2,
+                actual_row_count: Some(3),
+                expected_row_count: Some(2),
+                mismatched_row_count: Some(2),
+                missing_row_count: Some(1),
                 error: coded(Some("X506"), "mismatch", Some("look")),
             },
             ExpectedRow {
                 model_name: "dim_customers".to_owned(),
-                actual_row_count: 1,
-                expected_row_count: 1,
+                actual_row_count: Some(1),
+                expected_row_count: Some(1),
                 ..ExpectedRow::default()
             },
         ],
@@ -92,14 +93,14 @@ pub(super) fn failing_result_row() -> ScenarioResultRow {
             AssertionRow {
                 name: "no_negative".to_owned(),
                 failed: true,
-                failing_row_count: 1,
+                failing_row_count: Some(1),
                 first_sample: Some("(1, 'a', None)".to_owned()),
                 error: None,
             },
             AssertionRow {
                 name: "few".to_owned(),
                 failed: true,
-                failing_row_count: 3,
+                failing_row_count: Some(3),
                 first_sample: None,
                 error: coded(None, "plain error", None),
             },

{sqlbuild_cli-0.158.1 → sqlbuild_cli-0.158.2}/crates/sqlbuild-core/src/scenario_command/tests/test_scenario_rows.rs

@@ -7,7 +7,7 @@ use crate::scenario_command::main::render_capture_result::render_capture_result;
 use crate::scenario_command::main::render_scenario_result::render_scenario_result;
 use crate::scenario_command::main::render_snapshot_sync_result::render_snapshot_sync_result;
 use crate::scenario_command::models::{
-    CaptureRow, ExpectedRow, FixtureStatements, FunctionStatements, LoadedRelation,
+    AssertionRow, CaptureRow, ExpectedRow, FixtureStatements, FunctionStatements, LoadedRelation,
     LocalRuntimeInputs, ModelArtifactEntry, NamedStatements, RetainedInputs, ScenarioResultRow,
     WarehouseRuntimeInputs,
 };
@@ -19,11 +19,12 @@ use crate::scenario_command::tests::test_types::{
     CaptureRowTestCase, LocalArtifactsTestCase, ResultRowTestCase, WarehouseArtifactsTestCase,
 };
 
-const RA0: &str = "orders_paid                                                      FAIL  1.23s\n    error[X506]: expected comparison failed\n    second line\n      = help: Compare the CTE.\n    expect    expected fact_orders                               FAIL  2 mismatched\n              error[X506]: mismatch\n  = help: look\n    expect    expected dim_customers                             PASS\n    expect    assertion no_negative                              FAIL  1 row\n    expect    assertion few                                      FAIL  3 rows\n              plain error\n    expect    assertion ok                                       PASS\n    Retained relations:\n      source raw_orders -> main.__sqb_abc__source__raw_orders\n      model  fact_orders -> main.__sqb_abc__model__fact_orders\n    expected fact_orders: actual=3 expected=2 mismatched=2\n    assertion no_negative: failing_rows=1\n    sample: (1, 'a', None)\n    assertion few: failing_rows=3\n";
-const RA1: &str = "orders_paid                                                      \u{1b}[38;5;167mFAIL\u{1b}[0m  1.23s\n    \u{1b}[38;5;167m\u{1b}[1merror[X506]:\u{1b}[0m expected comparison failed\n    \u{1b}[2msecond line\u{1b}[0m\n      \u{1b}[2m= help:\u{1b}[0m Compare the CTE.\n    expect    expected fact_orders                               \u{1b}[38;5;167mFAIL\u{1b}[0m  2 mismatched\n              \u{1b}[38;5;167m\u{1b}[1merror[X506]:\u{1b}[0m mismatch\n  \u{1b}[2m= help:\u{1b}[0m look\n    expect    expected dim_customers                             \u{1b}[32mPASS\u{1b}[0m\n    expect    assertion no_negative                              \u{1b}[38;5;167mFAIL\u{1b}[0m  1 row\n    expect    assertion few                                      \u{1b}[38;5;167mFAIL\u{1b}[0m  3 rows\n              plain error\n    expect    assertion ok                                       \u{1b}[32mPASS\u{1b}[0m\n    Retained relations:\n      source raw_orders -> main.__sqb_abc__source__raw_orders\n      model  fact_orders -> main.__sqb_abc__model__fact_orders\n    expected fact_orders: actual=3 expected=2 mismatched=2\n    assertion no_negative: failing_rows=1\n    sample: (1, 'a', None)\n    assertion few: failing_rows=3\n";
+const RA0: &str = "orders_paid                                                      FAIL  1.23s\n    error[X506]: expected comparison failed\n    second line\n      = help: Compare the CTE.\n    expect    expected fact_orders                               FAIL  2 mismatched, 1 missing\n              error[X506]: mismatch\n  = help: look\n    expect    expected dim_customers                             PASS\n    expect    assertion no_negative                              FAIL  1 row\n    expect    assertion few                                      FAIL  3 rows\n              plain error\n    expect    assertion ok                                       PASS\n    Retained relations:\n      source raw_orders -> main.__sqb_abc__source__raw_orders\n      model  fact_orders -> main.__sqb_abc__model__fact_orders\n    expected fact_orders: actual=3 expected=2 mismatched=2 missing=1\n    assertion no_negative: failing_rows=1\n    sample: (1, 'a', None)\n    assertion few: failing_rows=3\n";
+const RA1: &str = "orders_paid                                                      \u{1b}[38;5;167mFAIL\u{1b}[0m  1.23s\n    \u{1b}[38;5;167m\u{1b}[1merror[X506]:\u{1b}[0m expected comparison failed\n    \u{1b}[2msecond line\u{1b}[0m\n      \u{1b}[2m= help:\u{1b}[0m Compare the CTE.\n    expect    expected fact_orders                               \u{1b}[38;5;167mFAIL\u{1b}[0m  2 mismatched, 1 missing\n              \u{1b}[38;5;167m\u{1b}[1merror[X506]:\u{1b}[0m mismatch\n  \u{1b}[2m= help:\u{1b}[0m look\n    expect    expected dim_customers                             \u{1b}[32mPASS\u{1b}[0m\n    expect    assertion no_negative                              \u{1b}[38;5;167mFAIL\u{1b}[0m  1 row\n    expect    assertion few                                      \u{1b}[38;5;167mFAIL\u{1b}[0m  3 rows\n              plain error\n    expect    assertion ok                                       \u{1b}[32mPASS\u{1b}[0m\n    Retained relations:\n      source raw_orders -> main.__sqb_abc__source__raw_orders\n      model  fact_orders -> main.__sqb_abc__model__fact_orders\n    expected fact_orders: actual=3 expected=2 mismatched=2 missing=1\n    assertion no_negative: failing_rows=1\n    sample: (1, 'a', None)\n    assertion few: failing_rows=3\n";
 const RB0: &str = "orders_local                                                     ERROR\n    snapshot missing\n    Retained local DuckDB: /work/target/run/scenarios/orders_local/local.duckdb\n";
 const RC0: &str = "orders_warehouse                                                 FAIL\n    boom\n    Rerun with --retain to inspect scenario-owned artifacts.\n";
 const RD1: &str = "orders_ok                                                        \u{1b}[32mPASS\u{1b}[0m  0.01s\n    expect    expected m                                         \u{1b}[32mPASS\u{1b}[0m\n";
+const RE0: &str = "orders_errored                                                   FAIL\n    expect    expected fact_orders                               ERROR\n              error[X504]: comparison failed to run\n    expect    assertion no_negative                              ERROR\n              error[X507]: assertion failed to run\n";
 const CE0: &str = "orders_paid                                                      PASS  2 relations, 3 rows\n    source   raw_orders                                          PASS  2 rows, 41 B\n    seed     countries                                           PASS  1 row, 1.5 KB\n    snapshot tests/_scenario_snapshots/orders_paid/scenario.json\n";
 const SE0R: &str = "orders_paid                                                      REFRESHED  2 relations, 3 rows\n    source   raw_orders                                          PASS  2 rows, 41 B\n    seed     countries                                           PASS  1 row, 1.5 KB\n    snapshot tests/_scenario_snapshots/orders_paid/scenario.json\n";
 const CF1: &str = "orders_big                                                       \u{1b}[38;5;167mFAIL\u{1b}[0m  0 relations, 0 rows\n    \u{1b}[38;5;167m\u{1b}[1merror[X512]:\u{1b}[0m too many rows\n      \u{1b}[2m= help:\u{1b}[0m narrow it\n    Rerun with --retain to inspect scenario-owned artifacts.\n    source   raw_orders                                          \u{1b}[38;5;167mFAIL\u{1b}[0m  0 rows, 0 B\n    snapshot /elsewhere/scenario.json\n";
@@ -75,6 +76,28 @@ fn given_scenario_result_when_rendering_then_matches_result_row_layout() {
             use_color: false,
             expected_text: RC0,
         },
+        ResultRowTestCase {
+            description: "comparison that did not run shows its error without counts",
+            row: ScenarioResultRow {
+                name: "orders_errored".to_owned(),
+                status: "FAIL".to_owned(),
+                expected: vec![ExpectedRow {
+                    model_name: "fact_orders".to_owned(),
+                    failed: true,
+                    error: coded(Some("X504"), "comparison failed to run", None),
+                    ..ExpectedRow::default()
+                }],
+                assertions: vec![AssertionRow {
+                    name: "no_negative".to_owned(),
+                    failed: true,
+                    error: coded(Some("X507"), "assertion failed to run", None),
+                    ..AssertionRow::default()
+                }],
+                ..ScenarioResultRow::default()
+            },
+            use_color: false,
+            expected_text: RE0,
+        },
         ResultRowTestCase {
             description: "passing run rounds its duration",
             row: ScenarioResultRow {