Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dropTableColumns sqlite implementation #7710

Merged
merged 8 commits into from
Aug 5, 2019
Merged

Fix dropTableColumns sqlite implementation #7710

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e5e6fc
Fix dropTableColumns sqlite implementation
zeripath Aug 1, 2019
75f8b8e
Merge branch 'master' into fix-dropTableColumns
zeripath Aug 1, 2019
ca2b397
use droptables and its index dropping support in v78 and v85
zeripath Aug 2, 2019
02ac9cf
golang-ci fixes
zeripath Aug 2, 2019
d8545c3
Merge branch 'master' into fix-dropTableColumns
zeripath Aug 2, 2019
4b23d50
Merge branch 'master' into fix-dropTableColumns
zeripath Aug 2, 2019
d4e0a59
Add migration from gitea 1.3.3 for sqlite which reveals the droptable…
zeripath Aug 5, 2019
62f970b
Merge branch 'master' into fix-dropTableColumns
zeripath Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion models/migrations/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,25 @@ func dropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin
return err
}
tableSQL := string(res[0]["sql"])

// Separate out the column definitions
tableSQL = tableSQL[strings.Index(tableSQL, "("):]

// Remove the required columnNames
for _, name := range columnNames {
tableSQL = regexp.MustCompile(regexp.QuoteMeta("`"+name+"`")+"[^`,)]*[,)]").ReplaceAllString(tableSQL, "")
tableSQL = regexp.MustCompile(regexp.QuoteMeta("`"+name+"`")+"[^`,)]*?[,)]").ReplaceAllString(tableSQL, "")
}

// Ensure the query is ended properly
tableSQL = strings.TrimSpace(tableSQL)
if tableSQL[len(tableSQL)-1] != ')' {
if tableSQL[len(tableSQL)-1] == ',' {
tableSQL = tableSQL[:len(tableSQL)-1]
}
tableSQL += ")"
}

// Find all the columns in the table
columns := regexp.MustCompile("`([^`]*)`").FindAllString(tableSQL, -1)

tableSQL = fmt.Sprintf("CREATE TABLE `new_%s_new` ", tableName) + tableSQL
Expand Down