add rest

Author: juleswritescode

Cargo.lock

@@ -9,12 +9,15 @@ resolver = "2"
 [workspace.package]
 rust-version = "1.71"
 
+
+
 [workspace.dependencies]
 # supporting crates unrelated to postgres
 line_index = { path = "./lib/line_index", version = "0.0.0" }
 tree_sitter_sql = { path = "./lib/tree_sitter_sql", version = "0.0.0" }
 tree-sitter = "0.20.10"
 tracing = "0.1.40"
+sqlx = { version = "0.8.2", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 
 # postgres specific crates
 pg_lexer = { path = "./crates/pg_lexer", version = "0.0.0" }
@@ -38,6 +41,7 @@ pg_lint = { path = "./crates/pg_lint", version = "0.0.0" }
 pg_workspace = { path = "./crates/pg_workspace", version = "0.0.0" }
 pg_lsp = { path = "./crates/lsp", version = "0.0.0" }
 
+pg_test_utils = { path = "./crates/pg_test_utils", version = "0.0.0" }
 # parser = { path = "./crates/parser", version = "0.0.0" }
 # sql_parser = { path = "./crates/sql_parser", version = "0.0.0" }
 # sql_parser_codegen = { path = "./crates/sql_parser_codegen", version = "0.0.0" }

Cargo.toml

@@ -5,11 +5,9 @@ edition = "2021"
 
 [dependencies]
 text-size = "1.1.1"
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 async-std = "1.12.0"
 anyhow = "1.0.62"
-
-[dev-dependencies]
+sqlx.workspace = true
 
 [lib]
 doctest = false

crates/pg_commands/Cargo.toml

@@ -11,7 +11,7 @@ pg_type_resolver.workspace = true
 pg_syntax.workspace = true
 tree-sitter.workspace = true
 tree_sitter_sql.workspace = true
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
+sqlx.workspace = true
 
 [dev-dependencies]
 async-std = "1.12.0"

crates/pg_inlay_hints/Cargo.toml

@@ -16,13 +16,13 @@ lsp-types = "0.95.0"
 serde = "1.0.195"
 serde_json = "1.0.114"
 anyhow = "1.0.81"
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 async-std = "1.12.0"
 threadpool = "1.8.1"
 dashmap = "5.5.3"
 text-size = "1.1.1"
 
 line_index.workspace = true
+sqlx.workspace = true
 
 pg_hover.workspace = true
 pg_fs.workspace = true

crates/pg_lsp/Cargo.toml

@@ -4,10 +4,11 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 async-std = { version = "1.12.0" }
 serde = "1.0.195"
 serde_json = "1.0.114"
 
+sqlx.workspace = true
+
 [lib]
 doctest = false

crates/pg_schema_cache/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "pg_test_utils"
+version = "0.1.0"
+edition = "2021"
+rust-version.workspace = true
+
+[dependencies]
+anyhow = "1.0.81"
+uuid = { version = "1.11.0", features = ["v4"] }
+
+sqlx.workspace = true

crates/pg_test_utils/Cargo.toml

@@ -0,0 +1 @@
+pub mod test_database;

crates/pg_test_utils/src/lib.rs

@@ -0,0 +1,31 @@
+use sqlx::{postgres::PgConnectOptions, Executor, PgPool};
+use uuid::Uuid;
+
+// TODO: Work with proper config objects instead of a connection_string.
+// With the current implementation, we can't parse the password from the connection string.
+pub async fn get_new_test_db(connection_string: String, database_password: String) -> PgPool {
+    let options_from_conn_str: PgConnectOptions = connection_string
+        .parse()
+        .expect("Invalid Connection String");
+
+    let options_without_db_name = PgConnectOptions::new()
+        .host(options_from_conn_str.get_host())
+        .port(options_from_conn_str.get_port())
+        .username(options_from_conn_str.get_username())
+        .password(&database_password);
+
+    let postgres = sqlx::PgPool::connect_with(options_without_db_name.clone())
+        .await
+        .expect("Unable to connect to test postgres instance");
+
+    let database_name = Uuid::new_v4().to_string();
+
+    postgres
+        .execute(format!(r#"create database "{}";"#, database_name).as_str())
+        .await
+        .expect("Failed to create test database.");
+
+    sqlx::PgPool::connect_with(options_without_db_name.database(&database_name))
+        .await
+        .expect("Could not connect to test database")
+}

crates/pg_test_utils/src/test_database.rs

@@ -8,9 +8,12 @@ pg_base_db.workspace = true
 pg_schema_cache.workspace = true
 pg_syntax.workspace = true
 pg_query_ext.workspace = true
+
+sqlx.workspace = true
+
 text-size = "1.1.1"
 async-std = "1.12.0"
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
+
 
 [dev-dependencies]
 

crates/pg_typecheck/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2021"
 text-size = "1.1.1"
 dashmap = "5.5.3"
 async-std = "1.12.0"
-sqlx = { version = "0.7.3", features = [ "runtime-async-std", "tls-rustls", "postgres", "json" ] }
 
 pg_base_db.workspace =  true
 pg_fs.workspace =  true
@@ -21,6 +20,7 @@ pg_schema_cache.workspace = true
 
 tree-sitter.workspace = true
 tree_sitter_sql.workspace = true
+sqlx.workspace = true
 
 [dev-dependencies]