fix: initial database schema (#601)

pull/606/head
boojack 3 years ago committed by GitHub
parent 2fa01886da
commit 045819c312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -49,8 +49,8 @@ func (db *DB) Open(ctx context.Context) (err error) {
} }
db.Db = sqlDB db.Db = sqlDB
// If mode is dev, we should migrate and seed the database.
if db.profile.Mode == "dev" { if db.profile.Mode == "dev" {
// In dev mode, we should migrate and seed the database.
if _, err := os.Stat(db.profile.DSN); errors.Is(err, os.ErrNotExist) { if _, err := os.Stat(db.profile.DSN); errors.Is(err, os.ErrNotExist) {
if err := db.applyLatestSchema(ctx); err != nil { if err := db.applyLatestSchema(ctx); err != nil {
return fmt.Errorf("failed to apply latest schema: %w", err) return fmt.Errorf("failed to apply latest schema: %w", err)
@ -65,19 +65,20 @@ func (db *DB) Open(ctx context.Context) (err error) {
if err := db.applyLatestSchema(ctx); err != nil { if err := db.applyLatestSchema(ctx); err != nil {
return fmt.Errorf("failed to apply latest schema: %w", err) return fmt.Errorf("failed to apply latest schema: %w", err)
} }
} else { }
currentVersion := version.GetCurrentVersion(db.profile.Mode) currentVersion := version.GetCurrentVersion(db.profile.Mode)
migrationHistory, err := db.FindMigrationHistory(ctx, &MigrationHistoryFind{}) migrationHistory, err := db.FindMigrationHistory(ctx, &MigrationHistoryFind{})
if err != nil { if err != nil {
return err return fmt.Errorf("failed to find migration history, err: %w", err)
} }
if migrationHistory == nil { if migrationHistory == nil {
migrationHistory, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{ if _, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{
Version: currentVersion, Version: currentVersion,
}) }); err != nil {
if err != nil { return fmt.Errorf("failed to upsert migration history, err: %w", err)
return err
} }
return nil
} }
if version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), migrationHistory.Version) { if version.IsVersionGreaterThan(version.GetSchemaVersion(currentVersion), migrationHistory.Version) {
@ -92,8 +93,8 @@ func (db *DB) Open(ctx context.Context) (err error) {
if err := os.WriteFile(backupDBFilePath, rawBytes, 0644); err != nil { if err := os.WriteFile(backupDBFilePath, rawBytes, 0644); err != nil {
return fmt.Errorf("failed to write raw database file, err: %w", err) return fmt.Errorf("failed to write raw database file, err: %w", err)
} }
println("succeed to copy a backup database file") println("succeed to copy a backup database file")
println("start migrate") println("start migrate")
for _, minorVersion := range minorVersionList { for _, minorVersion := range minorVersionList {
normalizedVersion := minorVersion + ".0" normalizedVersion := minorVersion + ".0"
@ -104,15 +105,14 @@ func (db *DB) Open(ctx context.Context) (err error) {
} }
} }
} }
println("end migrate") println("end migrate")
// remove the created backup db file after migrate succeed // remove the created backup db file after migrate succeed
if err := os.Remove(backupDBFilePath); err != nil { if err := os.Remove(backupDBFilePath); err != nil {
println(fmt.Sprintf("Failed to remove temp database file, err %v", err)) println(fmt.Sprintf("Failed to remove temp database file, err %v", err))
} }
} }
} }
}
return nil return nil
} }
@ -137,7 +137,7 @@ func (db *DB) applyLatestSchema(ctx context.Context) error {
func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion string) error { func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion string) error {
filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/%s/*.sql", "migration/prod", minorVersion)) filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/%s/*.sql", "migration/prod", minorVersion))
if err != nil { if err != nil {
return err return fmt.Errorf("failed to read ddl files, err: %w", err)
} }
sort.Strings(filenames) sort.Strings(filenames)
@ -163,10 +163,11 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion st
defer tx.Rollback() defer tx.Rollback()
// upsert the newest version to migration_history // upsert the newest version to migration_history
version := minorVersion + ".0"
if _, err = upsertMigrationHistory(ctx, tx, &MigrationHistoryUpsert{ if _, err = upsertMigrationHistory(ctx, tx, &MigrationHistoryUpsert{
Version: minorVersion + ".0", Version: version,
}); err != nil { }); err != nil {
return err return fmt.Errorf("failed to upsert migration history with version: %s, err: %w", version, err)
} }
return tx.Commit() return tx.Commit()
@ -175,7 +176,7 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion st
func (db *DB) seed(ctx context.Context) error { func (db *DB) seed(ctx context.Context) error {
filenames, err := fs.Glob(seedFS, fmt.Sprintf("%s/*.sql", "seed")) filenames, err := fs.Glob(seedFS, fmt.Sprintf("%s/*.sql", "seed"))
if err != nil { if err != nil {
return err return fmt.Errorf("failed to read seed files, err: %w", err)
} }
sort.Strings(filenames) sort.Strings(filenames)
@ -203,7 +204,7 @@ func (db *DB) execute(ctx context.Context, stmt string) error {
defer tx.Rollback() defer tx.Rollback()
if _, err := tx.ExecContext(ctx, stmt); err != nil { if _, err := tx.ExecContext(ctx, stmt); err != nil {
return err return fmt.Errorf("failed to execute statement, err: %w", err)
} }
return tx.Commit() return tx.Commit()

Loading…
Cancel
Save