aboutsummaryrefslogtreecommitdiffstats
path: root/models/migrations/v85.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-08-05 22:49:49 +0100
committerGitHub <noreply@github.com>2019-08-05 22:49:49 +0100
commit026696b87ac3db1cd2c06dcabe8a2d279a2e48ff (patch)
tree87279a39556e7d4117288172fb250bfb23eab575 /models/migrations/v85.go
parent7ad67109d732bd560c8da0356aa555be467d786c (diff)
downloadgitea-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/v85.go')
-rw-r--r--models/migrations/v85.go39
1 files changed, 1 insertions, 38 deletions
diff --git a/models/migrations/v85.go b/models/migrations/v85.go
index b8d0ee5443..157c06d7ba 100644
--- a/models/migrations/v85.go
+++ b/models/migrations/v85.go
@@ -8,9 +8,7 @@ import (
"fmt"
"github.com/go-xorm/xorm"
- "xorm.io/core"
- "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
@@ -37,41 +35,6 @@ func hashAppToken(x *xorm.Engine) error {
// 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 UQE_access_token_sha1")
- } 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('access_token') AND obj.name IS NOT NULL AND col.name = 'sha1'
- SET @SQL = N'ALTER TABLE [access_token] DROP CONSTRAINT [' + @ConstraintName + N']'
- EXEC sp_executesql @SQL`)
- } else if models.DbCfg.Type == core.MYSQL {
- indexes, err := sess.QueryString(`SHOW INDEX FROM access_token WHERE KEY_NAME = 'UQE_access_token_sha1'`)
- if err != nil {
- return err
- }
-
- if len(indexes) >= 1 {
- _, err = sess.Exec("DROP INDEX UQE_access_token_sha1 ON access_token")
- if err != nil {
- return err
- }
- }
- } else {
- _, err = sess.Exec("DROP INDEX UQE_access_token_sha1 ON access_token")
- }
- 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
@@ -81,7 +44,7 @@ func hashAppToken(x *xorm.Engine) error {
return fmt.Errorf("Sync2: %v", err)
}
- if err = sess.Commit(); err != nil {
+ if err := sess.Commit(); err != nil {
return err
}