From 1845b441a66d66eb3bbe6159a355553e9d07bd71 Mon Sep 17 00:00:00 2001
From: 7ttp <117663341+7ttp@users.noreply.github.com>
Date: Mon, 11 May 2026 02:29:37 +0530
Subject: [PATCH] fix(postgrest): then error

---
 packages/core/postgrest-js/src/PostgrestBuilder.ts |  4 ++--
 packages/core/postgrest-js/test/index.test-d.ts    | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/core/postgrest-js/src/PostgrestBuilder.ts b/packages/core/postgrest-js/src/PostgrestBuilder.ts
index 80b1510f8..d2421ea26 100644
--- a/packages/core/postgrest-js/src/PostgrestBuilder.ts
+++ b/packages/core/postgrest-js/src/PostgrestBuilder.ts
@@ -154,9 +154,9 @@ export default abstract class PostgrestBuilder<
    *
    * @category Database
    */
-  throwOnError(): this & PostgrestBuilder<ClientOptions, Result, true> {
+  throwOnError(): Omit<this, 'then'> & PostgrestBuilder<ClientOptions, Result, true> {
     this.shouldThrowOnError = true
-    return this as this & PostgrestBuilder<ClientOptions, Result, true>
+    return this as Omit<this, 'then'> & PostgrestBuilder<ClientOptions, Result, true>
   }
 
   /**
diff --git a/packages/core/postgrest-js/test/index.test-d.ts b/packages/core/postgrest-js/test/index.test-d.ts
index a3d5748bc..e442a25b0 100644
--- a/packages/core/postgrest-js/test/index.test-d.ts
+++ b/packages/core/postgrest-js/test/index.test-d.ts
@@ -299,6 +299,20 @@ const postgrestWithOptions = new PostgrestClient<DatabaseWithOptions>(REST_URL)
   error
 }
 
+{
+  postgrest
+    .from('messages')
+    .select('id')
+    .eq('id', 1)
+    .single()
+    .throwOnError()
+    .then(({ data, error }) => {
+      expectType<TypeEqual<typeof data, { id: number }>>(true)
+      expectType<TypeEqual<typeof error, null>>(true)
+      return data
+    })
+}
+
 // Json Accessor with custom types overrides
 {
   const result = await postgrest