diff options
author | zeripath <art27@cantab.net> | 2019-08-05 22:49:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-05 22:49:49 +0100 |
commit | 026696b87ac3db1cd2c06dcabe8a2d279a2e48ff (patch) | |
tree | 87279a39556e7d4117288172fb250bfb23eab575 /models/migrations/v78.go | |
parent | 7ad67109d732bd560c8da0356aa555be467d786c (diff) | |
download | gitea-026696b87ac3db1cd2c06dcabe8a2d279a2e48ff.tar.gz gitea-026696b87ac3db1cd2c06dcabe8a2d279a2e48ff.zip |
Fix dropTableColumns sqlite implementation (#7710)
* Fix dropTableColumns sqlite implementation
* use droptables and its index dropping support in v78 and v85
* golang-ci fixes
* Add migration from gitea 1.3.3 for sqlite which reveals the droptables bug - thus showing this works
Diffstat (limited to 'models/migrations/v78.go')
-rw-r--r-- | models/migrations/v78.go | 65 |
1 files changed, 7 insertions, 58 deletions
diff --git a/models/migrations/v78.go b/models/migrations/v78.go index 511a4f57fa..8082996b6f 100644 --- a/models/migrations/v78.go +++ b/models/migrations/v78.go @@ -5,13 +5,7 @@ package migrations import ( - "fmt" - - "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/log" - "github.com/go-xorm/xorm" - "xorm.io/core" ) func renameRepoIsBareToIsEmpty(x *xorm.Engine) error { @@ -21,73 +15,28 @@ func renameRepoIsBareToIsEmpty(x *xorm.Engine) error { IsEmpty bool `xorm:"INDEX"` } - // First remove the index sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { return err } - var err error - if models.DbCfg.Type == core.POSTGRES || models.DbCfg.Type == core.SQLITE { - _, err = sess.Exec("DROP INDEX IF EXISTS IDX_repository_is_bare") - } else if models.DbCfg.Type == core.MSSQL { - _, err = sess.Exec(`DECLARE @ConstraintName VARCHAR(256) - DECLARE @SQL NVARCHAR(256) - SELECT @ConstraintName = obj.name FROM sys.columns col LEFT OUTER JOIN sys.objects obj ON obj.object_id = col.default_object_id AND obj.type = 'D' WHERE col.object_id = OBJECT_ID('repository') AND obj.name IS NOT NULL AND col.name = 'is_bare' - SET @SQL = N'ALTER TABLE [repository] DROP CONSTRAINT [' + @ConstraintName + N']' - EXEC sp_executesql @SQL`) - if err != nil { - return err - } - } else if models.DbCfg.Type == core.MYSQL { - indexes, err := sess.QueryString(`SHOW INDEX FROM repository WHERE KEY_NAME = 'IDX_repository_is_bare'`) - if err != nil { - return err - } - - if len(indexes) >= 1 { - _, err = sess.Exec("DROP INDEX IDX_repository_is_bare ON repository") - if err != nil { - return fmt.Errorf("Drop index failed: %v", err) - } - } - } else { - _, err = sess.Exec("DROP INDEX IDX_repository_is_bare ON repository") - } - - if err != nil { - return fmt.Errorf("Drop index failed: %v", err) - } - - if err = sess.Commit(); err != nil { - return err - } - - if err := sess.Begin(); err != nil { - return err - } - if err := sess.Sync2(new(Repository)); err != nil { return err } if _, err := sess.Exec("UPDATE repository SET is_empty = is_bare;"); err != nil { return err } - - if models.DbCfg.Type != core.SQLITE { - _, err = sess.Exec("ALTER TABLE repository DROP COLUMN is_bare") - if err != nil { - return fmt.Errorf("Drop column failed: %v", err) - } + if err := sess.Commit(); err != nil { + return err } - if err = sess.Commit(); err != nil { + if err := sess.Begin(); err != nil { return err } - - if models.DbCfg.Type == core.SQLITE { - log.Warn("TABLE repository's COLUMN is_bare should be DROP but sqlite is not supported, you could manually do that.") + if err := dropTableColumns(sess, "repository", "is_bare"); err != nil { + return err } - return nil + + return sess.Commit() } |