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

package/package.json

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

package/public/schema.sql

@@ -14,7 +14,7 @@ end
 $$;
 
 --- Create settings table
-create table public.settings (
+create table if not exists public.settings (
   id bigint generated by default as identity not null,
   setting_name public.TSettings not null,
   setting_value text not null,
@@ -26,21 +26,60 @@ create table public.settings (
 insert into public.settings (setting_name, setting_value) values
 ('website_title', 'My Website'),
 ('website_url', 'https://mywebsite.test'),
-('website_description', 'This is my website.');
+('website_description', 'This is my website.')
+on conflict (setting_name) do nothing;
 
 alter table public.settings enable row level security;
 
 -- Policies for settings table
-create policy "Enable insert for authenticated users only"
-on public.settings
-to authenticated, dashboard_user
-with check (true);
+do $$
+begin
+  if not exists (
+    select 1 from pg_policies where tablename = 'settings' and policyname = 'Enable insert for authenticated users only'
+  ) then
+    create policy "Enable insert for authenticated users only"
+    on public.settings
+    for insert
+    to authenticated, dashboard_user
+    with check (true);
+  end if;
+end
+$$;
+
+do $$
+begin
+  if not exists (
+    select 1 from pg_policies where tablename = 'settings' and policyname = 'Enable read access for authenticated users on settings'
+  ) then
+    create policy "Enable read access for authenticated users on settings"
+    on public.settings
+    for select
+    to authenticated, dashboard_user
+    using (true);
+  end if;
+end
+$$;
+
+do $$
+begin
+  if not exists (
+    select 1 from pg_policies where tablename = 'settings' and policyname = 'Enable update for authenticated users on settings'
+  ) then
+    create policy "Enable update for authenticated users on settings"
+    on public.settings
+    for update
+    to authenticated, dashboard_user
+    using (true)
+    with check (true);
+  end if;
+end
+$$;
 
 --- 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 (
+    create type THealthcheck as enum (
       'first_setup'
     );
   end if;
@@ -48,29 +87,38 @@ end
 $$;
 
 --- Create healthcheck table (name/value format like settings)
-create table public.healthcheck (
+create table if not exists public.healthcheck (
   id bigint generated by default as identity not null,
-  check_name public.Healthcheck not null,
-  check_value text not null,
+  config_name public.THealthcheck not null,
+  config_value text not null,
   constraint healthcheck_pkey primary key (id),
-  constraint healthcheck_check_name_key unique (check_name)
+  constraint healthcheck_config_name_key unique (config_name)
 ) TABLESPACE pg_default;
 
 --- Insert default healthcheck values
-insert into public.healthcheck (check_name, check_value) values
-('first_setup', 'true');
+insert into public.healthcheck (config_name, config_value) values
+('first_setup', 'true')
+on conflict (config_name) do nothing;
 
 alter table public.healthcheck enable row level security;
 
 -- Allow read access to healthcheck for public and dashboard_user (no login required)
-create policy "Enable read access for healthcheck to public and dashboard_user"
-on public.healthcheck
-for select
-to public, dashboard_user
-using (true);
+do $$
+begin
+  if not exists (
+    select 1 from pg_policies where tablename = 'healthcheck' and policyname = 'Enable read access for healthcheck to public and dashboard_user'
+  ) then
+    create policy "Enable read access for healthcheck to public and dashboard_user"
+    on public.healthcheck
+    for select
+    to public, dashboard_user
+    using (true);
+  end if;
+end
+$$;
 
 -- Profiles
-create table profiles (
+create table if not exists public.profiles (
   id uuid references auth.users on delete cascade not null primary key,
   updated_at timestamp with time zone,
   first_name text,
@@ -80,13 +128,22 @@ create table profiles (
 
 alter table public.profiles enable row level security;
 
-create policy "Enable read access for authenticated users"
-on public.profiles
-to authenticated, dashboard_user
-for select using (true);
+do $$
+begin
+  if not exists (
+    select 1 from pg_policies where tablename = 'profiles' and policyname = 'Enable read access for authenticated users'
+  ) then
+    create policy "Enable read access for authenticated users"
+    on public.profiles
+    for select
+    to authenticated, dashboard_user
+    using (true);
+  end if;
+end
+$$;
 
 --- inserts a row into public.profiles
-create function public.handle_new_user()
+create or replace function public.handle_new_user()
 returns trigger
 language plpgsql
 security definer set search_path = ''
@@ -98,6 +155,14 @@ begin
 end;
 $$;
 --- trigger the function every time a user is created
-create trigger on_auth_user_created
-  after insert on auth.users
-  for each row execute procedure public.handle_new_user();
+do $$
+begin
+  if not exists (
+    select 1 from pg_trigger where tgname = 'on_auth_user_created'
+  ) then
+    create trigger on_auth_user_created
+      after insert on auth.users
+      for each row execute procedure public.handle_new_user();
+  end if;
+end
+$$;

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

@@ -5,6 +5,88 @@ interface Payload {
   connectionString: string
 }
 
+/**
+ * Splits a SQL string into individual statements, correctly handling
+ * $$ dollar-quoted blocks, single-quoted strings, and -- comments.
+ */
+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-quoted strings (handle '' escapes)
+    if (sql[i] === `'`) {
+      current += sql[i]
+      i++
+      while (i < sql.length) {
+        if (sql[i] === `'` && sql[i + 1] === `'`) {
+          // Escaped quote
+          current += `''`
+          i += 2
+          continue
+        }
+        if (sql[i] === `'`) {
+          current += sql[i]
+          i++
+          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,13 +112,17 @@ 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`
       UPDATE healthcheck
-      SET check_value = 'false'
-      WHERE check_name = 'first_setup';
+      SET config_value = 'false'
+      WHERE config_name = 'first_setup';
     `
 
     return {