db: fix export for import into fresh database

Move the cover table before series in the creation and export order
since series.cover_letter_id references cover.id. Clear the seeded state
and tag rows before inserting exported data so that "pw db import" does
not hit duplicate key violations on a freshly synced database. Fix bool
formatting: use SQL true/false literals instead of integer 1/0.

Signed-off-by: Robin Jarry <robin@jarry.cc>

Author: rjarry

pkg/db/export.go

@@ -36,11 +36,11 @@ var exportTables = []exportTable{
 	{dstName: "delegation_rule", srcName: "patchwork_delegationrule"},
 	{dstName: "person", srcName: "patchwork_person"},
 	{dstName: "patch_relation", srcName: "patchwork_patchrelation"},
+	{dstName: "cover", srcName: "patchwork_cover"},
 	{dstName: "series", srcName: "patchwork_series"},
 	{dstName: "series_reference", srcName: "patchwork_seriesreference"},
 	{dstName: "series_metadata", srcName: "patchwork_seriesmetadata", optional: true},
 	{dstName: "series_dependencies", srcName: "patchwork_series_dependencies", optional: true},
-	{dstName: "cover", srcName: "patchwork_cover"},
 	{dstName: "patch", srcName: "patchwork_patch"},
 	{dstName: "patch_tag", srcName: "patchwork_patchtag"},
 	{dstName: "patch_comment", srcName: "patchwork_patchcomment"},
@@ -66,6 +66,11 @@ func Export(ctx context.Context, database *bun.DB, w io.Writer) error {
 
 	fmt.Fprint(w, "BEGIN;\n")
 
+	// Clear seeded data so the imported rows don't conflict with
+	// defaults inserted by "pw db sync".
+	fmt.Fprint(w, "DELETE FROM tag;\n")
+	fmt.Fprint(w, "DELETE FROM state;\n")
+
 	for _, t := range exportTables {
 		if t.optional && !tableExists(ctx, database, t.srcName) {
 			continue
@@ -327,9 +332,9 @@ func formatSQLValue(v any) string {
 	switch val := v.(type) {
 	case bool:
 		if val {
-			return "1"
+			return "true"
 		}
-		return "0"
+		return "false"
 	case int64:
 		return fmt.Sprintf("%d", val)
 	case float64:
@@ -360,9 +365,9 @@ func formatSQLValue(v any) string {
 			return "NULL"
 		}
 		if val.Bool {
-			return "1"
+			return "true"
 		}
-		return "0"
+		return "false"
 	case sql.NullTime:
 		if !val.Valid {
 			return "NULL"

pkg/db/migrations/0001_initial_schema.go

@@ -305,11 +305,11 @@ var tables0001 = []any{
 	(*delegationRule0001)(nil),
 	(*person0001)(nil),
 	(*patchRelation0001)(nil),
+	(*cover0001)(nil),
 	(*series0001)(nil),
 	(*seriesReference0001)(nil),
 	(*seriesMetadata0001)(nil),
 	(*seriesDependencies0001)(nil),
-	(*cover0001)(nil),
 	(*patch0001)(nil),
 	(*patchTag0001)(nil),
 	(*patchComment0001)(nil),

pkg/db/schema.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 
 	"github.com/uptrace/bun"
+
+	"github.com/getpatchwork/patchwork/pkg/log"
 )
 
 // Schema is declared from struct tags:
@@ -161,11 +163,11 @@ func CreateSchema(ctx context.Context, database bun.IDB) error {
 		(*DelegationRule)(nil),
 		(*Person)(nil),
 		(*PatchRelation)(nil),
+		(*Cover)(nil),
 		(*Series)(nil),
 		(*SeriesReference)(nil),
 		(*SeriesMetadata)(nil),
 		(*SeriesDependencies)(nil),
-		(*Cover)(nil),
 		(*Patch)(nil),
 		(*PatchTag)(nil),
 		(*PatchComment)(nil),
@@ -188,6 +190,7 @@ func CreateSchemaFrom(ctx context.Context, database bun.IDB, schema []any) error
 		for _, fk := range fks {
 			fk.add(q)
 		}
+		log.Noticef("creating table %q", q.GetTableName())
 		if _, err := q.Exec(ctx); err != nil {
 			return fmt.Errorf("create table %s: %w", q.GetTableName(), err)
 		}