Browse Source

fix gpg wrong column types

tags/v1.21.12.1
Lunny Xiao Kim "BKC" Carlbäcker 8 years ago
parent
commit
608cd54a68
3 changed files with 54 additions and 2 deletions
  1. +2
    -2
      models/gpg_key.go
  2. +2
    -0
      models/migrations/migrations.go
  3. +50
    -0
      models/migrations/v24.go

+ 2
- 2
models/gpg_key.go View File

@@ -20,8 +20,8 @@ import (
type GPGKey struct {
ID int64 `xorm:"pk autoincr"`
OwnerID int64 `xorm:"INDEX NOT NULL"`
KeyID string `xorm:"INDEX TEXT NOT NULL"`
PrimaryKeyID string `xorm:"TEXT"`
KeyID string `xorm:"INDEX CHAR(16) NOT NULL"`
PrimaryKeyID string `xorm:"CHAR(16)"`
Content string `xorm:"TEXT NOT NULL"`
Created time.Time `xorm:"-"`
CreatedUnix int64


+ 2
- 0
models/migrations/migrations.go View File

@@ -96,6 +96,8 @@ var migrations = []Migration{
NewMigration("generate and migrate wiki Git hooks", generateAndMigrateWikiGitHooks),
// v23 -> v24
NewMigration("add user openid table", addUserOpenID),
// v24 -> v25
NewMigration("change the key_id and primary_key_id type", changeGPGKeysColumns),
}

// Migrate database to current version


+ 50
- 0
models/migrations/v24.go View File

@@ -0,0 +1,50 @@
// Copyright 2017 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

package migrations

import (
"time"

"github.com/go-xorm/xorm"
)

func changeGPGKeysColumns(x *xorm.Engine) error {
// EmailAddress is the list of all email addresses of a user. Can contain the
// primary email address, but is not obligatory.
type EmailAddress struct {
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"INDEX NOT NULL"`
Email string `xorm:"UNIQUE NOT NULL"`
IsActivated bool
IsPrimary bool `xorm:"-"`
}

// GPGKey represents a GPG key.
type GPGKey struct {
ID int64 `xorm:"pk autoincr"`
OwnerID int64 `xorm:"INDEX NOT NULL"`
KeyID string `xorm:"INDEX CHAR(16) NOT NULL"`
PrimaryKeyID string `xorm:"CHAR(16)"`
Content string `xorm:"TEXT NOT NULL"`
Created time.Time `xorm:"-"`
CreatedUnix int64
Expired time.Time `xorm:"-"`
ExpiredUnix int64
Added time.Time `xorm:"-"`
AddedUnix int64
SubsKey []*GPGKey `xorm:"-"`
Emails []*EmailAddress
CanSign bool
CanEncryptComms bool
CanEncryptStorage bool
CanCertify bool
}

if err := x.DropTables(new(GPGKey)); err != nil {
return err
}

return x.Sync(new(GPGKey))
}

Loading…
Cancel
Save