From 61410b52d44e4b3e2a1872d431b41bc86b6d5450 Mon Sep 17 00:00:00 2001
From: Dmitry Maranik <40249835+dmitrymaranik@users.noreply.github.com>
Date: Fri, 3 Jul 2026 19:36:14 -0700
Subject: [PATCH] perf(rls): wrap current_setting() in the generated tenant
 policy for per-statement eval

---
 tests/RLS/TableManagerTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/RLS/TableManagerTest.php b/tests/RLS/TableManagerTest.php
index c5c8d254..a1592f6f 100644
--- a/tests/RLS/TableManagerTest.php
+++ b/tests/RLS/TableManagerTest.php
@@ -582,7 +582,7 @@ test('table rls manager generates queries correctly', function() {
     expect(array_values(app(TableRLSManager::class)->generateQueries()))->toEqualCanonicalizing([
         <<<SQL
         CREATE POLICY authors_rls_policy ON authors USING (
-            tenant_id::text = current_setting('my.current_tenant')
+            tenant_id::text = (select current_setting('my.current_tenant'))
         );
         SQL,
         <<<SQL
@@ -590,7 +590,7 @@ test('table rls manager generates queries correctly', function() {
             author_id IN (
                 SELECT id
                 FROM authors
-                WHERE tenant_id::text = current_setting('my.current_tenant')
+                WHERE tenant_id::text = (select current_setting('my.current_tenant'))
             )
         );
         SQL,
@@ -602,7 +602,7 @@ test('table rls manager generates queries correctly', function() {
                 WHERE author_id IN (
                     SELECT id
                     FROM authors
-                    WHERE tenant_id::text = current_setting('my.current_tenant')
+                    WHERE tenant_id::text = (select current_setting('my.current_tenant'))
                 )
             )
         );
@@ -652,7 +652,7 @@ test('table rls manager generates queries correctly', function() {
     expect(app(TableRLSManager::class)->generateQueries($paths))->toContain(
         <<<SQL
         CREATE POLICY primaries_rls_policy ON primaries USING (
-            tenant_id::text = current_setting('my.current_tenant')
+            tenant_id::text = (select current_setting('my.current_tenant'))
         );
         SQL,
         <<<SQL
@@ -660,7 +660,7 @@ test('table rls manager generates queries correctly', function() {
             primary_id IN (
                 SELECT id
                 FROM primaries
-                WHERE tenant_id::text = current_setting('my.current_tenant')
+                WHERE tenant_id::text = (select current_setting('my.current_tenant'))
             )
         );
         SQL,
@@ -672,7 +672,7 @@ test('table rls manager generates queries correctly', function() {
                 WHERE primary_id IN (
                     SELECT id
                     FROM primaries
-                    WHERE tenant_id::text = current_setting('my.current_tenant')
+                    WHERE tenant_id::text = (select current_setting('my.current_tenant'))
                 )
             )
         );