From 4aa45419137f09606316079b02b4f8e39d35b1a2 Mon Sep 17 00:00:00 2001 From: Nicola Zangrandi Date: Fri, 21 Feb 2025 08:33:00 +0100 Subject: [PATCH] refactor(go): migrate to GORM with pure Go SQLite driver --- go.mod | 21 ++++++++++++-- go.sum | 34 ++++++++++++++++++++-- main.go | 87 +++++++++++++++++---------------------------------------- 3 files changed, 76 insertions(+), 66 deletions(-) diff --git a/go.mod b/go.mod index c850a6f..80a018e 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,23 @@ module notes go 1.24 -require github.com/mattn/go-sqlite3 v1.14.24 +require ( + github.com/glebarez/sqlite v1.11.0 + github.com/google/uuid v1.6.0 + gorm.io/gorm v1.25.12 +) -require github.com/google/uuid v1.6.0 +require ( + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/glebarez/go-sqlite v1.21.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/text v0.14.0 // indirect + modernc.org/libc v1.22.5 // indirect + modernc.org/mathutil v1.5.0 // indirect + modernc.org/memory v1.5.0 // indirect + modernc.org/sqlite v1.23.1 // indirect +) diff --git a/go.sum b/go.sum index 22c220f..d1cf4b2 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,34 @@ +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= +github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= +github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= +github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= -github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= +gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= +modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= +modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= +modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= +modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= +modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= +modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= diff --git a/main.go b/main.go index fcc3285..144234d 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,6 @@ package main import ( - "database/sql" "embed" "encoding/json" "log" @@ -12,8 +11,9 @@ import ( "strings" "time" + "github.com/glebarez/sqlite" "github.com/google/uuid" - _ "github.com/mattn/go-sqlite3" + "gorm.io/gorm" ) func serveStaticFile(w http.ResponseWriter, r *http.Request, prefix string) error { @@ -74,34 +74,24 @@ func serveStaticFile(w http.ResponseWriter, r *http.Request, prefix string) erro var frontend embed.FS type Note struct { - ID string `json:"id"` - Title string `json:"title"` - Content string `json:"content"` + ID string `json:"id" gorm:"primaryKey"` + Title string `json:"title" gorm:"not null"` + Content string `json:"content" gorm:"not null"` CreatedAt time.Time `json:"createdAt"` UpdatedAt time.Time `json:"updatedAt"` } -var db *sql.DB +var db *gorm.DB func main() { var err error - db, err = sql.Open("sqlite3", "notes.db") + db, err = gorm.Open(sqlite.Open("notes.db"), &gorm.Config{}) if err != nil { log.Fatal(err) } - defer db.Close() - // Create notes table - _, err = db.Exec(` - CREATE TABLE IF NOT EXISTS notes ( - id TEXT PRIMARY KEY, - title TEXT NOT NULL, - content TEXT NOT NULL, - created_at DATETIME NOT NULL, - updated_at DATETIME NOT NULL - ) - `) - if err != nil { + // Auto migrate the schema + if err := db.AutoMigrate(&Note{}); err != nil { log.Fatal(err) } @@ -114,8 +104,8 @@ func main() { return } - _, err := db.Exec("DELETE FROM notes") - if err != nil { + if err := db.Session(&gorm.Session{AllowGlobalUpdate: true}).Delete(&Note{}).Error; err != nil { + log.Printf("ERROR: Failed to reset database: %v", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -132,28 +122,12 @@ func main() { func handleNotes(w http.ResponseWriter, r *http.Request) { switch r.Method { case "GET": - rows, err := db.Query(` - SELECT id, title, content, created_at, updated_at - FROM notes - ORDER BY updated_at DESC - `) - if err != nil { + var notes []Note + if err := db.Order("updated_at desc").Find(¬es).Error; err != nil { log.Printf("ERROR: Failed to query notes: %v", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } - defer rows.Close() - - var notes []Note - for rows.Next() { - var n Note - err := rows.Scan(&n.ID, &n.Title, &n.Content, &n.CreatedAt, &n.UpdatedAt) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - notes = append(notes, n) - } json.NewEncoder(w).Encode(notes) @@ -168,11 +142,7 @@ func handleNotes(w http.ResponseWriter, r *http.Request) { // Generate a new UUID for the note note.ID = uuid.New().String() - _, err := db.Exec(` - INSERT INTO notes (id, title, content, created_at, updated_at) - VALUES (?, ?, ?, ?, ?) - `, note.ID, note.Title, note.Content, note.CreatedAt, note.UpdatedAt) - if err != nil { + if err := db.Create(¬e).Error; err != nil { log.Printf("ERROR: Failed to create note: %v", err) http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -191,16 +161,11 @@ func handleNote(w http.ResponseWriter, r *http.Request) { switch r.Method { case "GET": var note Note - err := db.QueryRow(` - SELECT id, title, content, created_at, updated_at - FROM notes - WHERE id = ? - `, id).Scan(¬e.ID, ¬e.Title, ¬e.Content, ¬e.CreatedAt, ¬e.UpdatedAt) - if err == sql.ErrNoRows { - http.NotFound(w, r) - return - } - if err != nil { + if err := db.First(¬e, "id = ?", id).Error; err != nil { + if err == gorm.ErrRecordNotFound { + http.NotFound(w, r) + return + } log.Printf("ERROR: Failed to get note %s: %v", id, err) http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -215,20 +180,18 @@ func handleNote(w http.ResponseWriter, r *http.Request) { return } - _, err := db.Exec(` - UPDATE notes - SET title = ?, content = ?, updated_at = ? - WHERE id = ? - `, note.Title, note.Content, note.UpdatedAt, id) - if err != nil { + if err := db.Model(&Note{}).Where("id = ?", id).Updates(map[string]interface{}{ + "title": note.Title, + "content": note.Content, + "updated_at": note.UpdatedAt, + }).Error; err != nil { log.Printf("ERROR: Failed to update note %s: %v", id, err) http.Error(w, err.Error(), http.StatusInternalServerError) return } case "DELETE": - _, err := db.Exec("DELETE FROM notes WHERE id = ?", id) - if err != nil { + if err := db.Delete(&Note{}, "id = ?", id).Error; err != nil { log.Printf("ERROR: Failed to delete note %s: %v", id, err) http.Error(w, err.Error(), http.StatusInternalServerError) return