tapdb+sqlc: sqlc: add script to merge SQL migrations into consolidated schemas #1387
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 13404212592Details
💛 - Coveralls |
guggero
requested changes
Feb 17, 2025
Roasbeef
force-pushed
the
unified-schema
branch
from
07b47bc to
cc06e9c
Compare
Roasbeef
requested review from
guggero,
a team and
GeorgeTsagk
and removed request for
a team
guggero
approved these changes
Feb 18, 2025
Roasbeef
force-pushed
the
unified-schema
branch
from
cc06e9c to
0141cb4
Compare
This commit introduces a new Go script located in `cmd/merge-sql-schemas/main.go` that consolidates SQL migration files into a single schema file. The script reads all `.up.sql` migration files from the `tapdb/sqlc/migrations` directory, executes them in order on an in-memory SQLite database, and retrieves the final schema definitions for tables and views. Additionally, the Makefile is updated to include a call to this new script during the SQL code generation process. The `.gitignore` file is that temporary or unwanted files do not clutter the repository. also modified to exclude files matching the pattern `.aider*`, ensuring
This commit checks in the unified schema using the script added in the prior commit.
Roasbeef
force-pushed
the
unified-schema
branch
from
0141cb4 to
7fa601d
Compare
guggero
requested changes
Feb 19, 2025
| @@ -252,9 +252,17 @@ sqlc: | |||
| @$(call print, "Merging SQL migrations into consolidated schemas") | |||
| go run ./cmd/merge-sql-schemas/main.go | |||
|
|
|||
| sqlc-check: sqlc | |||
| sqlc-check: | |||
There was a problem hiding this comment.
Why did you remove the dependency on the sqlc target? Now it won't actually generate the schema anymore to see if there's a diff.
There was a problem hiding this comment.
My bad, missed this. I removed it to verify that the bash fragment I had worked (so I could remove the file, then run the check w/o it adding the file again).
guggero
added a commit
that referenced
this pull request
Feb 20, 2025
Fixes incorrect removal of the sqlc target in #1387. Without this dependency, the check doesn't actually check anything.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR, we introduce a new Go script located in
cmd/merge-sql-schemas/main.gothat consolidates SQL migration filesinto a single schema file. The script reads all
.up.sqlmigrationfiles from the
tapdb/sqlc/migrationsdirectory, executes them in orderon an in-memory SQLite database, and retrieves the final schema
definitions for tables and views.
Additionally, the Makefile is updated to include a call to this new
script during the SQL code generation process. The
.gitignorefile isthat temporary or unwanted files do not clutter the repository.
also modified to exclude files matching the pattern
.aider*, ensuringWhen I was making #1386, I made a few mistakes along the way as I was looking at the initial migration file, but later migration files ended up modifying a schema I was trying to migrate. With this, devs can look in a single place for the latest set of schemas.
Fixes #1062