Repository navigation
chore(db): reset drizzle migrations with baseline #142
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
947 changes: 947 additions & 0 deletions
947
frontend/db/legacy-migrations/drizzle_legacy/meta/0000_snapshot.json
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
130 changes: 130 additions & 0 deletions
130
frontend/db/legacy-migrations/drizzle_legacy/meta/_journal.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| { | ||
| "version": "7", | ||
| "dialect": "postgresql", | ||
| "entries": [ | ||
| { | ||
| "idx": 0, | ||
| "version": "7", | ||
| "when": 1765736767696, | ||
| "tag": "0000_rich_magus", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 1, | ||
| "version": "7", | ||
| "when": 1765838764737, | ||
| "tag": "0001_black_random", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 2, | ||
| "version": "7", | ||
| "when": 1765946576292, | ||
| "tag": "0002_yielding_purple_man", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 3, | ||
| "version": "7", | ||
| "when": 1765947894856, | ||
| "tag": "0003_handy_cammi", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 4, | ||
| "version": "7", | ||
| "when": 1766333819153, | ||
| "tag": "0004_tough_ultron", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 5, | ||
| "version": "7", | ||
| "when": 1766336694154, | ||
| "tag": "0005_furry_warstar", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 6, | ||
| "version": "7", | ||
| "when": 1766515642068, | ||
| "tag": "0006_minor_units_money", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 7, | ||
| "version": "7", | ||
| "when": 1766713709450, | ||
| "tag": "0007_add-payment-intent-id-to-orders", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 8, | ||
| "version": "7", | ||
| "when": 1766958940589, | ||
| "tag": "0008_dizzy_james_howlett", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 9, | ||
| "version": "7", | ||
| "when": 1767384090722, | ||
| "tag": "0009_unknown_nico_minoru", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 10, | ||
| "version": "7", | ||
| "when": 1767386213214, | ||
| "tag": "0010_parallel_princess_powerful", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 11, | ||
| "version": "7", | ||
| "when": 1767645749364, | ||
| "tag": "0011_add_orders_sweep_claim_index", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 12, | ||
| "version": "7", | ||
| "when": 1767664985434, | ||
| "tag": "0012_inventory_moves_product_fk_restrict", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 13, | ||
| "version": "7", | ||
| <<<<<<< HEAD | ||
| "when": 1768162667947, | ||
| "tag": "0013_brown_gamora", | ||
| ======= | ||
| "when": 1767697281389, | ||
| "tag": "0013_low_roughhouse", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 14, | ||
| "version": "7", | ||
| "when": 1768045270184, | ||
| "tag": "0014_dapper_kang", | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 15, | ||
| "version": "7", | ||
| "when": 1768166276337, | ||
| "tag": "0015_glamorous_eternity", | ||
| >>>>>>> b30415e (feat(auth): add email verification, password reset, and improved auth UX) | ||
| "breakpoints": true | ||
| }, | ||
| { | ||
| "idx": 14, | ||
| "version": "7", | ||
| "when": 1768304911639, | ||
| "tag": "0014_steep_kabuki", | ||
| "breakpoints": true | ||
| } | ||
| ] | ||
| } | ||
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unresolved merge conflict renders file invalid.
This file contains unresolved Git merge conflict markers (
<<<<<<< HEAD,=======,>>>>>>> b30415e), making it invalid JSON. This will cause Drizzle to fail when parsing migration metadata.The conflict shows two divergent histories:
0013_brown_gamora, then0014_steep_kabuki0013_low_roughhouse,0014_dapper_kang,0015_glamorous_eternityYou need to resolve this conflict by choosing the correct migration history or, given this PR's baseline reset objective, potentially removing the conflicting entries entirely since this is archived legacy metadata.
🔧 Suggested resolution (if keeping as archive)
If this file should preserve pre-baseline history, resolve by keeping one consistent sequence:
{ "idx": 13, "version": "7", -<<<<<<< HEAD - "when": 1768162667947, - "tag": "0013_brown_gamora", -======= "when": 1767697281389, "tag": "0013_low_roughhouse", "breakpoints": true }, { "idx": 14, "version": "7", "when": 1768045270184, "tag": "0014_dapper_kang", "breakpoints": true }, { "idx": 15, "version": "7", "when": 1768166276337, "tag": "0015_glamorous_eternity", ->>>>>>> b30415e (feat(auth): add email verification, password reset, and improved auth UX) - "breakpoints": true - }, - { - "idx": 14, - "version": "7", - "when": 1768304911639, - "tag": "0014_steep_kabuki", "breakpoints": true } ] }📝 Committable suggestion
🧰 Tools
🪛 Biome (2.1.2)
[error] 98-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: unexpected character
<(parse)
[error] 99-99: expected
,but instead foundHEADRemove HEAD
(parse)
[error] 100-100: expected
,but instead found"when"Remove "when"
(parse)
[error] 100-100: expected
,but instead found:Remove :
(parse)
[error] 100-100: expected
,but instead found1768162667947Remove 1768162667947
(parse)
[error] 101-101: expected
,but instead found:Remove :
(parse)
[error] 101-101: expected
,but instead found"0013_brown_gamora"Remove "0013_brown_gamora"
(parse)
[error] 101-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 102-102: unexpected character
=(parse)
[error] 103-103: expected
,but instead found"when"Remove "when"
(parse)
[error] 103-103: expected
,but instead found:Remove :
(parse)
[error] 103-103: expected
,but instead found1767697281389Remove 1767697281389
(parse)
[error] 104-104: expected
,but instead found:Remove :
(parse)
[error] 104-104: expected
,but instead found"0013_low_roughhouse"Remove "0013_low_roughhouse"
(parse)
[error] 105-105: expected
,but instead found:Remove :
(parse)
[error] 105-105: expected
,but instead foundtrueRemove true
(parse)
[error] 106-106: expected
,but instead found}Remove }
(parse)
[error] 106-106: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 107-113: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 113-113: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 114-118: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 118-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: unexpected character
>(parse)
[error] 119-119: String values must be double quoted.
(parse)
[error] 119-119: unexpected character
((parse)
[error] 119-119: String values must be double quoted.
(parse)
[error] 119-119: unexpected character
((parse)
[error] 119-119: String values must be double quoted.
(parse)
[error] 119-119: unexpected character
)(parse)
[error] 119-119: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 119-119: unexpected character
)(parse)
[error] 120-120: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 120-120: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 120-120: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 121-121: End of file expected
Use an array for a sequence of values:
[1, 2](parse)
[error] 122-128: End of file expected
Use an array for a sequence of values:
[1, 2](parse)