From 56e22fae6f983fb4f1935aea42d6a1f8261e6836 Mon Sep 17 00:00:00 2001 From: Yanislav Igonin Date: Thu, 11 Nov 2021 11:10:12 +0200 Subject: [PATCH] feat: decided to write own migrator --- db/db.go | 10 ---------- go.mod | 4 ++-- go.sum | 9 ++++----- migrations/{20211031083929_init.up.sql => 1-init.sql} | 0 ...osts_archivation.up.sql => 2-posts_archivation.sql} | 0 migrations/20211031083929_init.down.sql | 2 -- migrations/20211031085620_posts_archivation.down.sql | 2 -- 7 files changed, 6 insertions(+), 21 deletions(-) rename migrations/{20211031083929_init.up.sql => 1-init.sql} (100%) rename migrations/{20211031085620_posts_archivation.up.sql => 2-posts_archivation.sql} (100%) delete mode 100644 migrations/20211031083929_init.down.sql delete mode 100644 migrations/20211031085620_posts_archivation.down.sql diff --git a/db/db.go b/db/db.go index 1ca633c..e0b9ee0 100644 --- a/db/db.go +++ b/db/db.go @@ -23,15 +23,5 @@ func Init() { } func Migrate() { - // m, err := migrate.New("file://migrations", Config.Db.Url) - // if err != nil { - // log.Panicln(err) - // } - // err = m.Up() - // if err != nil && err != migrate.ErrNoChange { - // log.Panicln(err) - // } - // m.Close() - // TODO: check another libraries log.Println("database migrations - online") } diff --git a/go.mod b/go.mod index a447df8..8dc38b9 100644 --- a/go.mod +++ b/go.mod @@ -7,18 +7,18 @@ require ( github.com/disintegration/imaging v1.6.2 github.com/gin-gonic/gin v1.7.4 github.com/go-playground/validator/v10 v10.9.0 // indirect - github.com/golang-migrate/migrate v3.5.4+incompatible // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/jackc/pgtype v1.8.1 github.com/jackc/pgx/v4 v4.13.0 github.com/jackc/puddle v1.1.4 // indirect github.com/joho/godotenv v1.3.0 github.com/json-iterator/go v1.1.12 // indirect + github.com/lib/pq v1.10.3 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/ugorji/go v1.2.6 // indirect github.com/ulule/limiter/v3 v3.8.0 - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index 88ce5ba..7d1a84f 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,6 @@ github.com/go-redis/redis/v8 v8.4.2/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hb github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA= -github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -137,8 +135,9 @@ github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ic github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg= +github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -221,8 +220,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/migrations/20211031083929_init.up.sql b/migrations/1-init.sql similarity index 100% rename from migrations/20211031083929_init.up.sql rename to migrations/1-init.sql diff --git a/migrations/20211031085620_posts_archivation.up.sql b/migrations/2-posts_archivation.sql similarity index 100% rename from migrations/20211031085620_posts_archivation.up.sql rename to migrations/2-posts_archivation.sql diff --git a/migrations/20211031083929_init.down.sql b/migrations/20211031083929_init.down.sql deleted file mode 100644 index f79db12..0000000 --- a/migrations/20211031083929_init.down.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE files; -DROP TABLE posts; diff --git a/migrations/20211031085620_posts_archivation.down.sql b/migrations/20211031085620_posts_archivation.down.sql deleted file mode 100644 index 77be642..0000000 --- a/migrations/20211031085620_posts_archivation.down.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE posts -DROP COLUMN is_archived;