devstack/authorizer
4
0
Fork 0
Code Pull Requests Actions Activity

resolve conflict over the db models

Browse Source
This commit is contained in:
manoj
2022-10-08 16:07:07 +05:30
parent dccc70e5c0 d8eceadd7f
commit 589af96888
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/db/models/env.go
View File

@@ -6,8 +6,8 @@ package models
type Env struct {
Key string `json:"_key,omitempty" bson:"_key,omitempty" cql:"_key,omitempty" dynamo:"key,omitempty"` // for arangodb
ID string `gorm:"primaryKey;type:char(36)" json:"_id" bson:"_id" cql:"id" dynamo:"id,hash"`
EnvData string `gorm:"type:text" json:"env" bson:"env" cql:"env" dynamo:"env"`
Hash string `gorm:"type:text" json:"hash" bson:"hash" cql:"hash" dynamo:"hash"`
EnvData string `json:"env" bson:"env" cql:"env" dynamo:"env"`
Hash string `json:"hash" bson:"hash" cql:"hash" dynamo:"hash"`
UpdatedAt int64 `json:"updated_at" bson:"updated_at" cql:"updated_at" dynamo:"updated_at"`
CreatedAt int64 `json:"created_at" bson:"created_at" cql:"created_at" dynamo:"created_at"`
}