Skip to content

Commit b4ec3ac

Browse files
committed
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into beta
2 parents 2d149cd + fc7f280 commit b4ec3ac

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

changelogs/drizzle-kit/0.29.1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix SingleStore generate migrations command

drizzle-kit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@
142142
"default": "./api.mjs"
143143
}
144144
}
145-
}
145+
}

drizzle-kit/src/cli/schema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export const generate = command({
9797
} else if (dialect === 'turso') {
9898
await prepareAndMigrateLibSQL(opts);
9999
} else if (dialect === 'singlestore') {
100-
await prepareAndMigrateSqlite(opts);
100+
await prepareAndMigrateSingleStore(opts);
101101
} else {
102102
assertUnreachable(dialect);
103103
}

drizzle-kit/vitest.config.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ export default defineConfig({
55
test: {
66
include: [
77
'tests/**/*.test.ts',
8+
// Need to test it first before pushing changes
9+
// 'tests/singlestore-schemas.test.ts',
10+
// 'tests/singlestore-views.test.ts',
11+
// 'tests/push/singlestore-push.test.ts',
12+
// 'tests/push/singlestore.test.ts',
813
],
914

1015
// This one was excluded because we need to modify an API for SingleStore-generated columns.

drizzle-orm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@
204204
"zod": "^3.20.2",
205205
"zx": "^7.2.2"
206206
}
207-
}
207+
}

drizzle-orm/type-tests/singlestore/tables.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ Expect<
512512
});
513513

514514
const t = customText('name').notNull();
515-
516515
Expect<
517516
Equal<
518517
{

0 commit comments

Comments
 (0)