Merge pull request #274 from guillermoscript/fix/migration-fix

feat: Introduce migration management scripts and refine database sche…

Author: guillermoscript

scripts/check-migrations.mjs

@@ -0,0 +1,13 @@
+import pg from 'pg';
+
+const client = new pg.Client({
+  connectionString: 'postgresql://postgres.tcqqnjfwmbfwcyhafbbt:R808Z4QSPxGet1mC@aws-0-us-east-1.pooler.supabase.com:6543/postgres',
+  ssl: { rejectUnauthorized: false }
+});
+
+await client.connect();
+const { rows } = await client.query('SELECT version, name FROM supabase_migrations.schema_migrations ORDER BY version');
+console.log(`Total applied: ${rows.length}`);
+console.log('Last 10:');
+rows.slice(-10).forEach(r => console.log(' ', r.version, r.name || ''));
+await client.end();

scripts/manual-migrate.ts

@@ -0,0 +1,60 @@
+import pg from 'pg';
+import fs from 'fs';
+import path from 'path';
+
+const connectionString = "postgresql://postgres.tcqqnjfwmbfwcyhafbbt:R808Z4QSPxGet1mC@aws-0-us-east-1.pooler.supabase.com:6543/postgres";
+
+async function migrate() {
+    const client = new pg.Client({
+        connectionString,
+        ssl: { rejectUnauthorized: false }
+    });
+
+    try {
+        await client.connect();
+        console.log('Connected to database');
+
+        // Get applied migrations
+        const { rows } = await client.query('SELECT version FROM supabase_migrations.schema_migrations');
+        const applied = new Set(rows.map(r => r.version));
+
+        const migrationsDir = './supabase/migrations';
+        const files = fs.readdirSync(migrationsDir)
+            .filter(f => f.endsWith('.sql'))
+            .sort();
+
+        for (const file of files) {
+            const version = file.split('_')[0];
+            if (applied.has(version)) {
+                console.log(`Skipping applied migration: ${file}`);
+                continue;
+            }
+
+            console.log(`Applying migration: ${file}`);
+            const sql = fs.readFileSync(path.join(migrationsDir, file), 'utf8');
+
+            await client.query('BEGIN');
+            try {
+                // We use the simple query protocol by passing just a string to client.query
+                // which helps avoid prepared statement issues in transaction mode
+                await client.query(sql);
+                await client.query('INSERT INTO supabase_migrations.schema_migrations (version) VALUES ($1)', [version]);
+                await client.query('COMMIT');
+                console.log(`Successfully applied ${file}`);
+            } catch (err) {
+                await client.query('ROLLBACK');
+                console.log(`Failed to apply ${file}`);
+                throw err;
+            }
+        }
+
+        console.log('All migrations completed successfully');
+    } catch (err) {
+        console.error('Migration failed:', err);
+        process.exit(1);
+    } finally {
+        await client.end();
+    }
+}
+
+migrate();

supabase/migrations/20260308210000_replace_landing_pages_with_puck.sql

@@ -2,14 +2,51 @@
 -- No existing users with custom landing pages, so safe to drop columns.
 
 -- Replace sections/settings columns with puck_data on landing_pages
-ALTER TABLE landing_pages DROP COLUMN IF EXISTS sections;
-ALTER TABLE landing_pages DROP COLUMN IF EXISTS settings;
-ALTER TABLE landing_pages ADD COLUMN puck_data jsonb NOT NULL DEFAULT '{}';
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'landing_pages') THEN
+    ALTER TABLE landing_pages DROP COLUMN IF EXISTS sections;
+    ALTER TABLE landing_pages DROP COLUMN IF EXISTS settings;
+    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = 'public' AND table_name = 'landing_pages' AND column_name = 'puck_data') THEN
+      ALTER TABLE landing_pages ADD COLUMN puck_data jsonb NOT NULL DEFAULT '{}';
+    END IF;
+  ELSE
+    CREATE TABLE landing_pages (
+      page_id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+      tenant_id uuid NOT NULL REFERENCES tenants(id) ON DELETE CASCADE,
+      title text NOT NULL,
+      slug text NOT NULL,
+      is_published boolean NOT NULL DEFAULT false,
+      puck_data jsonb NOT NULL DEFAULT '{}',
+      created_at timestamptz NOT NULL DEFAULT now(),
+      updated_at timestamptz NOT NULL DEFAULT now(),
+      UNIQUE (tenant_id, slug)
+    );
+    ALTER TABLE landing_pages ENABLE ROW LEVEL SECURITY;
+    CREATE POLICY "Tenant members can view landing pages" ON landing_pages FOR SELECT USING (tenant_id = (SELECT current_setting('request.jwt.claims', true)::jsonb->>'tenant_id')::uuid);
+    CREATE POLICY "Tenant admins can manage landing pages" ON landing_pages FOR ALL USING (tenant_id = (SELECT current_setting('request.jwt.claims', true)::jsonb->>'tenant_id')::uuid);
+  END IF;
+END $$;
 
 -- Replace sections/settings columns with puck_data on landing_page_templates
-ALTER TABLE landing_page_templates DROP COLUMN IF EXISTS sections;
-ALTER TABLE landing_page_templates DROP COLUMN IF EXISTS settings;
-ALTER TABLE landing_page_templates ADD COLUMN puck_data jsonb NOT NULL DEFAULT '{}';
+DO $$
+BEGIN
+  IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'landing_page_templates') THEN
+    ALTER TABLE landing_page_templates DROP COLUMN IF EXISTS sections;
+    ALTER TABLE landing_page_templates DROP COLUMN IF EXISTS settings;
+    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = 'public' AND table_name = 'landing_page_templates' AND column_name = 'puck_data') THEN
+      ALTER TABLE landing_page_templates ADD COLUMN puck_data jsonb NOT NULL DEFAULT '{}';
+    END IF;
+  ELSE
+    CREATE TABLE landing_page_templates (
+      template_id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+      name text NOT NULL,
+      description text,
+      puck_data jsonb NOT NULL DEFAULT '{}',
+      created_at timestamptz NOT NULL DEFAULT now()
+    );
+  END IF;
+END $$;
 
 -- Create storage bucket for landing page assets (images, etc.)
 INSERT INTO storage.buckets (id, name, public, file_size_limit, allowed_mime_types)

supabase/migrations/20260310000000_lesson_resources_sequential_scheduling.sql

@@ -138,13 +138,13 @@ END;
 $$;
 
 -- Schedule via pg_cron every 5 minutes (requires pg_cron extension)
-DO $$
+DO $do$
 BEGIN
   IF EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'pg_cron') THEN
     PERFORM cron.schedule('publish-scheduled-lessons', '*/5 * * * *', $$SELECT publish_scheduled_lessons()$$);
   END IF;
 END
-$$;
+$do$;
 
 -- 1e. Storage bucket for lesson resources
 INSERT INTO storage.buckets (id, name, public, file_size_limit, allowed_mime_types)