chore: split queries.sql into files by table

coder · coadler · Apr 1, 2022 · Mar 31, 2022 · Mar 31, 2022 · Mar 31, 2022
commit 8f65e1022bb0304bda4687ac4f13d74faf0ef233
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
 .PHONY: coderd/database/dump.sql
 
 # Generates Go code for querying the database.
-coderd/database/generate: fmt/sql coderd/database/dump.sql coderd/database/query.sql
+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
@@ -31,13 +31,17 @@ else
 endif
 .PHONY: fmt/prettier
 
-fmt/sql: ./coderd/database/query.sql
-	npx sql-formatter \
-		--language postgresql \
-		--lines-between-queries 2 \
-		./coderd/database/query.sql \
-		--output ./coderd/database/query.sql
-	sed -i 's/@ /@/g' ./coderd/database/query.sql
+fmt/sql: $(wildcard coderd/database/queries/*.sql)
+	for fi in coderd/database/queries/*.sql; do \
+		npx sql-formatter \
+			--language postgresql \
+			--lines-between-queries 2 \
+			--tab-indent \
+			$$fi \
+			--output $$fi; \
+	done
+
+	sed -i 's/@ /@/g' ./coderd/database/queries/*.sql
 
 fmt: fmt/prettier fmt/sql
 .PHONY: fmt

diff --git a/coderd/database/api_keys.sql.go b/coderd/database/api_keys.sql.go
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/files.sql.go b/coderd/database/files.sql.go
diff --git a/coderd/database/migrations/000002_projects.up.sql b/coderd/database/migrations/000002_projects.up.sql
@@ -33,6 +33,7 @@ CREATE TABLE projects (
 
 -- Enforces no active projects have the same name.
 CREATE UNIQUE INDEX ON projects (organization_id, name) WHERE deleted = FALSE;
+CREATE UNIQUE INDEX idx_projects_name_lower ON projects USING btree (lower(name));
 
 -- Project Versions store historical project data. When a Project Version is imported,
 -- an "import" job is queued to parse parameters. A Project Version

diff --git a/coderd/database/migrations/000003_workspaces.up.sql b/coderd/database/migrations/000003_workspaces.up.sql
@@ -12,7 +12,8 @@ CREATE TABLE workspaces (
 );
 
 -- Enforces no active workspaces have the same name.
-CREATE UNIQUE INDEX ON workspaces (owner_id, name) WHERE deleted = FALSE;
+CREATE UNIQUE INDEX ON workspaces USING btree (owner_id, name) WHERE deleted = FALSE;
+CREATE UNIQUE INDEX idx_workspaces_name_lower ON workspaces USING btree (lower(name));
 
 CREATE TYPE workspace_transition AS ENUM (
     'start',

diff --git a/coderd/database/organization_members.sql.go b/coderd/database/organization_members.sql.go