diff --git a/src/server/constants.ts b/src/server/constants.ts
index ec47840a..70a98046 100644
--- a/src/server/constants.ts
+++ b/src/server/constants.ts
@@ -40,12 +40,15 @@ export const GENERATE_TYPES = process.env.PG_META_GENERATE_TYPES
 export const GENERATE_TYPES_INCLUDED_SCHEMAS = GENERATE_TYPES
   ? (process.env.PG_META_GENERATE_TYPES_INCLUDED_SCHEMAS?.split(',') ?? [])
   : []
+export const GENERATE_TYPES_DEFAULT_SCHEMA =
+  process.env.PG_META_GENERATE_TYPES_DEFAULT_SCHEMA || 'public'
 export const GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS =
   process.env.PG_META_GENERATE_TYPES_DETECT_ONE_TO_ONE_RELATIONSHIPS === 'true'
 export const GENERATE_TYPES_SWIFT_ACCESS_CONTROL = process.env
   .PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL
   ? (process.env.PG_META_GENERATE_TYPES_SWIFT_ACCESS_CONTROL as AccessControl)
   : 'internal'
+
 export const DEFAULT_POOL_CONFIG: PoolConfig = {
   max: 1,
   connectionTimeoutMillis: PG_CONN_TIMEOUT_SECS * 1000,
diff --git a/src/server/templates/typescript.ts b/src/server/templates/typescript.ts
index 25c38a18..bf08f4af 100644
--- a/src/server/templates/typescript.ts
+++ b/src/server/templates/typescript.ts
@@ -8,6 +8,7 @@ import type {
   PostgresView,
 } from '../../lib/index.js'
 import type { GeneratorMetadata } from '../../lib/generators.js'
+import { GENERATE_TYPES_DEFAULT_SCHEMA } from '../constants.js'
 
 export const apply = async ({
   schemas,
@@ -390,25 +391,29 @@ export type Database = {
     })}
 }
 
-type PublicSchema = Database[Extract<keyof Database, "public">]
+type DefaultSchema = Database[Extract<keyof Database, ${JSON.stringify(GENERATE_TYPES_DEFAULT_SCHEMA)}>]
 
 export type Tables<
-  PublicTableNameOrOptions extends
-    | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
+  DefaultSchemaTableNameOrOptions extends
+    | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
     | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-        Database[PublicTableNameOrOptions["schema"]]["Views"])
-    : never = never
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-      Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+        Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+  ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+      Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
       Row: infer R
     }
     ? R
     : never
-  : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] & PublicSchema["Views"])
-    ? (PublicSchema["Tables"] & PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+  : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+        DefaultSchema["Views"])
+    ? (DefaultSchema["Tables"] &
+        DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
         Row: infer R
       }
       ? R
@@ -416,72 +421,80 @@ export type Tables<
     : never
 
 export type TablesInsert<
-  PublicTableNameOrOptions extends
-    | keyof PublicSchema["Tables"]
+  DefaultSchemaTableNameOrOptions extends
+    | keyof DefaultSchema["Tables"]
     | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
-    : never = never
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+  ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
       Insert: infer I
     }
     ? I
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-  ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-      Insert: infer I
-    }
-    ? I
+  : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+    ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+        Insert: infer I
+      }
+      ? I
+      : never
     : never
-  : never
 
 export type TablesUpdate<
-  PublicTableNameOrOptions extends
-    | keyof PublicSchema["Tables"]
+  DefaultSchemaTableNameOrOptions extends
+    | keyof DefaultSchema["Tables"]
     | { schema: keyof Database },
-  TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
-    : never = never
-> = PublicTableNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+  TableName extends DefaultSchemaTableNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
+    : never = never,
+> = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+  ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
       Update: infer U
     }
     ? U
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-  ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-      Update: infer U
-    }
-    ? U
+  : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+    ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
+        Update: infer U
+      }
+      ? U
+      : never
     : never
-  : never
 
 export type Enums<
-  PublicEnumNameOrOptions extends
-    | keyof PublicSchema["Enums"]
+  DefaultSchemaEnumNameOrOptions extends
+    | keyof DefaultSchema["Enums"]
     | { schema: keyof Database },
