Skip to content

chore: Move httpapi, httpmw, & database into coderd #568

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

Merged
merged 11 commits into from
Mar 25, 2022
Merged

chore: Move httpapi, httpmw, & database into coderd #568

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ba7c7fe
chore(cdr): Move httpmw to /coderd directory
Emyrk Mar 25, 2022
8147977
chore(cdr): Move httpapi to /coderd directory
Emyrk Mar 25, 2022
54f426f
chore(cdr): Move database to /coderd directory
Emyrk Mar 25, 2022
b4cbadb
go fmt
Emyrk Mar 25, 2022
f1df027
Merge remote-tracking branch 'origin/main' into stevenmasley/pkg_move…
Emyrk Mar 25, 2022
ebae075
go fmt
Emyrk Mar 25, 2022
bb06734
Adjust import mistakes from merge
Emyrk Mar 25, 2022
319e40d
Update database path in Makefile
Emyrk Mar 25, 2022
5d02d1e
Update database path in codecov & gitattributes
Emyrk Mar 25, 2022
b63f084
Hardcode database path
Emyrk Mar 25, 2022
457b21a
Change Makefile database/generate to correct path
Emyrk Mar 25, 2022
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
Prev Previous commit
Next Next commit
Update database path in Makefile
  • Loading branch information
@Emyrk
Emyrk committed Mar 25, 2022
commit 319e40dba304b141c80331f971124fab7d72c9cc
21 changes: 11 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
INSTALL_DIR=$(shell go env GOPATH)/bin
GOOS=$(shell go env GOOS)
GOARCH=$(shell go env GOARCH)
DATABASE_DIR=coderd/database

bin:
goreleaser build --snapshot --rm-dist
Expand All @@ -10,14 +11,14 @@ build: site/out bin
.PHONY: build

# Runs migrations to output a dump of the database.
database/dump.sql: $(wildcard database/migrations/*.sql)
go run database/dump/main.go
$(DATABASE_DIR)/dump.sql: $(wildcard database/migrations/*.sql)
go run $(DATABASE_DIR)/dump/main.go

# Generates Go code for querying the database.
database/generate: fmt/sql database/dump.sql database/query.sql
cd database && sqlc generate && rm db_tmp.go
cd database && gofmt -w -r 'Querier -> querier' *.go
cd database && gofmt -w -r 'Queries -> sqlQuerier' *.go
database/generate: fmt/sql $(DATABASE_DIR)/dump.sql $(DATABASE_DIR)/query.sql
cd $(DATABASE_DIR) && sqlc generate && rm db_tmp.go
cd $(DATABASE_DIR) && gofmt -w -r 'Querier -> querier' *.go
cd $(DATABASE_DIR) && gofmt -w -r 'Queries -> sqlQuerier' *.go
.PHONY: database/generate

fmt/prettier:
Expand All @@ -30,13 +31,13 @@ else
endif
.PHONY: fmt/prettier

fmt/sql: ./database/query.sql
fmt/sql: ./$(DATABASE_DIR)/query.sql
npx sql-formatter \
--language postgresql \
--lines-between-queries 2 \
./database/query.sql \
--output ./database/query.sql
sed -i 's/@ /@/g' ./database/query.sql
./$(DATABASE_DIR)/query.sql \
--output ./$(DATABASE_DIR)/query.sql
sed -i 's/@ /@/g' ./$(DATABASE_DIR)/query.sql

fmt: fmt/prettier fmt/sql
.PHONY: fmt
Expand Down