Merge branch 'main' into perf/unify-build-features

Author: kvlonge

crates/sqlbuild-cli/src/argv/command_table.json

@@ -2899,7 +2899,9 @@
         "nargs": 0,
         "const": true,
         "default": false,
-        "help": "disable SQL syntax, binding, type inference, and semantic validation",
+        "help": {
+         "suppress": true
+        },
         "group": 1
        },
        {

crates/sqlbuild-cli/src/argv/tests/test_parse_cli_arguments.rs

@@ -1,6 +1,6 @@
 use crate::argv::models::{ArgvOutcome, Value};
 use crate::argv::tests::helpers::{parse, strings};
-use crate::argv::tests::test_types::{ExitTestCase, ParsedValueTestCase};
+use crate::argv::tests::test_types::{ExitTestCase, HelpTextTestCase, ParsedValueTestCase};
 
 #[test]
 fn given_accepted_arguments_when_parsing_then_attributes_hold_the_parsed_values() {
@@ -29,6 +29,12 @@ fn given_accepted_arguments_when_parsing_then_attributes_hold_the_parsed_values(
             attribute: "dbt_args",
             expected_value: strings(&["--", "--no-color"]),
         },
+        ParsedValueTestCase {
+            description: "clone still accepts the hidden --no-sql-analysis flag",
+            argv: &["clone", "--from", "prod", "--no-sql-analysis"],
+            attribute: "no_sql_validation",
+            expected_value: Value::Bool(true),
+        },
         ParsedValueTestCase {
             description: "a nested sub-command's dest is set",
             argv: &["contract", "diff", "--from", "prod"],
@@ -100,3 +106,45 @@ fn given_help_version_or_rejected_arguments_when_parsing_then_exits_after_writin
         );
     }
 }
+
+#[test]
+fn given_command_help_when_parsing_then_hidden_options_are_left_out() {
+    let test_cases = [
+        HelpTextTestCase {
+            description: "clone help omits the no-op SQL analysis flag",
+            argv: &["clone", "--help"],
+            expected_present: &["--from FROM_TARGET", "--select"],
+            expected_absent: &["--no-sql-analysis", "--no-sql-validation"],
+        },
+        HelpTextTestCase {
+            description: "build help keeps the SQL analysis flag",
+            argv: &["build", "--help"],
+            expected_present: &["--no-sql-analysis"],
+            expected_absent: &[],
+        },
+    ];
+
+    for test_case in test_cases {
+        let outcome: ArgvOutcome = parse(test_case.argv);
+        let help: String = outcome
+            .writes
+            .iter()
+            .map(|(_, text)| text.as_str())
+            .collect();
+        let present: Vec<&str> = test_case
+            .expected_present
+            .iter()
+            .copied()
+            .filter(|fragment| help.contains(fragment))
+            .collect();
+        let absent: Vec<&str> = test_case
+            .expected_absent
+            .iter()
+            .copied()
+            .filter(|fragment| !help.contains(fragment))
+            .collect();
+        assert_eq!(outcome.parsed, Err(0), "{}", test_case.description);
+        assert_eq!(present, test_case.expected_present, "{help}");
+        assert_eq!(absent, test_case.expected_absent, "{help}");
+    }
+}

crates/sqlbuild-cli/src/argv/tests/test_types.rs

@@ -40,6 +40,14 @@ pub(super) struct ExitTestCase {
     pub(super) expected_last_write: &'static str,
 }
 
+/// A help request and fragments its text must and must not contain.
+pub(super) struct HelpTextTestCase {
+    pub(super) description: &'static str,
+    pub(super) argv: &'static [&'static str],
+    pub(super) expected_present: &'static [&'static str],
+    pub(super) expected_absent: &'static [&'static str],
+}
+
 /// Text, width and indent for `textwrap.wrap`, and the expected lines.
 pub(super) struct WrapTestCase {
     pub(super) description: &'static str,

crates/sqlbuild-core/src/clone_text/main/render_clone_completion.rs

@@ -42,7 +42,7 @@ pub fn render_clone_completion(
         label: "TOTAL".to_owned(),
         value: count(items, |_| true),
     });
