[FEATURE]:Support multiple branch development ?

[abcfy2]

Describe what you want

When we develop on different branches, will cause migrate sql lost when merge.

This because of the sql:

Query: CREATE SCHEMA IF NOT EXISTS "drizzle"
Query: 
			CREATE TABLE IF NOT EXISTS "drizzle"."__drizzle_migrations" (
				id SERIAL PRIMARY KEY,
				hash text NOT NULL,
				created_at bigint
			)
		
Query: select id, hash, created_at from "drizzle"."__drizzle_migrations" order by created_at desc limit 1
Query: begin
Query: commit

When I generate migrate sql on different branches, will cause conflict. See the final result:

❯ tree drizzle
drizzle
├── 0000_calm_talos.sql
├── 0001_reflective_malice.sql
├── 0002_careful_northstar.sql
├── 0003_blushing_martin_li.sql
├── 0004_bumpy_katie_power.sql
├── 0004_even_cyclops.sql
├── 0006_luxuriant_bloodscream.sql
└── meta
    ├── 0000_snapshot.json
    ├── 0001_snapshot.json
    ├── 0002_snapshot.json
    ├── 0003_snapshot.json
    ├── 0004_snapshot.json
    ├── 0006_snapshot.json
    └── _journal.json

2 directories, 14 files

You can see there're 2 0004_ sqls here.

So if 0004_even_cyclops.sql first migrate, then merge branch with file 0004_bumpy_katie_power.sql, will cause 0004_bumpy_katie_power.sql never execute, this because the sql of migrate:

select id, hash, created_at from "drizzle"."__drizzle_migrations" order by created_at desc limit 1

I hope you can support multiple branches development. Thanks.

[croshim]

Hi, any updates on that? How should we work with migrations if multiple developers are working in various branches and creating migrations?

[kevinob11]

Any updates here? I've run into this a few times in my project and the biggest problem in my experience is conflicts in the snapshots and journals. They are really hard to reconcile in git because of unique keys and you end up with duplicate migrations because of it. Even just a "squash" and "fake" to make cleanup work after a bunch of churn would be a good starting point. I'm not sure if prior art is helpful, but Django ORM is incredible at reconciling branches of migrations.

[simon5454]

To avoid multi-branch migration issues, I use a dedicated branch, "drizzle-migration".

And in our package.json script, I use commands such has this:

"check-branch": "node src/lib/check-branch.mjs",
"migrations:pull-dev": "pnpm run check-branch --branchName=drizzle-migration --command=\"npx drizzle-kit pull --config=drizzle-dev.config.ts\""

[JacobReynolds]

Bumping this issue. This is a pretty critical component to being able to use drizzle on larger teams.