From 61a31a697758f41462262568dc351ea8be0eeb35 Mon Sep 17 00:00:00 2001 From: Ron Rise Date: Tue, 29 Jul 2025 12:14:57 -0400 Subject: [PATCH] migrations --- go.mod | 4 ++++ go.sum | 10 ++++++++++ main.go | 22 ++++++++++++++++++++-- migrations/000001_initial_db.down.sql | 2 ++ migrations/000001_initial_db.up.sql | 23 +++++++++++++++++++++++ sql/client.go | 22 ++++++++++++++++++++++ 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 migrations/000001_initial_db.down.sql create mode 100644 migrations/000001_initial_db.up.sql diff --git a/go.mod b/go.mod index f0b5a01..c277a6f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,10 @@ require ( require ( github.com/dustin/go-humanize v1.0.1 // indirect + github.com/golang-migrate/migrate/v4 v4.18.3 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -18,6 +21,7 @@ require ( github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect + go.uber.org/atomic v1.7.0 // indirect golang.org/x/crypto v0.40.0 // indirect golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect golang.org/x/net v0.42.0 // indirect diff --git a/go.sum b/go.sum index 4e6a011..db4160c 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,15 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4B/swMiAmDLs= +github.com/golang-migrate/migrate/v4 v4.18.3/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY= 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/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/labstack/echo/v4 v4.11.1 h1:dEpLU2FLg4UVmvCGPuk/APjlH6GDpbEPti61srUUUs4= github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ= github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA= @@ -39,6 +46,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -47,6 +55,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= diff --git a/main.go b/main.go index 426204a..0aa2e5c 100644 --- a/main.go +++ b/main.go @@ -4,8 +4,10 @@ import ( "flag" "git.siteworxpro.com/gun-manager/Handlers/Guns" "git.siteworxpro.com/gun-manager/sql" + _ "github.com/golang-migrate/migrate/v4/source/file" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" + log2 "github.com/labstack/gommon/log" "log" "os" ) @@ -21,12 +23,27 @@ func main() { os.Exit(1) } - _, err := sql.NewDb(dbFile) + e := echo.New() + e.HideBanner = true + e.HidePort = true + + e.Logger.SetOutput(os.Stdout) + e.Logger.SetLevel(log2.INFO) + + db, err := sql.NewDb(dbFile) if err != nil { log.Fatal(err) } - e := echo.New() + e.Logger.Infof("Using database file: %s", dbFile) + e.Logger.Infof("Running migrations for database file: %s", dbFile) + err = db.Migrate() + if err != nil { + log.Fatal(err) + } + + e.Logger.Infof("Database file %s is ready", dbFile) + e.Use(middleware.Logger()) e.Use(middleware.Recover()) e.Use(middleware.CORSWithConfig(middleware.CORSConfig{ @@ -51,5 +68,6 @@ func main() { e.DELETE("/gun/photo/:id", Guns.DeletePhoto) e.GET("/gun/photo/:id/:size/:filename", Guns.GetPhotoResize) + e.Logger.Info("Starting server on port 8000") e.Logger.Fatal(e.Start(":8000")) } diff --git a/migrations/000001_initial_db.down.sql b/migrations/000001_initial_db.down.sql new file mode 100644 index 0000000..307d797 --- /dev/null +++ b/migrations/000001_initial_db.down.sql @@ -0,0 +1,2 @@ +drop table photos; +drop table guns; \ No newline at end of file diff --git a/migrations/000001_initial_db.up.sql b/migrations/000001_initial_db.up.sql new file mode 100644 index 0000000..c6d65d8 --- /dev/null +++ b/migrations/000001_initial_db.up.sql @@ -0,0 +1,23 @@ +create table if not exists guns +( + id integer + constraint id + primary key autoincrement, + make text, + model text, + serial_number text, + purchase_amount integer, + value_amount integer, + date_purchased text, + notes text +); + +create table if not exists photos +( + id integer + constraint id + primary key autoincrement, + gun_id integer, + photo blob, + filename text +); \ No newline at end of file diff --git a/sql/client.go b/sql/client.go index 4ed9a6e..527bdbf 100644 --- a/sql/client.go +++ b/sql/client.go @@ -3,7 +3,10 @@ package sql import ( "context" "database/sql" + "errors" sqlc "git.siteworxpro.com/gun-manager/sql/db" + "github.com/golang-migrate/migrate/v4" + "github.com/golang-migrate/migrate/v4/database/sqlite3" _ "modernc.org/sqlite" ) @@ -42,3 +45,22 @@ func NewDb(file string) (*Db, error) { func GetDb() *Db { return &dbConnection } + +func (d *Db) Migrate() error { + i, err := sqlite3.WithInstance(dbConnection.db, &sqlite3.Config{}) + if err != nil { + return err + } + + m, err := migrate.NewWithDatabaseInstance("file://migrations", "sqlite3", i) + if err != nil { + return err + } + + err = m.Up() + if err != nil && !errors.Is(err, migrate.ErrNoChange) { + return err + } + + return nil +}