ok

Author: juleswritescode

crates/pgt_schema_cache/src/columns.rs

@@ -126,7 +126,7 @@ mod tests {
         let public_schema_columns = cache
             .columns
             .iter()
-            .filter(|c| c.schema_name.as_str() == "public")
+            .filter(|c| c.schema_name.as_str() == "public" && !c.table_name.contains("migrations"))
             .count();
 
         assert_eq!(public_schema_columns, 4);

crates/pgt_schema_cache/src/policies.rs

@@ -80,28 +80,13 @@ impl SchemaCacheItem for Policy {
 
 #[cfg(test)]
 mod tests {
-    use pgt_test_utils::test_database::{RoleWithArgs, get_new_test_db};
 
-    use crate::{SchemaCache, policies::PolicyCommand};
-
-    #[tokio::test]
-    async fn loads_policies() {
-        let mut test_db = get_new_test_db().await;
+    use sqlx::{Executor, PgPool};
 
-        test_db
-            .setup_roles(vec![
-                RoleWithArgs {
-                    role: "admin".into(),
-                    args: vec![],
-                },
-                RoleWithArgs {
-                    role: "owner".into(),
-                    args: vec![],
-                },
-            ])
-            .await
-            .expect("Unable to setup admin roles");
+    use crate::{SchemaCache, policies::PolicyCommand};
 
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn loads_policies(test_db: PgPool) {
         let setup = r#"
             create table public.users (
                 id serial primary key,

crates/pgt_schema_cache/src/roles.rs

@@ -21,36 +21,12 @@ impl SchemaCacheItem for Role {
 
 #[cfg(test)]
 mod tests {
-    use crate::SchemaCache;
-    use pgt_test_utils::test_database::{RoleWithArgs, get_new_test_db};
-
-    #[tokio::test]
-    async fn loads_roles() {
-        let mut test_db = get_new_test_db().await;
+    use sqlx::PgPool;
 
-        test_db
-            .setup_roles(vec![
-                RoleWithArgs {
-                    role: "test_super".into(),
-                    args: vec![
-                        "superuser".into(),
-                        "createdb".into(),
-                        "login".into(),
-                        "bypassrls".into(),
-                    ],
-                },
-                RoleWithArgs {
-                    role: "test_nologin".into(),
-                    args: vec![],
-                },
-                RoleWithArgs {
-                    role: "test_login".into(),
-                    args: vec!["login".into()],
-                },
-            ])
-            .await
-            .expect("Unable to set up roles.");
+    use crate::SchemaCache;
 
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn loads_roles(test_db: PgPool) {
         let cache = SchemaCache::load(&test_db)
             .await
             .expect("Failed to load Schema Cache");

crates/pgt_schema_cache/src/schema_cache.rs

@@ -93,14 +93,12 @@ pub trait SchemaCacheItem {
 
 #[cfg(test)]
 mod tests {
-    use pgt_test_utils::test_database::get_new_test_db;
+    use sqlx::PgPool;
 
     use crate::SchemaCache;
 
-    #[tokio::test]
-    async fn it_loads() {
-        let test_db = get_new_test_db().await;
-
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn it_loads(test_db: PgPool) {
         SchemaCache::load(&test_db)
             .await
             .expect("Couldnt' load Schema Cache");

crates/pgt_schema_cache/src/tables.rs

@@ -79,13 +79,12 @@ impl SchemaCacheItem for Table {
 
 #[cfg(test)]
 mod tests {
-    use crate::{SchemaCache, tables::TableKind};
-    use pgt_test_utils::test_database::get_new_test_db;
+    use sqlx::{Executor, PgPool};
 
-    #[tokio::test]
-    async fn includes_views_in_query() {
-        let test_db = get_new_test_db().await;
+    use crate::{SchemaCache, tables::TableKind};
 
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn includes_views_in_query(test_db: PgPool) {
         let setup = r#"
             create table public.base_table (
                 id serial primary key,
@@ -115,10 +114,8 @@ mod tests {
         assert_eq!(view.schema, "public");
     }
 
-    #[tokio::test]
-    async fn includes_materialized_views_in_query() {
-        let test_db = get_new_test_db().await;
-
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn includes_materialized_views_in_query(test_db: PgPool) {
         let setup = r#"
             create table public.base_table (
                 id serial primary key,

crates/pgt_schema_cache/src/triggers.rs

@@ -126,17 +126,16 @@ impl SchemaCacheItem for Trigger {
 
 #[cfg(test)]
 mod tests {
-    use pgt_test_utils::test_database::get_new_test_db;
+
+    use sqlx::{Executor, PgPool};
 
     use crate::{
         SchemaCache,
         triggers::{TriggerAffected, TriggerEvent, TriggerTiming},
     };
 
-    #[tokio::test]
-    async fn loads_triggers() {
-        let test_db = get_new_test_db().await;
-
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn loads_triggers(test_db: PgPool) {
         let setup = r#"
                 create table public.users (
                     id serial primary key,
@@ -218,10 +217,8 @@ mod tests {
         assert_eq!(delete_trigger.proc_name, "log_user_insert");
     }
 
-    #[tokio::test]
-    async fn loads_instead_and_truncate_triggers() {
-        let test_db = get_new_test_db().await;
-
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn loads_instead_and_truncate_triggers(test_db: PgPool) {
         let setup = r#"
         create table public.docs (
             id serial primary key,

crates/pgt_typecheck/src/typed_identifier.rs

@@ -231,10 +231,10 @@ fn resolve_type<'a>(
 
 #[cfg(test)]
 mod tests {
-    use pgt_test_utils::test_database::get_new_test_db;
+    use sqlx::{Executor, PgPool};
 
-    #[tokio::test]
-    async fn test_apply_identifiers() {
+    #[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+    async fn test_apply_identifiers(test_db: PgPool) {
         let input = "select v_test + fn_name.custom_type.v_test2 + $3 + custom_type.v_test3 + fn_name.v_test2 + enum_type";
 
         let identifiers = vec![
@@ -294,8 +294,6 @@ mod tests {
             },
         ];
 
-        let test_db = get_new_test_db().await;
-
         let setup = r#"
             CREATE TYPE "public"."custom_type" AS (
                 v_test2 integer,

crates/pgt_typecheck/tests/diagnostics.rs

@@ -3,12 +3,10 @@ use pgt_console::{
     markup,
 };
 use pgt_diagnostics::PrintDiagnostic;
-use pgt_test_utils::test_database::get_new_test_db;
 use pgt_typecheck::{TypecheckParams, check_sql};
+use sqlx::{Executor, PgPool};
 
-async fn test(name: &str, query: &str, setup: Option<&str>) {
-    let test_db = get_new_test_db().await;
-
+async fn test(name: &str, query: &str, setup: Option<&str>, test_db: &PgPool) {
     if let Some(setup) = setup {
         test_db
             .execute(setup)
@@ -57,8 +55,8 @@ async fn test(name: &str, query: &str, setup: Option<&str>) {
     });
 }
 
-#[tokio::test]
-async fn invalid_column() {
+#[sqlx::test(migrator = "pgt_test_utils::MIGRATIONS")]
+async fn invalid_column(pool: PgPool) {
     test(
         "invalid_column",
         "select id, unknown from contacts;",
@@ -72,6 +70,7 @@ async fn invalid_column() {
         );
     "#,
         ),
+        &pool,
     )
     .await;
 }