fix: write to declarative schemas instead

Author: sweatybridge

internal/clone/clone.go

@@ -9,14 +9,11 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/go-errors/errors"
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx/v4"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
 	"github.com/supabase/cli/internal/db/pull"
 	"github.com/supabase/cli/internal/link"
 	"github.com/supabase/cli/internal/login"
-	"github.com/supabase/cli/internal/migration/new"
-	"github.com/supabase/cli/internal/migration/repair"
 	"github.com/supabase/cli/internal/projects/apiKeys"
 	"github.com/supabase/cli/internal/utils"
 	"github.com/supabase/cli/internal/utils/flags"
@@ -98,26 +95,12 @@ func linkProject(ctx context.Context, fsys afero.Fs) error {
 	return utils.WriteFile(utils.ProjectRefPath, []byte(flags.ProjectRef), fsys)
 }
 
-func dumpRemoteSchema(ctx context.Context, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
-	// 1. Check postgres connection
-	conn, err := utils.ConnectByConfig(ctx, config, options...)
-	if err != nil {
-		return err
-	}
-	defer conn.Close(context.Background())
-	// 2. Pull schema
-	timestamp := utils.GetCurrentTimestamp()
-	path := new.GetMigrationPath(timestamp, "remote_schema")
-	// Ignore schemas flag when working on the initial pull
-	if err = pull.CloneRemoteSchema(ctx, path, config, fsys); err != nil {
-		return err
-	}
-	// 3. Insert a row to `schema_migrations`
-	fmt.Fprintln(os.Stderr, "Schema written to "+utils.Bold(path))
-	if shouldUpdate, err := utils.NewConsole().PromptYesNo(ctx, "Update remote migration history table?", true); err != nil {
+func dumpRemoteSchema(ctx context.Context, config pgconn.Config, fsys afero.Fs) error {
+	schemaPath := filepath.Join(utils.SchemasDir, "remote.sql")
+	utils.Config.Db.Migrations.SchemaPaths = append(utils.Config.Db.Migrations.SchemaPaths, filepath.ToSlash(schemaPath))
+	if err := pull.CloneRemoteSchema(ctx, schemaPath, config, fsys); err != nil {
 		return err
-	} else if shouldUpdate {
-		return repair.UpdateMigrationTable(ctx, conn, []string{timestamp}, repair.Applied, true, fsys)
 	}
+	fmt.Fprintln(os.Stderr, "Schema written to "+utils.Bold(schemaPath))
 	return nil
 }

internal/db/diff/diff.go

@@ -133,7 +133,21 @@ func MigrateShadowDatabase(ctx context.Context, container string, fsys afero.Fs,
 	if _, err := conn.Exec(ctx, CREATE_TEMPLATE); err != nil {
 		return errors.Errorf("failed to create template database: %w", err)
 	}
-	return migration.ApplyMigrations(ctx, migrations, conn, afero.NewIOFS(fsys))
+	// Migrations take precedence over declarative schemas
+	if len(migrations) > 0 {
+		return migration.ApplyMigrations(ctx, migrations, conn, afero.NewIOFS(fsys))
+	}
+	declared, err := loadDeclaredSchemas(fsys)
+	if err != nil || len(declared) == 0 {
+		return err
+	}
+	fmt.Fprintln(os.Stderr, "Creating local database from declarative schemas:")
+	msg := make([]string, len(declared))
+	for i, m := range declared {
+		msg[i] = fmt.Sprintf(" • %s", utils.Bold(m))
+	}
+	fmt.Fprintln(os.Stderr, strings.Join(msg, "\n"))
+	return migration.SeedGlobals(ctx, declared, conn, afero.NewIOFS(fsys))
 }
 
 func DiffDatabase(ctx context.Context, schema []string, config pgconn.Config, w io.Writer, fsys afero.Fs, differ DiffFunc, options ...func(*pgx.ConnConfig)) (string, error) {

pkg/migration/scripts/dump_schema.sh

@@ -48,6 +48,7 @@ pg_dump \
 | sed -E "s/^REVOKE (.+) ON (.+) \"(${EXCLUDED_SCHEMAS:-})\"/-- &/" \
 | sed -E 's/^(CREATE EXTENSION IF NOT EXISTS "pg_tle").+/\1;/' \
 | sed -E 's/^(CREATE EXTENSION IF NOT EXISTS "pgsodium").+/\1;/' \
+| sed -E 's/^(CREATE EXTENSION IF NOT EXISTS "pgmq").+/\1;/' \
 | sed -E 's/^COMMENT ON EXTENSION (.+)/-- &/' \
 | sed -E 's/^CREATE POLICY "cron_job_/-- &/' \
 | sed -E 's/^ALTER TABLE "cron"/-- &/' \