diff --git a/integrations/migration-test/gitea-v1.3.3.sqlite3.sql.gz b/integrations/migration-test/gitea-v1.3.3.sqlite3.sql.gz
new file mode 100644
index 0000000000..8375018d9f
Binary files /dev/null and b/integrations/migration-test/gitea-v1.3.3.sqlite3.sql.gz differ
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 6459036e4a..bbd1bb734f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -327,11 +327,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
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()
}
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
}