fixed the issue

Author: juleswritescode

crates/pg_lsp/src/client/client_config_opts.rs

@@ -1,7 +1,25 @@
 use serde::Deserialize;
 
-// TODO: Check that the Opts are correct (existed in server.rs)
 #[derive(Deserialize, Debug)]
 pub struct ClientConfigurationOptions {
-    pub db_connection_string: Option<String>,
+    #[serde(rename(deserialize = "databaseUrl"))]
+    pub(crate) db_connection_string: Option<String>,
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use crate::client::client_config_opts::ClientConfigurationOptions;
+
+    #[test]
+    fn test_json_parsing() {
+        let config = json!({
+            "databaseUrl": "cool-shit"
+        });
+
+        let parsed: ClientConfigurationOptions = serde_json::from_value(config).unwrap();
+
+        assert_eq!(parsed.db_connection_string, Some("cool-shit".into()));
+    }
 }

crates/pg_lsp/src/db_connection.rs

@@ -13,14 +13,20 @@ pub(crate) struct DbConnection {
 }
 
 impl DbConnection {
+    #[tracing::instrument(name = "Setting up new Database Connection…", skip(ide))]
     pub(crate) async fn new(
         connection_string: String,
         ide: Arc<RwLock<Workspace>>,
     ) -> Result<Self, sqlx::Error> {
+        tracing::info!("Trying to connect to pool…");
         let pool = PgPool::connect(&connection_string).await?;
+        tracing::info!("Connected to Pool.");
 
         let mut listener = PgListener::connect_with(&pool).await?;
+        tracing::info!("Connected to Listener.");
+
         listener.listen_all(["postgres_lsp", "pgrst"]).await?;
+        tracing::info!("Listening!");
 
         let (close_tx, close_rx) = tokio::sync::oneshot::channel::<()>();
 
@@ -52,6 +58,7 @@ impl DbConnection {
                 }
             }
         });
+        tracing::info!("Set up schema update handle.");
 
         Ok(Self {
             pool,

crates/pg_lsp/src/server.rs

@@ -1,4 +1,3 @@
-use std::fmt::format;
 use std::sync::Arc;
 
 use notification::ShowMessage;
@@ -126,10 +125,10 @@ impl LspServer {
             Ok(()) => {}
             Err(e) => {
                 self.client
-                    .send_notification::<ShowMessage>(ShowMessageParams {
-                        typ: MessageType::ERROR,
-                        message: format!("Unable to process config received from client: {e:?}"),
-                    })
+                    .log_message(
+                        MessageType::ERROR,
+                        format!("Unable to process config from client: {e:?}"),
+                    )
                     .await
             }
         };

crates/pg_lsp/src/session.rs

@@ -56,17 +56,20 @@ impl Session {
             return Ok(());
         }
 
+        tracing::info!("Setting up new Database connection");
         let new_db = DbConnection::new(connection_string, Arc::clone(&self.ide)).await?;
+        tracing::info!("Set up new connection, trying to acquire write lock…");
 
         let mut current_db = self.db.write().await;
         let old_db = current_db.replace(new_db);
-        drop(current_db);
 
         if old_db.is_some() {
+            tracing::info!("Dropping previous Database Connection.");
             let old_db = old_db.unwrap();
             old_db.close().await;
         }
 
+        tracing::info!("Successfully set up new connection.");
         Ok(())
     }
 

docker-compose.yml

@@ -1,6 +1,7 @@
 version: "3.8"
 services:
   db:
+    # postgres://postgres:[email protected]:5432/postgres
     image: postgres
     restart: always
     environment: