queries in one file

coder · coadler · Apr 1, 2022 · Mar 31, 2022 · Mar 31, 2022 · Mar 31, 2022
commit 03b80051bbe3ecae17cc4fa5702dec558ddf53ba
diff --git a/Makefile b/Makefile
@@ -16,9 +16,7 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
 
 # Generates Go code for querying the database.
 coderd/database/generate: fmt/sql coderd/database/dump.sql $(wildcard coderd/database/queries/*.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
+	coderd/database/generate.sh
 .PHONY: coderd/database/generate
 
 fmt/prettier:
@@ -32,6 +30,7 @@ endif
 .PHONY: fmt/prettier
 
 fmt/sql: $(wildcard coderd/database/queries/*.sql)
+	# TODO: this is slightly slow
 	for fi in coderd/database/queries/*.sql; do \
 		npx sql-formatter \
 			--language postgresql \

diff --git a/coderd/database/apikeys.sql.go b/coderd/database/apikeys.sql.go
diff --git a/coderd/database/files.sql.go b/coderd/database/files.sql.go
diff --git a/coderd/database/generate.sh b/coderd/database/generate.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+cd "$(dirname "$0")"
+
+sqlc generate
+
+first=true
+for fi in queries/*.sql.go; do
+    cut=$(grep -n ')' "$fi" | head -n 1 | cut -d: -f1)
+    cut=$((cut + 1))
+
+    if $first; then
+        head -n 4 < "$fi" | grep -v "source" > queries.sql.go
+        first=false
+    fi
+
+    tail -n "+$cut" < "$fi" >> queries.sql.go
+done
+
+rm -f queries/*.go
+
+goimports -w queries.sql.go
+gofmt -w -r 'Querier -> querier' -- *.go
+gofmt -w -r 'Queries -> sqlQuerier' -- *.go
diff --git a/coderd/database/organizationmembers.sql.go b/coderd/database/organizationmembers.sql.go