-  EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
-    : never = never
-> = PublicEnumNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
-  : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
-  ? PublicSchema["Enums"][PublicEnumNameOrOptions]
-  : never
+  EnumName extends DefaultSchemaEnumNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
+    : never = never,
+> = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
+  ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+  : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+    ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
+    : never
 
 export type CompositeTypes<
   PublicCompositeTypeNameOrOptions extends
-    | keyof PublicSchema['CompositeTypes']
+    | keyof DefaultSchema["CompositeTypes"]
     | { schema: keyof Database },
-  CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
-    ? keyof Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes']
-    : never = never
+  CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
+    schema: keyof Database
+  }
+    ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
+    : never = never,
 > = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
-  ? Database[PublicCompositeTypeNameOrOptions['schema']]['CompositeTypes'][CompositeTypeName]
-  : PublicCompositeTypeNameOrOptions extends keyof PublicSchema['CompositeTypes']
-    ? PublicSchema['CompositeTypes'][PublicCompositeTypeNameOrOptions]
-    : never;
+  ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
+  : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+    ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+    : never
 `
 
   output = await prettier.format(output, {
diff --git a/test/server/typegen.ts b/test/server/typegen.ts
index 3aabc930..f50d4c2e 100644
--- a/test/server/typegen.ts
+++ b/test/server/typegen.ts
@@ -431,27 +431,29 @@ test('typegen: typescript', async () => {
       }
     }
 
-    type PublicSchema = Database[Extract<keyof Database, "public">]
+    type DefaultSchema = Database[Extract<keyof Database, "public">]
 
     export type Tables<
-      PublicTableNameOrOptions extends
-        | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
+      DefaultSchemaTableNameOrOptions extends
+        | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-            Database[PublicTableNameOrOptions["schema"]]["Views"])
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+            Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-          Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+          Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
           Row: infer R
         }
         ? R
         : never
-      : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
-            PublicSchema["Views"])
-        ? (PublicSchema["Tables"] &
-            PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])
+        ? (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
             Row: infer R
           }
           ? R
@@ -459,20 +461,22 @@ test('typegen: typescript', async () => {
         : never
 
     export type TablesInsert<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Insert: infer I
         }
         ? I
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Insert: infer I
           }
           ? I
@@ -480,20 +484,22 @@ test('typegen: typescript', async () => {
         : never
 
     export type TablesUpdate<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Update: infer U
         }
         ? U
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Update: infer U
           }
           ? U
@@ -501,21 +507,23 @@ test('typegen: typescript', async () => {
         : never
 
     export type Enums<
-      PublicEnumNameOrOptions extends
-        | keyof PublicSchema["Enums"]
+      DefaultSchemaEnumNameOrOptions extends
+        | keyof DefaultSchema["Enums"]
         | { schema: keyof Database },
-      EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
+      EnumName extends DefaultSchemaEnumNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
         : never = never,
-    > = PublicEnumNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
-      : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
-        ? PublicSchema["Enums"][PublicEnumNameOrOptions]
+    > = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+      : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+        ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
         : never
 
     export type CompositeTypes<
       PublicCompositeTypeNameOrOptions extends
-        | keyof PublicSchema["CompositeTypes"]
+        | keyof DefaultSchema["CompositeTypes"]
         | { schema: keyof Database },
       CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
         schema: keyof Database
@@ -524,8 +532,8 @@ test('typegen: typescript', async () => {
         : never = never,
     > = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
       ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
-      : PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
-        ? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+      : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+        ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
         : never
     "
   `)
@@ -978,27 +986,29 @@ test('typegen w/ one-to-one relationships', async () => {
       }
     }
 
-    type PublicSchema = Database[Extract<keyof Database, "public">]
+    type DefaultSchema = Database[Extract<keyof Database, "public">]
 
     export type Tables<
-      PublicTableNameOrOptions extends
-        | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
+      DefaultSchemaTableNameOrOptions extends
+        | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-            Database[PublicTableNameOrOptions["schema"]]["Views"])
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+            Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-          Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+          Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
           Row: infer R
         }
         ? R
         : never
-      : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
-            PublicSchema["Views"])
-        ? (PublicSchema["Tables"] &
-            PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])
+        ? (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
             Row: infer R
           }
           ? R
@@ -1006,20 +1016,22 @@ test('typegen w/ one-to-one relationships', async () => {
         : never
 
     export type TablesInsert<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Insert: infer I
         }
         ? I
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Insert: infer I
           }
           ? I
