halp pls

aslilac · aslilac · commit c643ba0c0e10 · 2023-10-17T17:44:50.000Z
diff --git a/Makefile b/Makefile
@@ -419,7 +419,6 @@ lint: lint/shellcheck lint/go lint/ts lint/helm lint/site-icons
 
 lint/site-icons:
 	./scripts/check_site_icons.sh
-
 .PHONY: lint/site-icons
 
 lint/ts:
@@ -517,6 +516,8 @@ coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/dat
 	go run ./coderd/database/gen/dump/main.go
 
 # Generates Go code for querying the database.
+# coderd/database/queries.sql.go
+# coderd/database/models.go
 coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
 	./coderd/database/generate.sh
 
diff --git a/coderd/database/generate.sh b/coderd/database/generate.sh
@@ -21,7 +21,9 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 	sqlc generate
 
 	first=true
-	for fi in queries/*.sql.go; do
+	files=$(find ./queries/ -type f -name "*.sql.go" | sort)
+	for fi in $files; do
+		echo "==> $fi"
 		# Find the last line from the imports section and add 1. We have to
 		# disable pipefail temporarily to avoid ERRPIPE errors when piping into
 		# `head -n1`.
@@ -56,7 +58,7 @@ SCRIPT_DIR=$(dirname "${BASH_SOURCE[0]}")
 	go mod download
 	go run golang.org/x/tools/cmd/goimports@latest -w queries.sql.go
 
-	go run ../../scripts/dbgen/main.go
+	go run ../../scripts/dbgen
 	# This will error if a view is broken.
 	go test -run=TestViewSubset
 )
