@plutocms/supabase 0.0.1-alpha.6 → 0.0.1-alpha.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@plutocms/supabase",
   "type": "module",
-  "version": "0.0.1-alpha.6",
+  "version": "0.0.1-alpha.7",
   "main": "./nuxt.config.ts",
   "scripts": {
     "build": "nuxt build",

package/public/schema.sql

@@ -1,17 +1,11 @@
 -- Supabase Schema SQL
 -- Settings
 --- Create enum type for settings
-do $$
-begin
-  if not exists (select 1 from pg_type where typname = 'tsettings') then
-    create type TSettings as enum (
-      'website_title',
-      'website_url',
-      'website_description'
-    );
-  end if;
-end
-$$;
+create type TSettings as enum (
+  'website_title',
+  'website_url',
+  'website_description'
+);
 
 --- Create settings table
 create table public.settings (
@@ -37,15 +31,9 @@ to authenticated, dashboard_user
 with check (true);
 
 --- Create enum type for healthcheck names
-do $$
-begin
-  if not exists (select 1 from pg_type where typname = 'thealthcheck') then
-    create type Healthcheck as enum (
-      'first_setup'
-    );
-  end if;
-end
-$$;
+create type Healthcheck as enum (
+  'first_setup'
+);
 
 --- Create healthcheck table (name/value format like settings)
 create table public.healthcheck (

package/server/api/setup/create.post.ts

@@ -5,6 +5,66 @@ interface Payload {
   connectionString: string
 }
 
+/**
+ * Splits a SQL string into individual statements, correctly handling
+ * $$ dollar-quoted blocks (used in functions, triggers, DO blocks).
+ */
+function splitStatements(sql: string): string[] {
+  const statements: string[] = []
+  let current = ''
+  let i = 0
+
+  while (i < sql.length) {
+    // Check for dollar-quoting ($$)
+    if (sql[i] === '$' && sql[i + 1] === '$') {
+      current += '$$'
+      i += 2
+      // Read until closing $$
+      while (i < sql.length) {
+        if (sql[i] === '$' && sql[i + 1] === '$') {
+          current += '$$'
+          i += 2
+          break
+        }
+        current += sql[i]
+        i++
+      }
+      continue
+    }
+
+    // Check for single-line comments
+    if (sql[i] === '-' && sql[i + 1] === '-') {
+      while (i < sql.length && sql[i] !== '\n') {
+        current += sql[i]
+        i++
+      }
+      continue
+    }
+
+    // Statement terminator
+    if (sql[i] === ';') {
+      current += ';'
+      const trimmed = current.trim()
+      if (trimmed && trimmed !== ';') {
+        statements.push(trimmed)
+      }
+      current = ''
+      i++
+      continue
+    }
+
+    current += sql[i]
+    i++
+  }
+
+  const trimmed = current.trim()
+  if (trimmed && trimmed !== ';') {
+    statements.push(trimmed)
+  }
+
+  return statements
+}
+
 export default defineEventHandler(async (event) => {
   const body = await readBody<Payload>(event)
 
@@ -30,7 +90,11 @@ export default defineEventHandler(async (event) => {
   const sql = postgres(connectionString)
 
   try {
-    await sql.unsafe(schema)
+    const statements = splitStatements(schema)
+
+    for (const statement of statements) {
+      await sql.unsafe(statement)
+    }
 
     // Set the first_setup flag in the healthcheck table to false
     await sql`