Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛fix problem in the migration for catalogswriteservice #106

Merged
merged 1 commit into from
Jul 22, 2024
Merged

fix: 🐛fix problem in the migration for catalogswriteservice #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,21 @@ lint:
.PHONY: go-migrate
go-migrate:
@./scripts/go-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/go-migrate -c create -n create_product_table
@./scripts/go-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/go-migrate -c up -o postgres://postgres:postgres@localhost:5432/catalogs_service?sslmode=disable
@./scripts/go-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/go-migrate -c down -o postgres://postgres:postgres@localhost:5432/catalogs_service?sslmode=disable
@./scripts/go-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/go-migrate -c up -o postgres://postgres:postgres@localhost:5432/catalogs_write_service?sslmode=disable
@./scripts/go-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/go-migrate -c down -o postgres://postgres:postgres@localhost:5432/catalogs_write_service?sslmode=disable

# https://github.com/pressly/goose#usage
.PHONY: goose-migrate
goose-migrate:
@./scripts/goose-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/goose-migrate -c create -n create_product_table
@./scripts/goose-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/goose-migrate -c up -o "user=postgres password=postgres dbname=catalogs_service sslmode=disable"
@./scripts/goose-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/goose-migrate -c down -o "user=postgres password=postgres dbname=catalogs_service sslmode=disable"
@./scripts/goose-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/goose-migrate -c up -o "user=postgres password=postgres dbname=catalogs_write_service sslmode=disable"
@./scripts/goose-migrate.sh -p ./internal/services/catalogwriteservice/db/migrations/goose-migrate -c down -o "user=postgres password=postgres dbname=catalogs_write_service sslmode=disable"

# https://atlasgo.io/guides/orms/gorm
.PHONY: atlas
atlas:
@./scripts/atlas-migrate.sh -c gorm-sync -p "./internal/services/catalogwriteservice"
@./scripts/atlas-migrate.sh -c apply -p "./internal/services/catalogwriteservice" -o "postgres://postgres:postgres@localhost:5432/catalogs_service?sslmode=disable"
@./scripts/atlas-migrate.sh -c apply -p "./internal/services/catalogwriteservice" -o "postgres://postgres:postgres@localhost:5432/catalogs_write_service?sslmode=disable"

.PHONY: cycle-check
cycle-check:
Expand Down
2 changes: 1 addition & 1 deletion internal/services/catalogreadservice/config/config.development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"port": 27017,
"user": "admin",
"password": "admin",
"database": "catalogs_service",
"database": "catalogs_read_service",
"useAuth": true
},
"tracingOptions": {
Expand Down
2 changes: 1 addition & 1 deletion internal/services/catalogreadservice/config/config.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"port": 27017,
"user": "admin",
"password": "admin",
"database": "catalogs_service",
"database": "catalogs_read_service",
"useAuth": true
},
"tracingOptions": {
Expand Down
4 changes: 2 additions & 2 deletions internal/services/catalogwriteservice/atlas.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data "external_schema" "gorm" {

env "gorm" {
src = data.external_schema.gorm.url
dev = "postgres://postgres:postgres@localhost:5432/catalogs_service?sslmode=disable"
dev = "postgres://postgres:postgres@localhost:5432/catalogs_write_service?sslmode=disable"
migration {
dir = "file://db/migrations/atlas"
}
Expand All @@ -27,7 +27,7 @@ env "gorm" {

env "go-migrate" {
src = "file://db/migrations/go-migrate/schema.sql"
dev = "postgres://postgres:postgres@localhost:5432/catalogs_service?sslmode=disable"
dev = "postgres://postgres:postgres@localhost:5432/catalogs_write_service?sslmode=disable"
migration {
dir = "file://db/migrations/go-migrate"
format = golang-migrate
Expand Down
4 changes: 2 additions & 2 deletions internal/services/catalogwriteservice/config/config.development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"port": 5432,
"user": "postgres",
"password": "postgres",
"dbName": "catalogs_service",
"dbName": "catalogs_write_service",
"sslMode": false
},
"rabbitmqOptions": {
Expand Down Expand Up @@ -105,7 +105,7 @@
"port": 5432,
"user": "postgres",
"password": "postgres",
"dbName": "catalogs_service",
"dbName": "catalogs_write_service",
"sslMode": false,
"migrationsDir": "db/migrations/goose-migrate",
"skipMigration": false
Expand Down
4 changes: 2 additions & 2 deletions internal/services/catalogwriteservice/config/config.test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"port": 5432,
"user": "postgres",
"password": "postgres",
"dbName": "catalogs_service",
"dbName": "catalogs_write_service",
"sslMode": false
},
"rabbitmqOptions": {
Expand Down Expand Up @@ -81,7 +81,7 @@
"port": 5432,
"user": "postgres",
"password": "postgres",
"dbName": "catalogs_service",
"dbName": "catalogs_write_service",
"sslMode": false,
"migrationsDir": "db/migrations/goose-migrate",
"skipMigration": false
Expand Down
5 changes: 3 additions & 2 deletions internal/services/catalogwriteservice/db/migrations/atlas/20230919170700.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
-- Create "products" table
CREATE TABLE "public"."products" (
"product_id" text NOT NULL,
"id" text NOT NULL,
"name" text NULL,
"description" text NULL,
"price" numeric NULL,
"created_at" timestamptz NULL,
"updated_at" timestamptz NULL,
PRIMARY KEY ("product_id")
"deleted_at" timestamptz NULL,
PRIMARY KEY ("id")
);
5 changes: 3 additions & 2 deletions ...al/services/catalogwriteservice/db/migrations/atlas/goose/00002_create_products_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
CREATE TABLE IF NOT EXISTS products
(
product_id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
name text,
description text,
price numeric,
created_at timestamp with time zone,
updated_at timestamp with time zone
updated_at timestamp with time zone,
deleted_at timestamp with time zone
);
5 changes: 3 additions & 2 deletions ...services/catalogwriteservice/db/migrations/go-migrate/000002_create_products_table.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
CREATE TABLE IF NOT EXISTS products
(
product_id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
name text,
description text,
price numeric,
created_at timestamp with time zone,
updated_at timestamp with time zone
updated_at timestamp with time zone,
deleted_at timestamp with time zone
);
5 changes: 3 additions & 2 deletions .../services/catalogwriteservice/db/migrations/goose-migrate/00002_create_products_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
-- +goose StatementBegin
CREATE TABLE IF NOT EXISTS products
(
product_id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
name text,
description text,
price numeric,
created_at timestamp with time zone,
updated_at timestamp with time zone
updated_at timestamp with time zone,
deleted_at timestamp with time zone
);
-- +goose StatementEnd

Expand Down
Loading