Skip to content

Commit c56b864

Browse files
Merge branch 'beta' of github.com:drizzle-team/drizzle-orm into feature/mysql-force-index
2 parents 2b77cfc + 74a51ae commit c56b864

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
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/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/src/postgres-js/driver.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ export namespace drizzle {
119119
): PostgresJsDatabase<TSchema> & {
120120
$client: '$client is not available on drizzle.mock()';
121121
} {
122-
return construct({} as any, config) as any;
122+
return construct({
123+
options: {
124+
parsers: {},
125+
serializers: {},
126+
},
127+
} as any, config) as any;
123128
}
124129
}

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)