fixie fixie messagie

Author: juleswritescode

crates/pgt_typecheck/Cargo.toml

@@ -22,6 +22,7 @@ pgt_schema_cache.workspace = true
 pgt_text_size.workspace = true
 pgt_treesitter.workspace = true
 pgt_treesitter_grammar.workspace = true
+tracing.workspace = true
 regex = "1.11.1"
 sqlx.workspace = true
 tokio.workspace = true

crates/pgt_typecheck/src/diagnostics.rs

@@ -104,10 +104,10 @@ struct ErrorRewriteRule {
  rewrite: fn(&regex::Captures, &IdentifierReplacement) -> String,
 }
 
-static ERROR_RULES: Lazy<Vec<ErrorRewriteRule>> = Lazy::new(|| {
+static ERROR_REWRITE_RULES: Lazy<Vec<ErrorRewriteRule>> = Lazy::new(|| {
  vec![
  ErrorRewriteRule {
- pattern: Regex::new(r#"invalid input syntax for type (\w+): "([^"]*)""#).unwrap(),
+ pattern: Regex::new(r#"invalid input syntax for type ([\w\s]+): "([^"]*)""#).unwrap(),
  rewrite: |caps, replacement| {
  let expected_type = &caps[1];
  format!(
@@ -134,14 +134,16 @@ pub fn rewrite_error_message(
  pg_error_message: &str,
  replacement: &IdentifierReplacement,
 ) -> String {
- // try each rule
- for rule in ERROR_RULES.iter() {
+ tracing::debug!("Rewriting error message: {}", pg_error_message);
+ for rule in ERROR_REWRITE_RULES.iter() {
  if let Some(caps) = rule.pattern.captures(pg_error_message) {
  return (rule.rewrite)(&caps, replacement);
  }
  }
 
- // fallback: generic value replacement
+ // if we don't have a matching error-rewrite-rule,
+ // we'll fallback to replacing default values with their types,
+ // e.g. `""` is replaced with `text`.
  let unquoted_default = replacement.default_value.trim_matches('\'');
  pg_error_message
  .replace(&format!("\"{}\"", unquoted_default), &replacement.type_name)

crates/pgt_typecheck/src/lib.rs

@@ -48,6 +48,7 @@ pub async fn check_sql(
  // each typecheck operation.
  conn.close_on_drop();
 
+ tracing::debug!("replacing types with {:#?}", params.identifiers);
  let typed_replacement = apply_identifiers(
  params.identifiers,
  params.schema_cache,

crates/pgt_typecheck/tests/diagnostics.rs

@@ -208,3 +208,50 @@ async fn operator_does_not_exist(test_db: PgPool) {
  .test()
  .await;
 }
+
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn function_parameter_type_with_multiple_words(test_db: PgPool) {
+ // the type "timestamp with time zone" has multiple words
+ let setup = r#"
+ create table public.products (
+ id serial primary key,
+ released timestamp with time zone not null
+ );
+ "#;
+
+ TestSetup {
+ name: "testing_type_with_multiple_words",
+ setup: Some(setup),
+ query: r#"select * from public.products where released = pid;"#,
+ test_db: &test_db,
+ typed_identifiers: vec![TypedIdentifier {
+ path: "delete_product".to_string(),
+ name: Some("pid".to_string()),
+ type_: IdentifierType {
+ schema: None,
+ name: "uuid".to_string(),
+ is_array: false,
+ },
+ }],
+ }
+ .test()
+ .await;
+
+ TestSetup {
+ name: "testing_operator_type_with_multiple_words",
+ setup: None,
+ query: r#"delete from public.products where released > pid;"#,
+ test_db: &test_db,
+ typed_identifiers: vec![TypedIdentifier {
+ path: "delete_product".to_string(),
+ name: Some("pid".to_string()),
+ type_: IdentifierType {
+ schema: None,
+ name: "numeric".to_string(),
+ is_array: false,
+ },
+ }],
+ }
+ .test()
+ .await;
+}

crates/pgt_typecheck/tests/snapshots/testing_operator_type_with_multiple_words.snap.new

@@ -0,0 +1,8 @@
+---
+source: crates/pgt_typecheck/tests/diagnostics.rs
+assertion_line: 96
+expression: content
+---
+delete from public.products where ~~~released > pid~~~;
+
+operator does not exist: timestamp with time zone > integer

crates/pgt_typecheck/tests/snapshots/testing_type_with_multiple_words.snap

@@ -0,0 +1,7 @@
+---
+source: crates/pgt_typecheck/tests/diagnostics.rs
+expression: content
+---
+select * from public.products where released = ~~~pid~~~;
+
+`pid` is of type uuid, not timestamp with time zone