skip db checks via flag

Author: juleswritescode

crates/pg_cli/src/cli_options.rs

@@ -18,6 +18,10 @@ pub struct CliOptions {
     #[bpaf(long("use-server"), switch, fallback(false))]
     pub use_server: bool,
 
+    /// Skip over files containing syntax errors instead of emitting an error diagnostic.
+    #[bpaf(long("skip-db"), switch, fallback(false))]
+    pub skip_db: bool,
+
     /// Print additional diagnostics, and some diagnostics show more information. Also, print out what files were processed and which ones were modified.
     #[bpaf(long("verbose"), switch, fallback(false))]
     pub verbose: bool,

crates/pg_cli/src/commands/mod.rs

@@ -35,8 +35,10 @@ pub enum PgLspCommand {
     Check {
         #[bpaf(external(partial_configuration), hide_usage, optional)]
         configuration: Option<PartialConfiguration>,
+
         #[bpaf(external, hide_usage)]
         cli_options: CliOptions,
+
         /// Use this option when you want to format code piped from `stdin`, and print the output to `stdout`.
         ///
         /// The file doesn't need to exist on disk, what matters is the extension of the file. Based on the extension, we know how to check the code.
@@ -286,6 +288,7 @@ pub(crate) trait CommandRunner: Sized {
             configuration,
             vcs_base_path,
             gitignore_matches,
+            skip_db: cli_options.skip_db,
         })?;
 
         let execution = self.get_execution(cli_options, console, workspace)?;

crates/pg_cli/src/execute/process_file/check.rs

@@ -35,6 +35,7 @@ pub(crate) fn check_with_guard<'ctx>(
                     max_diagnostics,
                     only,
                     skip,
+                    true,
                 )
                 .with_file_path_and_code(
                     workspace_file.path.display().to_string(),

crates/pg_lsp/src/session.rs

@@ -464,6 +464,7 @@ impl Session {
                             configuration: fs_configuration,
                             vcs_base_path,
                             gitignore_matches,
+                            skip_db: false,
                         });
 
                         if let Err(error) = result {

crates/pg_workspace/src/workspace.rs

@@ -90,6 +90,7 @@ pub struct UpdateSettingsParams {
     pub vcs_base_path: Option<PathBuf>,
     pub gitignore_matches: Vec<String>,
     pub workspace_directory: Option<PathBuf>,
+    pub skip_db: bool,
 }
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]

crates/pg_workspace/src/workspace/server.rs

@@ -161,10 +161,12 @@ impl Workspace for WorkspaceServer {
 
         tracing::info!("Updated settings in workspace");
 
-        self.connection
-            .write()
-            .unwrap()
-            .set_conn_settings(&self.settings().as_ref().db);
+        if !params.skip_db {
+            self.connection
+                .write()
+                .unwrap()
+                .set_conn_settings(&self.settings().as_ref().db);
+        }
 
         tracing::info!("Updated Db connection settings");
 
@@ -298,10 +300,12 @@ impl Workspace for WorkspaceServer {
 
         let mut diagnostics: Vec<SDiagnostic> = vec![];
 
-        // run diagnostics for each statement in parallel if its mostly i/o work
-        if let Ok(connection) = self.connection.read() {
-            let pool = connection.get_pool();
-
+        if let Some(pool) = self
+            .connection
+            .read()
+            .expect("DbConnection RwLock panicked")
+            .get_pool()
+        {
             let typecheck_params: Vec<_> = doc
                 .iter_statements_with_text_and_range()
                 .map(|(stmt, range, text)| {
@@ -311,12 +315,12 @@ impl Workspace for WorkspaceServer {
                 })
                 .collect();
 
-            let pool_clone = pool.clone();
+            // run diagnostics for each statement in parallel if its mostly i/o work
             let path_clone = params.path.clone();
             let async_results = run_async(async move {
                 stream::iter(typecheck_params)
                     .map(|(text, ast, tree, range)| {
-                        let pool = pool_clone.clone();
+                        let pool = pool.clone();
                         let path = path_clone.clone();
                         async move {
                             if let Some(ast) = ast {
@@ -412,6 +416,11 @@ impl Workspace for WorkspaceServer {
             &params.position
         );
 
+        let pool = match self.connection.read().unwrap().get_pool() {
+            Some(pool) => pool,
+            None => return Ok(pg_completions::CompletionResult::default()),
+        };
+
         let doc = self
             .documents
             .get(&params.path)
@@ -439,7 +448,6 @@ impl Workspace for WorkspaceServer {
 
         tracing::debug!("Found the statement. We're looking for position {:?}. Statement Range {:?} to {:?}. Statement: {}", position, stmt_range.start(), stmt_range.end(), text);
 
-        let pool = self.connection.read().unwrap().get_pool();
         let schema_cache = self.schema_cache.load(pool)?;
 
         let result = pg_completions::complete(pg_completions::CompletionParams {

crates/pg_workspace/src/workspace/server/db_connection.rs

@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use sqlx::{pool::PoolOptions, postgres::PgConnectOptions, PgPool, Postgres};
 
 use crate::settings::DatabaseSettings;
@@ -8,11 +10,9 @@ pub struct DbConnection {
 }
 
 impl DbConnection {
-    /// Requires that you call `set_conn_settings` at least once before getting a pool.
-    pub(crate) fn get_pool(&self) -> PgPool {
-        self.pool
-            .clone()
-            .expect("The database has never been properly initialized.")
+    /// There might be no pool available if the user decides to skip db checks.
+    pub(crate) fn get_pool(&self) -> Option<PgPool> {
+        self.pool.clone()
     }
 
     pub(crate) fn set_conn_settings(&mut self, settings: &DatabaseSettings) {
@@ -27,6 +27,7 @@ impl DbConnection {
 
         let pool = PoolOptions::<Postgres>::new()
             .acquire_timeout(timeout)
+            .acquire_slow_threshold(Duration::from_secs(2))
             .connect_lazy_with(config);
 
         self.pool = Some(pool);