colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#3192] fixed autogenerated down migration not preserving old rules state 

Co-authored-by: Merlin Marek <merlin.marek@posteo.net>
This commit is contained in:
impact-merlinmarek 2023-08-25 15:21:04 +02:00 committed by GitHub
parent 5e6949062f
commit d423acad3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/migratecmd/migratecmd_test.go
View File

@ -381,7 +381,7 @@ migrate((db) => {
collection.name = "test456_update" collection.name = "test456_update"
collection.type = "base" collection.type = "base"
collection.listRule = null collection.listRule = "@request.auth.id != ''"
collection.deleteRule = "updated > 0 && @request.auth.id != ''" collection.deleteRule = "updated > 0 && @request.auth.id != ''"
collection.options = {} collection.options = {}
collection.indexes = [ collection.indexes = [
@ -503,7 +503,7 @@ func init() {
collection.Type = "base" collection.Type = "base"
collection.ListRule = nil collection.ListRule = types.Pointer("@request.auth.id != ''")
collection.DeleteRule = types.Pointer("updated > 0 && @request.auth.id != ''") collection.DeleteRule = types.Pointer("updated > 0 && @request.auth.id != ''")
@ -683,7 +683,7 @@ func init() {
collection.Name = "test456_update" collection.Name = "test456_update"
collection.Type = models.CollectionTypeBase collection.Type = models.CollectionTypeBase
collection.DeleteRule = types.Pointer(`updated > 0 && @request.auth.id != ''`) collection.DeleteRule = types.Pointer(`updated > 0 && @request.auth.id != ''`)
collection.ListRule = nil collection.ListRule = types.Pointer("@request.auth.id != ''")
collection.Indexes = types.JsonArray[string]{ collection.Indexes = types.JsonArray[string]{
"create index test1 on test456_update (f1_name)", "create index test1 on test456_update (f1_name)",
} }

136
plugins/migratecmd/templates.go
View File

@ -137,53 +137,61 @@ func (p *plugin) jsDiffTemplate(new *models.Collection, old *models.Collection)
// note: strconv.Quote is used because %q converts the rule operators in unicode char codes // note: strconv.Quote is used because %q converts the rule operators in unicode char codes
// --- // ---
formatRule := func(typ string, rule *string) string {
if rule == nil {
return fmt.Sprintf("%s.%sRule = null", varName, typ)
}
return fmt.Sprintf("%s.%sRule = %s", varName, typ, strconv.Quote(*rule))
}
if old.ListRule != new.ListRule { if old.ListRule != new.ListRule {
if old.ListRule != nil && new.ListRule == nil { oldRule := formatRule("list", old.ListRule)
upParts = append(upParts, fmt.Sprintf("%s.listRule = null", varName)) newRule := formatRule("list", new.ListRule)
downParts = append(downParts, fmt.Sprintf("%s.listRule = %s", varName, strconv.Quote(*old.ListRule)))
} else if old.ListRule == nil && new.ListRule != nil || *old.ListRule != *new.ListRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.listRule = %s", varName, strconv.Quote(*new.ListRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.listRule = null", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.ViewRule != new.ViewRule { if old.ViewRule != new.ViewRule {
if old.ViewRule != nil && new.ViewRule == nil { oldRule := formatRule("view", old.ViewRule)
upParts = append(upParts, fmt.Sprintf("%s.viewRule = null", varName)) newRule := formatRule("view", new.ViewRule)
downParts = append(downParts, fmt.Sprintf("%s.viewRule = %s", varName, strconv.Quote(*old.ViewRule)))
} else if old.ViewRule == nil && new.ViewRule != nil || *old.ViewRule != *new.ViewRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.viewRule = %s", varName, strconv.Quote(*new.ViewRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.viewRule = null", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.CreateRule != new.CreateRule { if old.CreateRule != new.CreateRule {
if old.CreateRule != nil && new.CreateRule == nil { oldRule := formatRule("create", old.CreateRule)
upParts = append(upParts, fmt.Sprintf("%s.createRule = null", varName)) newRule := formatRule("create", new.CreateRule)
downParts = append(downParts, fmt.Sprintf("%s.createRule = %s", varName, strconv.Quote(*old.CreateRule)))
} else if old.CreateRule == nil && new.CreateRule != nil || *old.CreateRule != *new.CreateRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.createRule = %s", varName, strconv.Quote(*new.CreateRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.createRule = null", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.UpdateRule != new.UpdateRule { if old.UpdateRule != new.UpdateRule {
if old.UpdateRule != nil && new.UpdateRule == nil { oldRule := formatRule("update", old.UpdateRule)
upParts = append(upParts, fmt.Sprintf("%s.updateRule = null", varName)) newRule := formatRule("update", new.UpdateRule)
downParts = append(downParts, fmt.Sprintf("%s.updateRule = %s", varName, strconv.Quote(*old.UpdateRule)))
} else if old.UpdateRule == nil && new.UpdateRule != nil || *old.UpdateRule != *new.UpdateRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.updateRule = %s", varName, strconv.Quote(*new.UpdateRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.updateRule = null", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.DeleteRule != new.DeleteRule { if old.DeleteRule != new.DeleteRule {
if old.DeleteRule != nil && new.DeleteRule == nil { oldRule := formatRule("delete", old.DeleteRule)
upParts = append(upParts, fmt.Sprintf("%s.deleteRule = null", varName)) newRule := formatRule("delete", new.DeleteRule)
downParts = append(downParts, fmt.Sprintf("%s.deleteRule = %s", varName, strconv.Quote(*old.DeleteRule)))
} else if old.DeleteRule == nil && new.DeleteRule != nil || *old.DeleteRule != *new.DeleteRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.deleteRule = %s", varName, strconv.Quote(*new.DeleteRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.deleteRule = null", varName)) downParts = append(downParts, oldRule)
} }
} }
@ -521,53 +529,61 @@ func (p *plugin) goDiffTemplate(new *models.Collection, old *models.Collection)
// note: strconv.Quote is used because %q converts the rule operators in unicode char codes // note: strconv.Quote is used because %q converts the rule operators in unicode char codes
// --- // ---
formatRule := func(typ string, rule *string) string {
if rule == nil {
return fmt.Sprintf("%s.%sRule = nil\n", varName, typ)
}
return fmt.Sprintf("%s.%sRule = types.Pointer(%s)\n", varName, typ, strconv.Quote(*rule))
}
if old.ListRule != new.ListRule { if old.ListRule != new.ListRule {
if old.ListRule != nil && new.ListRule == nil { oldRule := formatRule("List", old.ListRule)
upParts = append(upParts, fmt.Sprintf("%s.ListRule = nil\n", varName)) newRule := formatRule("List", new.ListRule)
downParts = append(downParts, fmt.Sprintf("%s.ListRule = types.Pointer(%s)\n", varName, strconv.Quote(*old.ListRule)))
} else if old.ListRule == nil && new.ListRule != nil || *old.ListRule != *new.ListRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.ListRule = types.Pointer(%s)\n", varName, strconv.Quote(*new.ListRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.ListRule = nil\n", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.ViewRule != new.ViewRule { if old.ViewRule != new.ViewRule {
if old.ViewRule != nil && new.ViewRule == nil { oldRule := formatRule("View", old.ViewRule)
upParts = append(upParts, fmt.Sprintf("%s.ViewRule = nil\n", varName)) newRule := formatRule("View", new.ViewRule)
downParts = append(downParts, fmt.Sprintf("%s.ViewRule = types.Pointer(%s)\n", varName, strconv.Quote(*old.ViewRule)))
} else if old.ViewRule == nil && new.ViewRule != nil || *old.ViewRule != *new.ViewRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.ViewRule = types.Pointer(%s)\n", varName, strconv.Quote(*new.ViewRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.ViewRule = nil\n", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.CreateRule != new.CreateRule { if old.CreateRule != new.CreateRule {
if old.CreateRule != nil && new.CreateRule == nil { oldRule := formatRule("Create", old.CreateRule)
upParts = append(upParts, fmt.Sprintf("%s.CreateRule = nil\n", varName)) newRule := formatRule("Create", new.CreateRule)
downParts = append(downParts, fmt.Sprintf("%s.CreateRule = types.Pointer(%s)\n", varName, strconv.Quote(*old.CreateRule)))
} else if old.CreateRule == nil && new.CreateRule != nil || *old.CreateRule != *new.CreateRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.CreateRule = types.Pointer(%s)\n", varName, strconv.Quote(*new.CreateRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.CreateRule = nil\n", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.UpdateRule != new.UpdateRule { if old.UpdateRule != new.UpdateRule {
if old.UpdateRule != nil && new.UpdateRule == nil { oldRule := formatRule("Update", old.UpdateRule)
upParts = append(upParts, fmt.Sprintf("%s.UpdateRule = nil\n", varName)) newRule := formatRule("Update", new.UpdateRule)
downParts = append(downParts, fmt.Sprintf("%s.UpdateRule = types.Pointer(%s)\n", varName, strconv.Quote(*old.UpdateRule)))
} else if old.UpdateRule == nil && new.UpdateRule != nil || *old.UpdateRule != *new.UpdateRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.UpdateRule = types.Pointer(%s)\n", varName, strconv.Quote(*new.UpdateRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.UpdateRule = nil\n", varName)) downParts = append(downParts, oldRule)
} }
} }
if old.DeleteRule != new.DeleteRule { if old.DeleteRule != new.DeleteRule {
if old.DeleteRule != nil && new.DeleteRule == nil { oldRule := formatRule("Delete", old.DeleteRule)
upParts = append(upParts, fmt.Sprintf("%s.DeleteRule = nil\n", varName)) newRule := formatRule("Delete", new.DeleteRule)
downParts = append(downParts, fmt.Sprintf("%s.DeleteRule = types.Pointer(%s)\n", varName, strconv.Quote(*old.DeleteRule)))
} else if old.DeleteRule == nil && new.DeleteRule != nil || *old.DeleteRule != *new.DeleteRule { if oldRule != newRule {
upParts = append(upParts, fmt.Sprintf("%s.DeleteRule = types.Pointer(%s)\n", varName, strconv.Quote(*new.DeleteRule))) upParts = append(upParts, newRule)
downParts = append(downParts, fmt.Sprintf("%s.DeleteRule = nil\n", varName)) downParts = append(downParts, oldRule)
} }
} }