feat(diagnostics): database object location

Author: psteinroe

crates/pgls_diagnostics/src/context.rs

@@ -458,6 +458,7 @@ mod internal {
                 resource: match loc.resource {
                     Some(Resource::Argv) => Some(Resource::Argv),
                     Some(Resource::Memory) => Some(Resource::Memory),
+                    Some(Resource::Database) => Some(Resource::Database),
                     Some(Resource::File(file)) => {
                         if let Some(Resource::File(path)) = &self.path {
                             Some(Resource::File(path.as_ref()))
@@ -468,6 +469,7 @@ mod internal {
                     None => self.path.as_ref().map(Resource::as_deref),
                 },
                 span: loc.span,
+                database_object: loc.database_object,
                 source_code: loc.source_code,
             }
         }
@@ -523,6 +525,7 @@ mod internal {
             Location {
                 resource: loc.resource,
                 span: self.span.or(loc.span),
+                database_object: loc.database_object,
                 source_code: loc.source_code,
             }
         }

crates/pgls_diagnostics/src/display.rs

@@ -790,6 +790,7 @@ mod tests {
             visitor.record_frame(Location {
                 resource: Some(Resource::File("other_path")),
                 span: Some(TextRange::new(TextSize::from(8), TextSize::from(16))),
+                database_object: None,
                 source_code: Some(SourceCode {
                     text: "context location context",
                     line_starts: None,

crates/pgls_diagnostics/src/location.rs

@@ -12,6 +12,8 @@ pub struct Location<'a> {
     /// An optional range of text within the resource associated with the
     /// diagnostic.
     pub span: Option<TextRange>,
+    /// An optional tuple identifying a database object
+    pub database_object: Option<(Option<&'a str>, &'a str)>,
     /// The optional source code of the resource.
     pub source_code: Option<BorrowedSourceCode<'a>>,
 }
@@ -23,6 +25,7 @@ impl<'a> Location<'a> {
             resource: None,
             span: None,
             source_code: None,
+            database_object: None,
         }
     }
 }
@@ -42,6 +45,8 @@ impl Eq for Location<'_> {}
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[serde(rename_all = "camelCase")]
 pub enum Resource<Path> {
+    /// The diagnostic is related to the database and its schema.
+    Database,
     /// The diagnostic is related to the content of the command line arguments.
     Argv,
     /// The diagnostic is related to the content of a memory buffer.
@@ -70,6 +75,7 @@ impl<P> Resource<P> {
         P: Deref,
     {
         match self {
+            Resource::Database => Resource::Database,
             Resource::Argv => Resource::Argv,
             Resource::Memory => Resource::Memory,
             Resource::File(file) => Resource::File(file),
@@ -81,6 +87,7 @@ impl Resource<&'_ str> {
     /// Converts a `Path<&str>` to `Path<String>`.
     pub fn to_owned(self) -> Resource<String> {
         match self {
+            Resource::Database => Resource::Database,
             Resource::Argv => Resource::Argv,
             Resource::Memory => Resource::Memory,
             Resource::File(file) => Resource::File(file.to_owned()),
@@ -194,6 +201,7 @@ pub struct LocationBuilder<'a> {
     resource: Option<Resource<&'a str>>,
     span: Option<TextRange>,
     source_code: Option<BorrowedSourceCode<'a>>,
+    database_object: Option<(Option<&'a str>, &'a str)>,
 }
 
 impl<'a> LocationBuilder<'a> {
@@ -212,11 +220,17 @@ impl<'a> LocationBuilder<'a> {
         self
     }
 
+    pub fn database_object<D: AsDatabaseObject>(mut self, database_object: &'a D) -> Self {
+        self.database_object = database_object.as_database_object();
+        self
+    }
+
     pub fn build(self) -> Location<'a> {
         Location {
             resource: self.resource,
             span: self.span,
             source_code: self.source_code,
+            database_object: self.database_object,
         }
     }
 }
@@ -342,6 +356,35 @@ impl AsSourceCode for String {
     }
 }
 
+/// Utility trait for types that can be converted into a database object reference
+pub trait AsDatabaseObject {
+    fn as_database_object(&self) -> Option<(Option<&'_ str>, &'_ str)>;
+}
+
+impl<T: AsDatabaseObject> AsDatabaseObject for Option<T> {
+    fn as_database_object(&self) -> Option<(Option<&'_ str>, &'_ str)> {
+        self.as_ref().and_then(T::as_database_object)
+    }
+}
+
+impl<T: AsDatabaseObject + ?Sized> AsDatabaseObject for &'_ T {
+    fn as_database_object(&self) -> Option<(Option<&'_ str>, &'_ str)> {
+        T::as_database_object(*self)
+    }
+}
+
+impl AsDatabaseObject for (Option<&str>, &str) {
+    fn as_database_object(&self) -> Option<(Option<&'_ str>, &'_ str)> {
+        Some((self.0, self.1))
+    }
+}
+
+impl AsDatabaseObject for (Option<String>, String) {
+    fn as_database_object(&self) -> Option<(Option<&'_ str>, &'_ str)> {
+        Some((self.0.as_deref(), self.1.as_str()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use pgls_text_size::TextSize;

crates/pgls_diagnostics/src/serde.rs

@@ -274,6 +274,7 @@ impl super::Advices for Advice {
             Advice::Frame(location) => visitor.record_frame(super::Location {
                 resource: location.path.as_ref().map(super::Resource::as_deref),
                 span: location.span,
+                database_object: None,
                 source_code: location.source_code.as_deref().map(|text| SourceCode {
                     text,
                     line_starts: None,

crates/pgls_diagnostics_macros/src/parse.rs

@@ -436,6 +436,7 @@ pub(crate) enum LocationField {
     Resource(Ident),
     Span(Ident),
     SourceCode(Ident),
+    DatabaseObject(Ident),
 }
 
 impl Parse for LocationAttr {
@@ -450,6 +451,8 @@ impl Parse for LocationAttr {
             LocationField::Span(ident)
         } else if ident == "source_code" {
             LocationField::SourceCode(ident)
+        } else if ident == "database_object" {
+            LocationField::DatabaseObject(ident)
         } else {
             return Err(Error::new_spanned(ident, "unknown location field"));
         };
@@ -467,6 +470,7 @@ impl ToTokens for LocationField {
             LocationField::Resource(ident) => ident.to_tokens(tokens),
             LocationField::Span(ident) => ident.to_tokens(tokens),
             LocationField::SourceCode(ident) => ident.to_tokens(tokens),
+            LocationField::DatabaseObject(ident) => ident.to_tokens(tokens),
         }
     }
 }