archives/trantor
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to pg v9

Browse source
This commit is contained in:
Las Zenow 2019-11-06 06:53:41 +00:00
parent 91beca9a55
commit defaa2ae0b
9 changed files with 75 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/database/submissions.go
View file

@ -12,15 +12,15 @@ const (
)
type Submission struct {
ID int `sql:"type:serial"`
SubmissionID string `sql:"type:varchar(16)"`
ID int `pg:"type:serial"`
SubmissionID string `pg:"type:varchar(16)"`
Filename string
Status string
Comment string
LastModified time.Time
UserID int `sql:"type:integer,unique"`
UserID int `pg:"type:integer,unique"`
User *User
BookID string `sql:"type:varchar(16),unique"`
BookID string `pg:"type:varchar(16),unique"`
Book *Book
}
@ -78,7 +78,7 @@ func (db *pgDB) GetComment(bookID string) (string, error) {
func (db *pgDB) GetSubmission(submissionID string) (submission []Submission, err error) {
err = db.sql.Model(&submission).
Column("Book").
Relation("Book").
Where("submission_id = ?", submissionID).
Select()
return
@ -86,7 +86,8 @@ func (db *pgDB) GetSubmission(submissionID string) (submission []Submission, err
func (db *pgDB) GetUserSubmissions(userName string) (submission []Submission, err error) {
err = db.sql.Model(&submission).
Column("Book", "User").
Relation("Book").
Relation("User").
Where("username = ?", userName).
Order("last_modified DESC").
Select()