From b05de1617c7ad323f582f7392e4e62c1f08af58e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 1 Aug 2024 21:02:30 +0900 Subject: refactor: run code generation by `go generate` --- backend/Makefile | 10 +++------- backend/gen/gen.go | 4 ++++ backend/gen/oapi-codegen.yaml | 10 ++++++++++ backend/gen/sqlc.yaml | 11 +++++++++++ backend/oapi-codegen.yaml | 10 ---------- backend/sqlc.yaml | 11 ----------- 6 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 backend/gen/gen.go create mode 100644 backend/gen/oapi-codegen.yaml create mode 100644 backend/gen/sqlc.yaml delete mode 100644 backend/oapi-codegen.yaml delete mode 100644 backend/sqlc.yaml (limited to 'backend') diff --git a/backend/Makefile b/backend/Makefile index 3b26e00..72d3314 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -10,10 +10,6 @@ check: lint: go vet ./... -.PHONY: oapi-codegen -oapi-codegen: - go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config oapi-codegen.yaml ../openapi.yaml - -.PHONY: sqlc -sqlc: - go run github.com/sqlc-dev/sqlc/cmd/sqlc generate +.PHONY: gen +gen: + go generate ./... diff --git a/backend/gen/gen.go b/backend/gen/gen.go new file mode 100644 index 0000000..6af912d --- /dev/null +++ b/backend/gen/gen.go @@ -0,0 +1,4 @@ +package main + +//go:generate go run github.com/sqlc-dev/sqlc/cmd/sqlc generate +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config oapi-codegen.yaml ../../openapi.yaml diff --git a/backend/gen/oapi-codegen.yaml b/backend/gen/oapi-codegen.yaml new file mode 100644 index 0000000..d235096 --- /dev/null +++ b/backend/gen/oapi-codegen.yaml @@ -0,0 +1,10 @@ +package: api +generate: + models: true + echo-server: true + strict-server: true + embedded-spec: true +output: ../api/generated.go +output-options: + skip-prune: true + nullable-type: true diff --git a/backend/gen/sqlc.yaml b/backend/gen/sqlc.yaml new file mode 100644 index 0000000..c56e44b --- /dev/null +++ b/backend/gen/sqlc.yaml @@ -0,0 +1,11 @@ +version: "2" +sql: + - engine: "postgresql" + queries: "../query.sql" + schema: "../schema.sql" + gen: + go: + package: "db" + out: "../db" + sql_package: "pgx/v5" + emit_pointers_for_null_types: true diff --git a/backend/oapi-codegen.yaml b/backend/oapi-codegen.yaml deleted file mode 100644 index 65cf079..0000000 --- a/backend/oapi-codegen.yaml +++ /dev/null @@ -1,10 +0,0 @@ -package: api -generate: - models: true - echo-server: true - strict-server: true - embedded-spec: true -output: api/generated.go -output-options: - skip-prune: true - nullable-type: true diff --git a/backend/sqlc.yaml b/backend/sqlc.yaml deleted file mode 100644 index 3b2d1d0..0000000 --- a/backend/sqlc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -version: "2" -sql: - - engine: "postgresql" - queries: "query.sql" - schema: "schema.sql" - gen: - go: - package: "db" - out: "db" - sql_package: "pgx/v5" - emit_pointers_for_null_types: true -- cgit v1.2.3-70-g09d2