Skip to content

Commit dde368f

Browse files
committed
Skip auto dumping database migration
Fix user id from context
1 parent cbcb0cc commit dde368f

File tree

9 files changed

+9
-8
lines changed

9 files changed

+9
-8
lines changed

backend/internal/api/handler/access_lists.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func CreateAccessList() func(http.ResponseWriter, *http.Request) {
6464
}
6565

6666
// Get userID from token
67-
userID, _ := r.Context().Value(c.UserIDCtxKey).(int)
67+
userID, _ := r.Context().Value(c.UserIDCtxKey).(uint)
6868
newItem.UserID = userID
6969

7070
if err = newItem.Save(); err != nil {

backend/internal/api/handler/dns_providers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func CreateDNSProvider() func(http.ResponseWriter, *http.Request) {
7070
}
7171

7272
// Get userID from token
73-
userID, _ := r.Context().Value(c.UserIDCtxKey).(int)
73+
userID, _ := r.Context().Value(c.UserIDCtxKey).(uint)
7474
newItem.UserID = userID
7575

7676
if err = newItem.Save(); err != nil {

backend/internal/api/handler/nginx_templates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func CreateNginxTemplate() func(http.ResponseWriter, *http.Request) {
6868
}
6969

7070
// Get userID from token
71-
userID, _ := r.Context().Value(c.UserIDCtxKey).(int)
71+
userID, _ := r.Context().Value(c.UserIDCtxKey).(uint)
7272
newNginxTemplate.UserID = userID
7373

7474
if err = newNginxTemplate.Save(); err != nil {

backend/internal/api/handler/streams.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func CreateStream() func(http.ResponseWriter, *http.Request) {
6868
}
6969

7070
// Get userID from token
71-
userID, _ := r.Context().Value(c.UserIDCtxKey).(int)
71+
userID, _ := r.Context().Value(c.UserIDCtxKey).(uint)
7272
newHost.UserID = userID
7373

7474
if err = newHost.Save(); err != nil {

backend/internal/database/migrator.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ func Migrate(followup afterMigrationComplete) bool {
2020
dbURL := config.Configuration.DB.GetDBMateConnectURL()
2121
u, _ := url.Parse(dbURL)
2222
db := dbmate.New(u)
23+
db.AutoDumpSchema = false
2324
db.FS = embed.MigrationFiles
2425
db.MigrationsDir = []string{fmt.Sprintf("./migrations/%s", config.Configuration.DB.GetDriver())}
2526

backend/internal/entity/accesslist/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// Model is the model
1313
type Model struct {
1414
entity.ModelBase
15-
UserID int `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
15+
UserID uint `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
1616
Name string `json:"name" gorm:"column:name" filter:"name,string"`
1717
Meta types.JSONB `json:"meta" gorm:"column:meta"`
1818
// Expansions

backend/internal/entity/dnsprovider/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
// Model is the model
1616
type Model struct {
1717
entity.ModelBase
18-
UserID int `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
18+
UserID uint `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
1919
Name string `json:"name" gorm:"column:name" filter:"name,string"`
2020
AcmeshName string `json:"acmesh_name" gorm:"column:acmesh_name" filter:"acmesh_name,string"`
2121
DNSSleep int `json:"dns_sleep" gorm:"column:dns_sleep" filter:"dns_sleep,integer"`

backend/internal/entity/nginxtemplate/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// Model is the model
1111
type Model struct {
1212
entity.ModelBase
13-
UserID int `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
13+
UserID uint `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
1414
Name string `json:"name" gorm:"column:name" filter:"name,string"`
1515
Type string `json:"type" gorm:"column:type" filter:"type,string"`
1616
Template string `json:"template" gorm:"column:template" filter:"template,string"`

backend/internal/entity/stream/model.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
type Model struct {
1313
entity.ModelBase
1414
ExpiresOn types.DBDate `json:"expires_on" gorm:"column:expires_on" filter:"expires_on,integer"`
15-
UserID int `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
15+
UserID uint `json:"user_id" gorm:"column:user_id" filter:"user_id,integer"`
1616
Provider string `json:"provider" gorm:"column:provider" filter:"provider,string"`
1717
Name string `json:"name" gorm:"column:name" filter:"name,string"`
1818
DomainNames types.JSONB `json:"domain_names" gorm:"column:domain_names" filter:"domain_names,string"`

0 commit comments

Comments
 (0)