cmd/migrate-new/main.go

@@ -1,37 +0,0 @@
-package main
-
-import (
-	"flag"
-
-	"git.mstar.dev/mstar/goutils/other"
-	"github.com/rs/zerolog/log"
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-
-	"git.mstar.dev/mstar/linstrom/config"
-	"git.mstar.dev/mstar/linstrom/shared"
-	"git.mstar.dev/mstar/linstrom/storage-new"
-)
-
-func main() {
-	other.SetupFlags()
-	flag.Parse()
-	other.ConfigureLogging(nil)
-	if err := config.ReadAndWriteToGlobal(*shared.FlagConfigFile); err != nil {
-		log.Fatal().Err(err).Send()
-	}
-
-	db, err := gorm.Open(
-		postgres.Open(config.GlobalConfig.Storage.BuildPostgresDSN()),
-		&gorm.Config{
-			PrepareStmt: false,
-			Logger:      shared.NewGormLogger(log.Logger),
-		},
-	)
-	if err != nil {
-		log.Fatal().Err(err).Msg("Failed to open connection to temporary container")
-	}
-	if err := storage.Migrate(db); err != nil {
-		log.Fatal().Err(err).Send()
-	}
-}

storage-new/migrations.go

@@ -82,7 +82,7 @@ func createRemoteServerSoftwareType(db *gorm.DB) error {
 
 // Helper function for ensuring the existence of an enum with the given values
 func migrateEnum(db *gorm.DB, name string, values []string) error {
-	if err := db.Exec("DROP TYPE IF EXISTS " + name + " CASCADE;").Error; err != nil {
+	if err := db.Exec("DROP TYPE IF EXISTS " + name).Error; err != nil {
 		return other.Error(
 			"storage",
 			fmt.Sprintf("Failed to remove old type %s (if it exists)", name),
@@ -90,9 +90,9 @@ func migrateEnum(db *gorm.DB, name string, values []string) error {
 		)
 	}
 	queryBuilder := strings.Builder{}
-	queryBuilder.WriteString("CREATE TYPE ")
+	queryBuilder.WriteString("CREATE TYPE")
 	queryBuilder.WriteString(name)
-	queryBuilder.WriteString(" AS ENUM (")
+	queryBuilder.WriteString("AS ENUM (")
 	blen := len(values)
 	for i, btype := range values {
 		queryBuilder.WriteString("'" + string(btype) + "'")
@@ -101,7 +101,6 @@ func migrateEnum(db *gorm.DB, name string, values []string) error {
 			queryBuilder.WriteString(",")
 		}
 	}
-	queryBuilder.WriteString(");")
 	if err := db.Exec(queryBuilder.String()).Error; err != nil {
 		return err
 	}

storage-new/models/Note.go

@@ -22,7 +22,7 @@ type Note struct {
 	// Soft delete means that this entry still exists in the db, but gorm won't include it anymore unless specifically told to
 	// If not null, this entry is marked as deleted
 	DeletedAt gorm.DeletedAt `gorm:"index"`
-	Creator   User
+	// Creator   Account        // `gorm:"foreignKey:CreatorId;references:ID"` // Account that created the post
 	CreatorId string
 	Remote    bool // Whether the note is originally a remote one and just "cached"
 	// Raw content of the note. So without additional formatting applied

storage-new/models/RemoteServer.go

@@ -9,7 +9,6 @@ type RemoteServer struct {
 	ServerType ServerSoftwareType // What software the server is running. Useful for formatting
 	Domain     string             // `gorm:"primaryKey"` // Domain the server exists under. Additional primary key
 	Name       string             // What the server wants to be known as (usually same as url)
-	Icon       MediaMetadata
+	Icon       string             // ID of a media file
-	IconId     string // ID of a media file
+	IsSelf     bool               // Whether this server is yours truly
-	IsSelf     bool   // Whether this server is yours truly
 }

storage-new/models/User.go

@@ -32,18 +32,15 @@ type User struct {
 	// If not null, this entry is marked as deleted
 	DeletedAt gorm.DeletedAt `gorm:"index"`
 	// Server       RemoteServer   // `gorm:"foreignKey:ServerId;references:ID"` // The server this user is from
-	ServerId     uint   // Id of the server this user is from, needed for including RemoteServer
+	ServerId    uint    // Id of the server this user is from, needed for including RemoteServer
-	DisplayName  string // The display name of the user. Can be different from the handle
+	DisplayName string  // The display name of the user. Can be different from the handle
-	Description  string // The description of a user account
+	Description string  // The description of a user account
-	IsBot        bool   // Whether to mark this account as a script controlled one
+	IsBot       bool    // Whether to mark this account as a script controlled one
-	Icon         MediaMetadata
+	Icon        string  // ID of a media file used as icon
-	IconId       string // ID of a media file used as icon
+	Background  *string // ID of a media file used as background image
-	Background   *MediaMetadata
+	Banner      *string // ID of a media file used as banner
-	BackgroundId *string // ID of a media file used as background image
+	Indexable   bool    // Whether this account can be found by crawlers
-	Banner       *MediaMetadata
+	PublicKey   []byte  // The public key of the account
-	BannerId     *string // ID of a media file used as banner
-	Indexable    bool    // Whether this account can be found by crawlers
-	PublicKey    []byte  // The public key of the account
 	// Whether this account restricts following
 	// If true, the owner must approve of a follow request first
 	RestrictedFollow bool