fix blob column type

singlestore-labs · Dec 16, 2024 · 683bb23 · 683bb23
1 parent 6dc290a
commit 683bb23
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 25 deletions.
diff --git a/drizzle-kit/src/serializer/singlestoreSerializer.ts b/drizzle-kit/src/serializer/singlestoreSerializer.ts
@@ -129,6 +129,8 @@ export const generateSingleStoreSnapshot = (
 				} else {
 					if (typeof column.default === 'string') {
 						columnToSet.default = `'${column.default}'`;
+					} else if (typeof column.default === 'bigint') {
+						columnToSet.default = Number(column.default);
 					} else {
 						if (sqlTypeLowered === 'json') {
 							columnToSet.default = `'${JSON.stringify(column.default)}'`;

diff --git a/drizzle-kit/src/snapshotsDiffer.ts b/drizzle-kit/src/snapshotsDiffer.ts
@@ -2686,19 +2686,6 @@ export const applyMysqlSnapshotsDiff = async (
 	};
 };
 
-// This is necessary to make sure that BigInt is serialized to Number
-// at the diffSchemasOrTables function. Ohterwise, it will be serialized to BigInt
-// and the diff will throw the following error
-// "TypeError: Do not know how to serialize a BigInt"
-
-declare global {
-    interface BigInt {
-        toJSON(): Number;
-    }
-}
-
-BigInt.prototype.toJSON = function () { return Number(this) }
-
 export const applySingleStoreSnapshotsDiff = async (
 	json1: SingleStoreSchemaSquashed,
 	json2: SingleStoreSchemaSquashed,

diff --git a/drizzle-kit/tests/push/singlestore.test.ts b/drizzle-kit/tests/push/singlestore.test.ts
@@ -257,7 +257,7 @@ const singlestoreSuite: DialectSuite = {
 				jsonSimple: blob('json_simple', { mode: 'json' }),
 				jsonColumnNotNull: blob('json_column_not_null', { mode: 'json' }).notNull(),
 				jsonColumnDefault: blob('json_column_default', { mode: 'json' }).default('{"hello":"world"}'),
-			})
+			}),
 		};
 
 		const { statements } = await diffTestSchemasPushSingleStore(
@@ -268,7 +268,6 @@ const singlestoreSuite: DialectSuite = {
 			'drizzle',
 			false,
 		);
-		console.log(statements);
 		expect(statements.length).toBe(0);
 		expect(statements).toEqual([]);
 

diff --git a/drizzle-orm/src/singlestore-core/columns/blob.ts b/drizzle-orm/src/singlestore-core/columns/blob.ts
@@ -29,7 +29,10 @@ export class SingleStoreBigIntBuilder<T extends ColumnBuilderBaseConfig<'bigint'
 	override build<TTableName extends string>(
 		table: AnySingleStoreTable<{ name: TTableName }>,
 	): SingleStoreBigInt<MakeColumnConfig<T, TTableName>> {
-		return new SingleStoreBigInt<MakeColumnConfig<T, TTableName>>(table, this.config as ColumnBuilderRuntimeConfig<any>);
+		return new SingleStoreBigInt<MakeColumnConfig<T, TTableName>>(
+			table,
+			this.config as ColumnBuilderRuntimeConfig<any>,
+		);
 	}
 }
 
@@ -48,8 +51,8 @@ export class SingleStoreBigInt<T extends ColumnBaseConfig<'bigint', 'SingleStore
 		return BigInt(String.fromCodePoint(...value));
 	}
 
-	override mapToDriverValue(value: bigint): Buffer {
-		return Buffer.from(value.toString());
+	override mapToDriverValue(value: bigint): string {
+		return value.toString();
 	}
 }
 
@@ -82,7 +85,9 @@ export class SingleStoreBlobJsonBuilder<T extends ColumnBuilderBaseConfig<'json'
 	}
 }
 
-export class SingleStoreBlobJson<T extends ColumnBaseConfig<'json', 'SingleStoreBlobJson'>> extends SingleStoreColumn<T> {
+export class SingleStoreBlobJson<T extends ColumnBaseConfig<'json', 'SingleStoreBlobJson'>>
+	extends SingleStoreColumn<T>
+{
 	static override readonly [entityKind]: string = 'SingleStoreBlobJson';
 
 	getSQLType(): string {
@@ -104,8 +109,8 @@ export class SingleStoreBlobJson<T extends ColumnBaseConfig<'json', 'SingleStore
 		return JSON.parse(String.fromCodePoint(...value));
 	}
 
-	override mapToDriverValue(value: T['data']): Buffer {
-		return Buffer.from(JSON.stringify(value));
+	override mapToDriverValue(value: T['data']): string {
+		return JSON.stringify(value);
 	}
 }
 
@@ -131,11 +136,16 @@ export class SingleStoreBlobBufferBuilder<T extends ColumnBuilderBaseConfig<'buf
 	override build<TTableName extends string>(
 		table: AnySingleStoreTable<{ name: TTableName }>,
 	): SingleStoreBlobBuffer<MakeColumnConfig<T, TTableName>> {
-		return new SingleStoreBlobBuffer<MakeColumnConfig<T, TTableName>>(table, this.config as ColumnBuilderRuntimeConfig<any>);
+		return new SingleStoreBlobBuffer<MakeColumnConfig<T, TTableName>>(
+			table,
+			this.config as ColumnBuilderRuntimeConfig<any>,
+		);
 	}
 }
 
-export class SingleStoreBlobBuffer<T extends ColumnBaseConfig<'buffer', 'SingleStoreBlobBuffer'>> extends SingleStoreColumn<T> {
+export class SingleStoreBlobBuffer<T extends ColumnBaseConfig<'buffer', 'SingleStoreBlobBuffer'>>
+	extends SingleStoreColumn<T>
+{
 	static override readonly [entityKind]: string = 'SingleStoreBlobBuffer';
 
 	getSQLType(): string {

diff --git a/drizzle-orm/src/singlestore-core/columns/index.ts b/drizzle-orm/src/singlestore-core/columns/index.ts
@@ -1,6 +1,6 @@
-export * from './blob.ts';
 export * from './bigint.ts';
 export * from './binary.ts';
+export * from './blob.ts';
 export * from './boolean.ts';
 export * from './char.ts';
 export * from './common.ts';

diff --git a/drizzle-orm/type-tests/singlestore/tables.ts b/drizzle-orm/type-tests/singlestore/tables.ts
@@ -2,9 +2,9 @@ import { type Equal, Expect } from 'type-tests/utils.ts';
 import type { BuildColumn } from '~/column-builder.ts';
 import { eq } from '~/expressions.ts';
 import {
-	blob,
 	bigint,
 	binary,
+	blob,
 	boolean,
 	char,
 	customType,