@@ -1027,20 +1039,22 @@ test('typegen w/ one-to-one relationships', async () => {
         : never
 
     export type TablesUpdate<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Update: infer U
         }
         ? U
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Update: infer U
           }
           ? U
@@ -1048,21 +1062,23 @@ test('typegen w/ one-to-one relationships', async () => {
         : never
 
     export type Enums<
-      PublicEnumNameOrOptions extends
-        | keyof PublicSchema["Enums"]
+      DefaultSchemaEnumNameOrOptions extends
+        | keyof DefaultSchema["Enums"]
         | { schema: keyof Database },
-      EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
+      EnumName extends DefaultSchemaEnumNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
         : never = never,
-    > = PublicEnumNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
-      : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
-        ? PublicSchema["Enums"][PublicEnumNameOrOptions]
+    > = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+      : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+        ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
         : never
 
     export type CompositeTypes<
       PublicCompositeTypeNameOrOptions extends
-        | keyof PublicSchema["CompositeTypes"]
+        | keyof DefaultSchema["CompositeTypes"]
         | { schema: keyof Database },
       CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
         schema: keyof Database
@@ -1071,8 +1087,8 @@ test('typegen w/ one-to-one relationships', async () => {
         : never = never,
     > = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
       ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
-      : PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
-        ? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+      : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+        ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
         : never
     "
   `)
@@ -1525,27 +1541,29 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
       }
     }
 
-    type PublicSchema = Database[Extract<keyof Database, "public">]
+    type DefaultSchema = Database[Extract<keyof Database, "public">]
 
     export type Tables<
-      PublicTableNameOrOptions extends
-        | keyof (PublicSchema["Tables"] & PublicSchema["Views"])
+      DefaultSchemaTableNameOrOptions extends
+        | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-            Database[PublicTableNameOrOptions["schema"]]["Views"])
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+            Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] &
-          Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
+          Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
           Row: infer R
         }
         ? R
         : never
-      : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] &
-            PublicSchema["Views"])
-        ? (PublicSchema["Tables"] &
-            PublicSchema["Views"])[PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])
+        ? (DefaultSchema["Tables"] &
+            DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
             Row: infer R
           }
           ? R
@@ -1553,20 +1571,22 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
         : never
 
     export type TablesInsert<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Insert: infer I
         }
         ? I
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Insert: infer I
           }
           ? I
@@ -1574,20 +1594,22 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
         : never
 
     export type TablesUpdate<
-      PublicTableNameOrOptions extends
-        | keyof PublicSchema["Tables"]
+      DefaultSchemaTableNameOrOptions extends
+        | keyof DefaultSchema["Tables"]
         | { schema: keyof Database },
-      TableName extends PublicTableNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"]
+      TableName extends DefaultSchemaTableNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
         : never = never,
-    > = PublicTableNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    > = DefaultSchemaTableNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
           Update: infer U
         }
         ? U
         : never
-      : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-        ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
+      : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
+        ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
             Update: infer U
           }
           ? U
@@ -1595,21 +1617,23 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
         : never
 
     export type Enums<
-      PublicEnumNameOrOptions extends
-        | keyof PublicSchema["Enums"]
+      DefaultSchemaEnumNameOrOptions extends
+        | keyof DefaultSchema["Enums"]
         | { schema: keyof Database },
-      EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
-        ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"]
+      EnumName extends DefaultSchemaEnumNameOrOptions extends {
+        schema: keyof Database
+      }
+        ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
         : never = never,
-    > = PublicEnumNameOrOptions extends { schema: keyof Database }
-      ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName]
-      : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"]
-        ? PublicSchema["Enums"][PublicEnumNameOrOptions]
+    > = DefaultSchemaEnumNameOrOptions extends { schema: keyof Database }
+      ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
+      : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
+        ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
         : never
 
     export type CompositeTypes<
       PublicCompositeTypeNameOrOptions extends
-        | keyof PublicSchema["CompositeTypes"]
+        | keyof DefaultSchema["CompositeTypes"]
         | { schema: keyof Database },
       CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
         schema: keyof Database
@@ -1618,8 +1642,8 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
         : never = never,
     > = PublicCompositeTypeNameOrOptions extends { schema: keyof Database }
       ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
-      : PublicCompositeTypeNameOrOptions extends keyof PublicSchema["CompositeTypes"]
-        ? PublicSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
+      : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
+        ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
         : never
     "
   `)