resolve conflicts

Author: juleswritescode

.github/workflows/pull_request.yml

@@ -157,7 +157,10 @@ jobs:
       # running containers via `services` only works on linux
       # https://github.com/actions/runner/issues/1866
       - name: Setup postgres
+        id: postgres
         uses: ikalnytskyi/action-setup-postgres@v7
+      - name: Print Roles
+        run: psql ${{ steps.postgres.outputs.connection-uri }} -c "select rolname from pg_roles;"
       - name: Run tests
         run: cargo test --workspace
 

Cargo.lock

@@ -28,6 +28,7 @@ enumflags2               = "0.7.11"
 ignore                   = "0.4.23"
 indexmap                 = { version = "2.6.0", features = ["serde"] }
 insta                    = "1.31.0"
+oxc_resolver             = "1.12.0"
 pg_query                 = "6.1.0"
 proc-macro2              = "1.0.66"
 quote                    = "1.0.33"
@@ -38,6 +39,7 @@ schemars                 = { version = "0.8.22", features = ["indexmap2", "small
 serde                    = "1.0.195"
 serde_json               = "1.0.114"
 similar                  = "2.6.0"
+slotmap                  = "1.0.7"
 smallvec                 = { version = "1.13.2", features = ["union", "const_new", "serde"] }
 strum                    = { version = "0.27.1", features = ["derive"] }
 # this will use tokio if available, otherwise async-std

Cargo.toml

@@ -9,9 +9,9 @@ use bpaf::Bpaf;
 use pgt_configuration::{PartialConfiguration, partial_configuration};
 use pgt_console::Console;
 use pgt_fs::FileSystem;
+use pgt_workspace::PartialConfigurationExt;
 use pgt_workspace::configuration::{LoadedConfiguration, load_configuration};
-use pgt_workspace::settings::PartialConfigurationExt;
-use pgt_workspace::workspace::UpdateSettingsParams;
+use pgt_workspace::workspace::{RegisterProjectFolderParams, UpdateSettingsParams};
 use pgt_workspace::{DynRef, Workspace, WorkspaceError};
 use std::ffi::OsString;
 use std::path::PathBuf;
@@ -301,6 +301,10 @@ pub(crate) trait CommandRunner: Sized {
         let (vcs_base_path, gitignore_matches) =
             configuration.retrieve_gitignore_matches(fs, vcs_base_path.as_deref())?;
         let paths = self.get_files_to_process(fs, &configuration)?;
+        workspace.register_project_folder(RegisterProjectFolderParams {
+            path: fs.working_directory(),
+            set_as_current_workspace: true,
+        })?;
 
         workspace.update_settings(UpdateSettingsParams {
             workspace_directory: fs.working_directory(),

crates/pgt_cli/src/commands/mod.rs

@@ -455,7 +455,7 @@ mod test {
     fn termination_diagnostic_size() {
         assert_eq!(
             std::mem::size_of::<CliDiagnostic>(),
-            80,
+            96,
             "you successfully decreased the size of the diagnostic!"
         )
     }

crates/pgt_cli/src/diagnostics.rs

@@ -208,6 +208,17 @@ impl CompletionScore<'_> {
         }
     }
 
+    fn get_schema_name(&self) -> &str {
+        match self.data {
+            CompletionRelevanceData::Table(t) => t.name.as_str(),
+            CompletionRelevanceData::Function(f) => f.name.as_str(),
+            CompletionRelevanceData::Column(c) => c.name.as_str(),
+            CompletionRelevanceData::Schema(s) => s.name.as_str(),
+            CompletionRelevanceData::Policy(p) => p.name.as_str(),
+            CompletionRelevanceData::Role(r) => r.name.as_str(),
+        }
+    }
+
     fn get_schema_name(&self) -> Option<&str> {
         match self.data {
             CompletionRelevanceData::Function(f) => Some(f.schema.as_str()),

crates/pgt_completions/src/relevance/scoring.rs

@@ -16,6 +16,7 @@ biome_deserialize        = { workspace = true, features = ["schema"] }
 biome_deserialize_macros = { workspace = true }
 bpaf                     = { workspace = true }
 indexmap                 = { workspace = true }
+oxc_resolver             = { workspace = true }
 pgt_analyse              = { workspace = true }
 pgt_analyser             = { workspace = true }
 pgt_console              = { workspace = true }

crates/pgt_configuration/Cargo.toml

@@ -1,5 +1,7 @@
 use pgt_console::fmt::Display;
 use pgt_console::{MarkupBuf, markup};
+use pgt_diagnostics::adapters::ResolveError;
+
 use pgt_diagnostics::{Advices, Diagnostic, Error, LogCategory, MessageAndDescription, Visit};
 use serde::{Deserialize, Serialize};
 use std::fmt::{Debug, Formatter};
@@ -21,6 +23,12 @@ pub enum ConfigurationDiagnostic {
 
     /// Thrown when the pattern inside the `ignore` field errors
     InvalidIgnorePattern(InvalidIgnorePattern),
+
+    /// Thrown when there's something wrong with the files specified inside `"extends"`
+    CantLoadExtendFile(CantLoadExtendFile),
+
+    /// Thrown when a configuration file can't be resolved from `node_modules`
+    CantResolve(CantResolve),
 }
 
 impl ConfigurationDiagnostic {
@@ -72,6 +80,18 @@ impl ConfigurationDiagnostic {
             message: MessageAndDescription::from(markup! {{message}}.to_owned()),
         })
     }
+
+    pub fn cant_resolve(path: impl Display, source: oxc_resolver::ResolveError) -> Self {
+        Self::CantResolve(CantResolve {
+            message: MessageAndDescription::from(
+                markup! {
+                   "Failed to resolve the configuration from "{{path}}
+                }
+                .to_owned(),
+            ),
+            source: Some(Error::from(ResolveError::from(source))),
+        })
+    }
 }
 
 impl Debug for ConfigurationDiagnostic {
@@ -168,3 +188,36 @@ pub struct CantResolve {
     #[source]
     source: Option<Error>,
 }
+
+#[derive(Debug, Serialize, Deserialize, Diagnostic)]
+#[diagnostic(
+	category = "configuration",
+	severity = Error,
+)]
+pub struct CantLoadExtendFile {
+    #[location(resource)]
+    file_path: String,
+    #[message]
+    #[description]
+    message: MessageAndDescription,
+
+    #[verbose_advice]
+    verbose_advice: ConfigurationAdvices,
+}
+
+impl CantLoadExtendFile {
+    pub fn new(file_path: impl Into<String>, message: impl Display) -> Self {
+        Self {
+            file_path: file_path.into(),
+            message: MessageAndDescription::from(markup! {{message}}.to_owned()),
+            verbose_advice: ConfigurationAdvices::default(),
+        }
+    }
+
+    pub fn with_verbose_advice(mut self, messsage: impl Display) -> Self {
+        self.verbose_advice
+            .messages
+            .push(markup! {{messsage}}.to_owned());
+        self
+    }
+}

crates/pgt_configuration/src/diagnostics.rs

@@ -22,6 +22,7 @@ pub use analyser::{
     RulePlainConfiguration, RuleSelector, RuleWithFixOptions, RuleWithOptions, Rules,
     partial_linter_configuration,
 };
+use biome_deserialize::StringSet;
 use biome_deserialize_macros::{Merge, Partial};
 use bpaf::Bpaf;
 use database::{
@@ -50,6 +51,10 @@ pub struct Configuration {
     #[partial(bpaf(hide))]
     pub schema: String,
 
+    /// A list of paths to other JSON files, used to extends the current configuration.
+    #[partial(bpaf(hide))]
+    pub extends: StringSet,
+
     /// The configuration of the VCS integration
     #[partial(type, bpaf(external(partial_vcs_configuration), optional, hide_usage))]
     pub vcs: VcsConfiguration,
@@ -85,6 +90,7 @@ impl PartialConfiguration {
     pub fn init() -> Self {
         Self {
             schema: Some(format!("https://pgtools.dev/schemas/{VERSION}/schema.json")),
+            extends: Some(StringSet::default()),
             files: Some(PartialFilesConfiguration {
                 ignore: Some(Default::default()),
                 ..Default::default()

crates/pgt_configuration/src/lib.rs

@@ -15,6 +15,7 @@ version              = "0.0.0"
 backtrace                  = "0.3.74"
 bpaf                       = { workspace = true }
 enumflags2                 = { workspace = true }
+oxc_resolver               = { workspace = true }
 pgt_console                = { workspace = true, features = ["serde"] }
 pgt_diagnostics_categories = { workspace = true, features = ["serde"] }
 pgt_diagnostics_macros     = { workspace = true }