Repository navigation
fix(db): treat files in db/schema/ beside db/schema.ts as schema files - #504
Merged
cpojer merged 1 commit intoOct 20, 2026
Merged
Conversation
This file contains hidden or 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
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.
Refs #472
Same cause as #472, hit by the default output of
void gen model. The #472 layout is not fixed here.void gen modelwritesdb/schema/<name>.ts, re-exports it fromdb/schema.ts, and the generated file importssqlfromvoid/db.When
db/schema.tsexists, the plugin treats only that file as a schema file.db/schema/<name>.tsgetsvirtual:void-db, which imports the schema, so the import goes around:db/schema.ts→db/schema/<name>.ts→virtual:void-db→db/schema.ts. In dev,sqlis not ready yet and every page that importsvoid/dbreturns 500 (TypeError: __vite_ssr_import_1__.sql is not a function).vp build→vp previewworks.To reproduce:
This PR also treats files under
db/schema/as schema files whendb/schema.tsexists. The folder comes frompaths.schemaDir, the same pathgen modelwrites to.Out of scope: the #472 layout (a file outside
db/schema/re-exported fromdb/schema.ts). Moving thedrizzle-ormre-export above the schema import invirtual:void-dbmakessqlready in dev for that case too (checked locally), but it makes the import order matter, so it is not in this PR.Checked:
plugin-drizzle.test.ts(1 new test, fails without the fix)voidgen model: dev (500 → 200) andvp build→vp preview(200 before and after)14 tests in
init.test.tsand 1 innitro.test.tsfail locally on main too. This PR adds no new failures.