From 47fe86c21e1eb6545d3fab664f99af9202a10f3b Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Wed, 24 May 2023 14:57:06 +0200
Subject: [PATCH] Use DB transactions

---
 src/Jobs/CreatePostgresUserForTenant.php |  4 +-
 tests/PostgresTest.php                   | 54 ++++++++++++------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Jobs/CreatePostgresUserForTenant.php b/src/Jobs/CreatePostgresUserForTenant.php
index 371a9053..9cc8cdb6 100644
--- a/src/Jobs/CreatePostgresUserForTenant.php
+++ b/src/Jobs/CreatePostgresUserForTenant.php
@@ -39,9 +39,7 @@ class CreatePostgresUserForTenant implements ShouldQueue
 
         // Create the user only if it doesn't already exist
         if (! count(DB::select("SELECT usename FROM pg_user WHERE usename = '$name';")) > 0) {
-            DB::transaction(function () use ($name, $password) {
-                DB::statement("CREATE USER \"$name\" LOGIN PASSWORD '$password';");
-            });
+            DB::transaction(fn () => DB::statement("CREATE USER \"$name\" LOGIN PASSWORD '$password';"));
         }
 
         $this->grantPermissions((string) $name);
diff --git a/tests/PostgresTest.php b/tests/PostgresTest.php
index e48f6ba3..0a517e27 100644
--- a/tests/PostgresTest.php
+++ b/tests/PostgresTest.php
@@ -42,37 +42,39 @@ beforeEach(function () {
     $tenantTable = $tenantModel->getTable();
 
     // Drop all existing policies
-    foreach (DB::select('select * from pg_policies') as $policy) {
-        DB::statement("DROP POLICY IF EXISTS {$policy->policyname} ON {$policy->tablename}");
-    }
+    DB::transaction(function () use ($tenantTable, $primaryModel, $secondaryModel) {
+        foreach (DB::select('select * from pg_policies') as $policy) {
+            DB::statement("DROP POLICY IF EXISTS {$policy->policyname} ON {$policy->tablename}");
+        }
 
-    Schema::dropIfExists('domains');
-    DB::statement("DROP TABLE IF EXISTS {$secondaryModel->getTable()} CASCADE");
-    DB::statement("DROP TABLE IF EXISTS {$primaryModel->getTable()} CASCADE");
-    DB::statement("DROP TABLE IF EXISTS $tenantTable CASCADE");
+        Schema::dropIfExists('domains');
+        DB::statement("DROP TABLE IF EXISTS {$secondaryModel->getTable()} CASCADE");
+        DB::statement("DROP TABLE IF EXISTS {$primaryModel->getTable()} CASCADE");
+        DB::statement("DROP TABLE IF EXISTS $tenantTable CASCADE");
 
-    Schema::create($tenantTable, function (Blueprint $table) {
-        $table->string('id')->primary();
-        $table->timestamps();
-        $table->json('data')->nullable();
-    });
+        Schema::create($tenantTable, function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->timestamps();
+            $table->json('data')->nullable();
+        });
 
-    Schema::create($primaryModel->getTable(), function (Blueprint $table) {
-        $table->id();
-        $table->string('text');
-        $table->string($tenantKeyColumn = config('tenancy.models.tenant_key_column'));
+        Schema::create($primaryModel->getTable(), function (Blueprint $table) {
+            $table->id();
+            $table->string('text');
+            $table->string($tenantKeyColumn = config('tenancy.models.tenant_key_column'));
 
-        $table->timestamps();
-        $table->foreign($tenantKeyColumn)->references(tenancy()->model()->getKeyName())->on(tenancy()->model()->getTable())->onUpdate('cascade')->onDelete('cascade');
-    });
+            $table->timestamps();
+            $table->foreign($tenantKeyColumn)->references(tenancy()->model()->getKeyName())->on(tenancy()->model()->getTable())->onUpdate('cascade')->onDelete('cascade');
+        });
 
-    Schema::create($secondaryModel->getTable(), function (Blueprint $table) use ($primaryModel) {
-        $table->id();
-        $table->string('text');
-        $table->unsignedBigInteger($primaryModel->getForeignKey());
+        Schema::create($secondaryModel->getTable(), function (Blueprint $table) use ($primaryModel) {
+            $table->id();
+            $table->string('text');
+            $table->unsignedBigInteger($primaryModel->getForeignKey());
 
-        $table->timestamps();
-        $table->foreign($primaryModel->getForeignKey())->references($primaryModel->getKeyName())->on($primaryModel->getTable())->onUpdate('cascade')->onDelete('cascade');
+            $table->timestamps();
+            $table->foreign($primaryModel->getForeignKey())->references($primaryModel->getKeyName())->on($primaryModel->getTable())->onUpdate('cascade')->onDelete('cascade');
+        });
     });
 });
 
@@ -112,7 +114,7 @@ test('correct rls policies get created', function () {
 
     // Drop all existing policies to check if the command creates policies for multiple tables
     foreach ($getRlsPolicies() as $policy) {
-        DB::statement("DROP POLICY IF EXISTS {$policy->policyname} ON {$policy->tablename}");
+        DB::transaction(fn () => DB::statement("DROP POLICY IF EXISTS {$policy->policyname} ON {$policy->tablename}"));
     }
 
     expect($getRlsPolicies())->toHaveCount(0);