feat: Add move command with support for moving children
This commit is contained in:
@@ -30,7 +30,7 @@ var _db_sqlite_migrations_metadata_1637447083_sql = []byte("\x1f\x8b\x08\x00\x00
|
||||
func db_sqlite_migrations_metadata_1637447083_sql() ([]byte, error) {
|
||||
return bindata_read(
|
||||
_db_sqlite_migrations_metadata_1637447083_sql,
|
||||
"../../../db/sqlite/migrations/metadata/1637447083.sql",
|
||||
"../../db/sqlite/migrations/metadata/1637447083.sql",
|
||||
)
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ func AssetNames() []string {
|
||||
|
||||
// _bindata is a table, holding each asset generator, mapped to its name.
|
||||
var _bindata = map[string]func() ([]byte, error){
|
||||
"../../../db/sqlite/migrations/metadata/1637447083.sql": db_sqlite_migrations_metadata_1637447083_sql,
|
||||
"../../db/sqlite/migrations/metadata/1637447083.sql": db_sqlite_migrations_metadata_1637447083_sql,
|
||||
}
|
||||
// AssetDir returns the file names below a certain
|
||||
// directory embedded in the file by go-bindata.
|
||||
@@ -100,13 +100,11 @@ type _bintree_t struct {
|
||||
var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"..": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"..": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"..": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"db": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"sqlite": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"migrations": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"metadata": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"1637447083.sql": &_bintree_t{db_sqlite_migrations_metadata_1637447083_sql, map[string]*_bintree_t{
|
||||
}},
|
||||
"db": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"sqlite": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"migrations": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"metadata": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"1637447083.sql": &_bintree_t{db_sqlite_migrations_metadata_1637447083_sql, map[string]*_bintree_t{
|
||||
}},
|
||||
}},
|
||||
}},
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
var flagDebugMode = flag.Bool("test.sqldebug", false, "Turns on debug mode for SQL statements")
|
||||
var flagConfigFile = flag.String("test.config", "", "Overrides the default config")
|
||||
|
||||
const outputDirDepth = 8
|
||||
const outputDirDepth = 5
|
||||
|
||||
var (
|
||||
dbMain tester
|
||||
|
||||
+30
-15
@@ -1,7 +1,7 @@
|
||||
package persisters
|
||||
|
||||
//go:generate sqlboiler sqlite3 -o ../db/sqlite/models/metadata -c ../../../configs/sqlboiler/metadata.yaml
|
||||
//go:generate go-bindata -pkg metadata -o ../db/sqlite/migrations/metadata/migrations.go ../../../db/sqlite/migrations/metadata
|
||||
//go:generate sqlboiler sqlite3 -o ../db/sqlite/models/metadata -c ../../configs/sqlboiler/metadata.yaml
|
||||
//go:generate go-bindata -pkg metadata -o ../db/sqlite/migrations/metadata/migrations.go ../../db/sqlite/migrations/metadata
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -28,7 +28,7 @@ func NewMetadataPersister(dbPath string) *MetadataPersister {
|
||||
Migrations: migrate.AssetMigrationSource{
|
||||
Asset: metadata.Asset,
|
||||
AssetDir: metadata.AssetDir,
|
||||
Dir: "../../../db/sqlite/migrations/metadata",
|
||||
Dir: "../../db/sqlite/migrations/metadata",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -75,26 +75,41 @@ func (p *MetadataPersister) UpdateHeaderMetadata(ctx context.Context, dbhdr *mod
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *MetadataPersister) MoveHeader(ctx context.Context, oldName string, newName string) error {
|
||||
dbhdr, err := models.FindHeader(ctx, p.db, oldName, models.HeaderColumns.Name)
|
||||
if err == sql.ErrNoRows {
|
||||
return nil // We may have renamed the header in a later, but indexed record/block, so we can skip this
|
||||
func (p *MetadataPersister) moveHeader(ctx context.Context, tx boil.ContextExecutor, oldName string, newName string) error {
|
||||
// We can't do this with `dbhdr.Update` because we are renaming the primary key
|
||||
if _, err := queries.Raw(
|
||||
fmt.Sprintf(
|
||||
` update %v set %v = ? where %v = ?;`,
|
||||
models.TableNames.Headers,
|
||||
models.HeaderColumns.Name,
|
||||
models.HeaderColumns.Name,
|
||||
),
|
||||
newName,
|
||||
oldName,
|
||||
).ExecContext(ctx, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *MetadataPersister) MoveHeader(ctx context.Context, oldName string, newName string) error {
|
||||
return p.moveHeader(ctx, p.db, oldName, newName)
|
||||
}
|
||||
|
||||
func (p *MetadataPersister) MoveHeaders(ctx context.Context, hdrs models.HeaderSlice, oldName string, newName string) error {
|
||||
tx, err := p.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Update the name
|
||||
dbhdr.Name = newName
|
||||
|
||||
if _, err := dbhdr.Update(ctx, p.db, boil.Infer()); err != nil {
|
||||
return err
|
||||
for _, hdr := range hdrs {
|
||||
if err := p.moveHeader(ctx, tx, hdr.Name, strings.TrimSuffix(newName, "/")+strings.TrimPrefix(hdr.Name, strings.TrimSuffix(oldName, "/"))); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Update children's names too
|
||||
|
||||
return nil
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (p *MetadataPersister) GetHeaders(ctx context.Context) (models.HeaderSlice, error) {
|
||||
|
||||
Reference in New Issue
Block a user