Change Makefile database/generate to correct path

Emyrk · Emyrk · commit 457b21aa1970 · 2022-03-25T15:57:15.000-05:00
diff --git a/Makefile b/Makefile
@@ -14,11 +14,11 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
 	go run coderd/database/dump/main.go
 
 # Generates Go code for querying the database.
-database/generate: fmt/sql coderd/database/dump.sql coderd/database/query.sql
+coderd/database/generate: fmt/sql coderd/database/dump.sql coderd/database/query.sql
 	cd coderd/database && sqlc generate && rm db_tmp.go
 	cd coderd/database && gofmt -w -r 'Querier -> querier' *.go
 	cd coderd/database && gofmt -w -r 'Queries -> sqlQuerier' *.go
-.PHONY: database/generate
+.PHONY: coderd/database/generate
 
 fmt/prettier:
 	@echo "--- prettier"
@@ -41,7 +41,7 @@ fmt/sql: ./coderd/database/query.sql
 fmt: fmt/prettier fmt/sql
 .PHONY: fmt
 
-gen: database/generate peerbroker/proto provisionersdk/proto provisionerd/proto
+gen: coderd/database/generate peerbroker/proto provisionersdk/proto provisionerd/proto
 .PHONY: gen
 
 install: bin
diff --git a/coderd/database/db.go b/coderd/database/db.go
@@ -4,8 +4,8 @@
 //
 // To modify the database schema:
 // 1. Add a new migration using "create_migration.sh" in database/migrations/
-// 2. Run "make database/generate" in the root to generate models.
-// 3. Add/Edit queries in "query.sql" and run "make database/generate" to create Go code.
+// 2. Run "make coderd/database/generate" in the root to generate models.
+// 3. Add/Edit queries in "query.sql" and run "make coderd/database/generate" to create Go code.
 package database
 
 import (
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/dump/main.go b/coderd/database/dump/main.go
@@ -76,7 +76,7 @@ func main() {
 		}
 	}
 
-	dump := fmt.Sprintf("-- Code generated by 'make database/generate'. DO NOT EDIT.\n%s", output.Bytes())
+	dump := fmt.Sprintf("-- Code generated by 'make coderd/database/generate'. DO NOT EDIT.\n%s", output.Bytes())
 	_, mainPath, _, ok := runtime.Caller(0)
 	if !ok {
 		panic("couldn't get caller path")

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func main() {`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- dump := fmt.Sprintf("-- Code generated by 'make database/generate'. DO NOT EDIT.\n%s", output.Bytes())`
	`79`	`+ dump := fmt.Sprintf("-- Code generated by 'make coderd/database/generate'. DO NOT EDIT.\n%s", output.Bytes())`
`80`	`80`	`_, mainPath, _, ok := runtime.Caller(0)`
`81`	`81`	`if !ok {`
`82`	`82`	`panic("couldn't get caller path")`