-    let elapsed: Option<String> = elapsed_seconds.map(|seconds| format!("({seconds:.2}s)"));
+    let elapsed: Option<String> = elapsed_seconds.map(|seconds| format!("{seconds:.2}s"));
     let footer: String = format_summary_footer(style, &counts, elapsed.as_deref());
     let warnings: i64 = count(items, |item| item.status == CloneStatusKind::Warning);
     let failures: i64 = count(items, |item| item.status == CloneStatusKind::Failed);

crates/sqlbuild-core/src/clone_text/tests/test_clone_text.rs

@@ -149,12 +149,12 @@ fn given_items_when_completing_then_reports_messages_counts_and_exit_code() {
             expected_exit_code: 1,
         },
         CompletionTestCase {
-            description: "success shows the doubly parenthesised elapsed time",
+            description: "success shows the elapsed time in one pair of parentheses",
             items: vec![item("orders", "copied", CloneStatusKind::Success)],
             elapsed_seconds: Some(1.5),
             use_color: false,
             expected_text: "\n\u{2713} Completed successfully  CLONED=0  COPIED=1  RECREATED_VIEWS=0  \
-                RECREATED_FUNCTIONS=0  PASS=1  WARN=0  FAIL=0  TOTAL=1  ((1.50s))\n",
+                RECREATED_FUNCTIONS=0  PASS=1  WARN=0  FAIL=0  TOTAL=1  (1.50s)\n",
             expected_exit_code: 0,
         },
         CompletionTestCase {

crates/sqlbuild-core/src/diagnostic_routing/constants.rs

@@ -62,3 +62,5 @@ pub const LEVEL_INFO: i64 = 20;
 pub const LEVEL_WARNING: i64 = 30;
 pub const LEVEL_ERROR: i64 = 40;
 pub const LEVEL_CRITICAL: i64 = 50;
+/// Directories that hold installed packages, even inside a project (a project `.venv`).
+pub const PACKAGE_DIRECTORIES: [&str; 2] = ["site-packages", "dist-packages"];

crates/sqlbuild-core/src/diagnostic_routing/main/console_summary_line.rs

@@ -0,0 +1,7 @@
+//! `console_summary_line`: the one line a summarized console record shows.
+
+/// The first line of `message`, without trailing whitespace.
+#[must_use]
+pub fn console_summary_line(message: &str) -> &str {
+    message.lines().next().unwrap_or_default().trim_end()
+}

crates/sqlbuild-core/src/diagnostic_routing/main/mod.rs

@@ -1,5 +1,8 @@
 pub mod compute_log_admits;
+pub mod console_summary_line;
 pub mod diagnostic_severity;
 pub mod internal_logger;
+pub mod project_source_path;
 pub mod route_admits;
 pub mod sql_digest;
+pub mod third_party_console_form;

crates/sqlbuild-core/src/diagnostic_routing/main/project_source_path.rs

@@ -0,0 +1,18 @@
+//! `project_source_path`: whether a logging call came from the project's own Python.
+
+use std::path::{Component, Path};
+
+use crate::diagnostic_routing::constants::PACKAGE_DIRECTORIES;
+
+/// Whether `pathname` lies under one of `project_roots` and outside installed packages.
+#[must_use]
+pub fn project_source_path(pathname: &str, project_roots: &[String]) -> bool {
+    let path: &Path = Path::new(pathname);
+    project_roots
+        .iter()
+        .any(|root| !root.is_empty() && path.starts_with(root))
+        && !path.components().any(|component| {
+            matches!(component, Component::Normal(name)
+                if PACKAGE_DIRECTORIES.iter().any(|package| name == *package))
+        })
+}

crates/sqlbuild-core/src/diagnostic_routing/main/third_party_console_form.rs

@@ -0,0 +1,16 @@
+//! `third_party_console_form`: how a non-debug console shows a third-party record.
+
+use crate::diagnostic_routing::constants::{LEVEL_ERROR, LEVEL_WARNING};
+use crate::diagnostic_routing::models::ThirdPartyConsoleForm;
+
+/// Errors in full, warnings as one line, and nothing below warning.
+#[must_use]
+pub fn third_party_console_form(level: i64) -> ThirdPartyConsoleForm {
+    if level >= LEVEL_ERROR {
+        ThirdPartyConsoleForm::Full
+    } else if level >= LEVEL_WARNING {
+        ThirdPartyConsoleForm::Summary
+    } else {
+        ThirdPartyConsoleForm::Hidden
+    }
+}