Skip to content

Commit 1d4be66

Browse files
easyCZroboquat
authored andcommitted
[usage] Use json format the same as column names
1 parent 10f57b2 commit 1d4be66

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

components/usage/pkg/db/workspace.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ import (
1313
// Workspace represents the underlying DB object
1414
type Workspace struct {
1515
ID string `gorm:"primary_key;column:id;type:char;size:36;" json:"id"`
16-
OwnerID string `gorm:"column:ownerId;type:char;size:36;" json:"owner_id"`
17-
ProjectID sql.NullString `gorm:"column:projectId;type:char;size:36;" json:"project_id"`
16+
OwnerID string `gorm:"column:ownerId;type:char;size:36;" json:"ownerId"`
17+
ProjectID sql.NullString `gorm:"column:projectId;type:char;size:36;" json:"projectId"`
1818
Description string `gorm:"column:description;type:varchar;size:255;" json:"description"`
1919
Type string `gorm:"column:type;type:char;size:16;default:regular;" json:"type"`
20-
CloneURL string `gorm:"column:cloneURL;type:varchar;size:255;" json:"clone_url"`
20+
CloneURL string `gorm:"column:cloneURL;type:varchar;size:255;" json:"cloneURL"`
2121

22-
ContextURL string `gorm:"column:contextURL;type:text;size:65535;" json:"context_url"`
22+
ContextURL string `gorm:"column:contextURL;type:text;size:65535;" json:"contextURL"`
2323
Context datatypes.JSON `gorm:"column:context;type:text;size:65535;" json:"context"`
2424
Config datatypes.JSON `gorm:"column:config;type:text;size:65535;" json:"config"`
25-
BasedOnPrebuildID sql.NullString `gorm:"column:basedOnPrebuildId;type:char;size:36;" json:"based_on_prebuild_id"`
26-
BasedOnSnapshotID sql.NullString `gorm:"column:basedOnSnapshotId;type:char;size:36;" json:"based_on_snapshot_id"`
27-
ImageSource datatypes.JSON `gorm:"column:imageSource;type:text;size:65535;" json:"image_source"`
28-
ImageNameResolved string `gorm:"column:imageNameResolved;type:varchar;size:255;" json:"image_name_resolved"`
29-
BaseImageNameResolved string `gorm:"column:baseImageNameResolved;type:varchar;size:255;" json:"base_image_name_resolved"`
25+
BasedOnPrebuildID sql.NullString `gorm:"column:basedOnPrebuildId;type:char;size:36;" json:"basedOnPrebuildId"`
26+
BasedOnSnapshotID sql.NullString `gorm:"column:basedOnSnapshotId;type:char;size:36;" json:"basedOnSnapshotId"`
27+
ImageSource datatypes.JSON `gorm:"column:imageSource;type:text;size:65535;" json:"imageSource"`
28+
ImageNameResolved string `gorm:"column:imageNameResolved;type:varchar;size:255;" json:"imageNameResolved"`
29+
BaseImageNameResolved string `gorm:"column:baseImageNameResolved;type:varchar;size:255;" json:"baseImageNameResolved"`
3030

31-
CreationTime VarcharTime `gorm:"column:creationTime;type:varchar;size:255;" json:"creation_time"`
32-
LastModified time.Time `gorm:"column:_lastModified;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"_last_modified"`
33-
SoftDeletedTime VarcharTime `gorm:"column:softDeletedTime;type:varchar;size:255;" json:"soft_deleted_time"`
34-
ContentDeletedTime VarcharTime `gorm:"column:contentDeletedTime;type:varchar;size:255;" json:"content_deleted_time"`
31+
CreationTime VarcharTime `gorm:"column:creationTime;type:varchar;size:255;" json:"creationTime"`
32+
LastModified time.Time `gorm:"column:_lastModified;type:timestamp;default:CURRENT_TIMESTAMP(6);" json:"_lastModified"`
33+
SoftDeletedTime VarcharTime `gorm:"column:softDeletedTime;type:varchar;size:255;" json:"softDeletedTime"`
34+
ContentDeletedTime VarcharTime `gorm:"column:contentDeletedTime;type:varchar;size:255;" json:"contentDeletedTime"`
3535

3636
Archived int32 `gorm:"column:archived;type:tinyint;default:0;" json:"archived"`
3737
Shareable int32 `gorm:"column:shareable;type:tinyint;default:0;" json:"shareable"`
3838

39-
SoftDeleted sql.NullString `gorm:"column:softDeleted;type:char;size:4;" json:"soft_deleted"`
39+
SoftDeleted sql.NullString `gorm:"column:softDeleted;type:char;size:4;" json:"softDeleted"`
4040
Pinned int32 `gorm:"column:pinned;type:tinyint;default:0;" json:"pinned"`
4141

4242
// deleted is reserved for use by db-sync

0 commit comments

Comments
 (0)