Merge branch 'main' of github.com:drizzle-team/drizzle-orm into beta

singlestore-labs · Dec 9, 2024 · b4ec3ac · b4ec3ac
2 parents 2d149cd + fc7f280
commit b4ec3ac
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/changelogs/drizzle-kit/0.29.1.md b/changelogs/drizzle-kit/0.29.1.md
@@ -0,0 +1 @@
+- Fix SingleStore generate migrations command
diff --git a/drizzle-kit/package.json b/drizzle-kit/package.json
@@ -142,4 +142,4 @@
 			"default": "./api.mjs"
 		}
 	}
-}
+}
diff --git a/drizzle-kit/src/cli/schema.ts b/drizzle-kit/src/cli/schema.ts
@@ -97,7 +97,7 @@ export const generate = command({
 		} else if (dialect === 'turso') {
 			await prepareAndMigrateLibSQL(opts);
 		} else if (dialect === 'singlestore') {
-			await prepareAndMigrateSqlite(opts);
+			await prepareAndMigrateSingleStore(opts);
 		} else {
 			assertUnreachable(dialect);
 		}

diff --git a/drizzle-kit/vitest.config.ts b/drizzle-kit/vitest.config.ts
@@ -5,6 +5,11 @@ export default defineConfig({
 	test: {
 		include: [
 			'tests/**/*.test.ts',
+			// Need to test it first before pushing changes
+			// 'tests/singlestore-schemas.test.ts',
+			// 'tests/singlestore-views.test.ts',
+			// 'tests/push/singlestore-push.test.ts',
+			// 'tests/push/singlestore.test.ts',
 		],
 
 		// This one was excluded because we need to modify an API for SingleStore-generated columns.

diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json
@@ -204,4 +204,4 @@
 		"zod": "^3.20.2",
 		"zx": "^7.2.2"
 	}
-}
+}
diff --git a/drizzle-orm/type-tests/singlestore/tables.ts b/drizzle-orm/type-tests/singlestore/tables.ts
@@ -512,7 +512,6 @@ Expect<
 	});
 
 	const t = customText('name').notNull();
-
 	Expect<
 		Equal<
 			{
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,4 +142,4 @@ @@
     			"default": "./api.mjs"
     		}
     	}
-    }
+    }