Merge pull request #3916 from drizzle-team/beta

Beta

Author: AndriiSherman

changelogs/drizzle-kit/0.30.2.md

@@ -0,0 +1 @@
+- Fix certificates generation utility for Drizzle Studio; [[BUG]: [drizzle-kit]: drizzle-kit dependency on drizzle-studio perms error](https://github.com/drizzle-team/drizzle-orm/issues/3729)

changelogs/drizzle-orm/0.29.5.md

@@ -67,7 +67,7 @@ await migrate(db, {
 });
 ```
 
-### 🎉 SQLite Proxy bacth and Relational Queries support
+### 🎉 SQLite Proxy batch and Relational Queries support
 
 - You can now use `.query.findFirst` and `.query.findMany` syntax with sqlite proxy driver
 

changelogs/drizzle-orm/0.38.4.md

@@ -0,0 +1,3 @@
+- New SingleStore type `vector` - thanks @mitchwadair
+- Fix wrong DROP INDEX statement generation, [#3866](https://github.com/drizzle-team/drizzle-orm/pull/3866) - thanks @WaciX
+- Typo fixes - thanks @stephan281094

drizzle-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.30.1",
+	"version": "0.30.2",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

drizzle-kit/src/introspect-singlestore.ts

@@ -49,6 +49,7 @@ const singlestoreImportsList = new Set([
 	'tinyint',
 	'varbinary',
 	'varchar',
+	'vector',
 	'year',
 	'enum',
 ]);
@@ -789,6 +790,16 @@ const column = (
 		return out;
 	}
 
+	if (lowered.startsWith('vector')) {
+		const [dimensions, elementType] = lowered.substring('vector'.length + 1, lowered.length - 1).split(',');
+		let out = `${casing(name)}: vector(${
+			dbColumnName({ name, casing: rawCasing, withMode: true })
+		}{ dimensions: ${dimensions}, elementType: ${elementType} })`;
+
+		out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : '';
+		return out;
+	}
+
 	console.log('uknown', type);
 	return `// Warning: Can't parse ${type} from database\n\t// ${type}Type: ${type}("${name}")`;
 };

drizzle-kit/src/serializer/singlestoreSerializer.ts

@@ -130,7 +130,7 @@ export const generateSingleStoreSnapshot = (
 					if (typeof column.default === 'string') {
 						columnToSet.default = `'${column.default}'`;
 					} else {
-						if (sqlTypeLowered === 'json') {
+						if (sqlTypeLowered === 'json' || Array.isArray(column.default)) {
 							columnToSet.default = `'${JSON.stringify(column.default)}'`;
 						} else if (column.default instanceof Date) {
 							if (sqlTypeLowered === 'date') {

drizzle-kit/src/sqlgenerator.ts

@@ -3557,8 +3557,12 @@ class PgDropIndexConvertor extends Convertor {
 	}
 
 	convert(statement: JsonDropIndexStatement): string {
+		const { schema } = statement;
 		const { name } = PgSquasher.unsquashIdx(statement.data);
-		return `DROP INDEX "${name}";`;
+
+		const indexNameWithSchema = schema ? `"${schema}"."${name}"` : `"${name}"`;
+
+		return `DROP INDEX ${indexNameWithSchema};`;
 	}
 }
 

drizzle-kit/src/utils/certs.ts

@@ -1,29 +1,38 @@
 import envPaths from 'env-paths';
 import { mkdirSync } from 'fs';
 import { access, readFile } from 'fs/promises';
+import { exec, ExecOptions } from 'node:child_process';
 import { join } from 'path';
-import { $ } from 'zx';
 
-const p = envPaths('drizzle-studio', {
-	suffix: '',
-});
-
-$.verbose = false;
-$.cwd = p.data;
-mkdirSync(p.data, { recursive: true });
+export function runCommand(command: string, options: ExecOptions = {}) {
+	return new Promise<{ exitCode: number }>((resolve) => {
+		exec(command, options, (error) => {
+			return resolve({ exitCode: error?.code ?? 0 });
+		});
+	});
+}
 
 export const certs = async () => {
-	const res = await $`mkcert --help`.nothrow();
-
-	// ~/.local/share/drizzle-studio
-	const keyPath = join(p.data, 'localhost-key.pem');
-	const certPath = join(p.data, 'localhost.pem');
+	const res = await runCommand('mkcert --help');
 
 	if (res.exitCode === 0) {
+		const p = envPaths('drizzle-studio', {
+			suffix: '',
+		});
+
+		// create ~/.local/share/drizzle-studio
+		mkdirSync(p.data, { recursive: true });
+
+		// ~/.local/share/drizzle-studio
+		const keyPath = join(p.data, 'localhost-key.pem');
+		const certPath = join(p.data, 'localhost.pem');
+
 		try {
+			// check if the files exist
 			await Promise.all([access(keyPath), access(certPath)]);
 		} catch (e) {
-			await $`mkcert localhost`.nothrow();
+			// if not create them
+			await runCommand(`mkcert localhost`, { cwd: p.data });
 		}
 		const [key, cert] = await Promise.all([
 			readFile(keyPath, { encoding: 'utf-8' }),
@@ -33,5 +42,3 @@ export const certs = async () => {
 	}
 	return null;
 };
-
-certs();

drizzle-kit/tests/push/singlestore.test.ts

@@ -23,6 +23,7 @@ import {
 	tinyint,
 	varbinary,
 	varchar,
+	vector,
 	year,
 } from 'drizzle-orm/singlestore-core';
 import getPort from 'get-port';
@@ -249,6 +250,13 @@ const singlestoreSuite: DialectSuite = {
 				columnNotNull: binary('column_not_null', { length: 1 }).notNull(),
 				columnDefault: binary('column_default', { length: 12 }),
 			}),
+
+			allVectors: singlestoreTable('all_vectors', {
+				vectorSimple: vector('vector_simple', { dimensions: 1 }),
+				vectorElementType: vector('vector_element_type', { dimensions: 1, elementType: 'I8' }),
+				vectorNotNull: vector('vector_not_null', { dimensions: 1 }).notNull(),
+				vectorDefault: vector('vector_default', { dimensions: 1 }).default([1]),
+			}),
 		};
 
 		const { statements } = await diffTestSchemasPushSingleStore(

drizzle-orm/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-orm",
-	"version": "0.38.3",
+	"version": "0.38.4",
 	"description": "Drizzle ORM package for SQL databases",
 	"type": "module",
 	"scripts": {

drizzle-orm/src/singlestore-core/columns/all.ts

@@ -21,6 +21,7 @@ import { timestamp } from './timestamp.ts';
 import { tinyint } from './tinyint.ts';
 import { varbinary } from './varbinary.ts';
 import { varchar } from './varchar.ts';
+import { vector } from './vector.ts';
 import { year } from './year.ts';
 
 export function getSingleStoreColumnBuilders() {
@@ -51,6 +52,7 @@ export function getSingleStoreColumnBuilders() {
 		tinyint,
 		varbinary,
 		varchar,
+		vector,
 		year,
 	};
 }

drizzle-orm/src/singlestore-core/columns/index.ts

@@ -22,4 +22,5 @@ export * from './timestamp.ts';
 export * from './tinyint.ts';
 export * from './varbinary.ts';
 export * from './varchar.ts';
+export * from './vector.ts';
 export * from './year.ts';

drizzle-orm/src/singlestore-core/columns/vector.ts

@@ -0,0 +1,83 @@
+import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts';
+import type { ColumnBaseConfig } from '~/column.ts';
+import { entityKind } from '~/entity.ts';
+import type { AnySingleStoreTable } from '~/singlestore-core/table.ts';
+import { SQL } from '~/sql/index.ts';
+import { getColumnNameAndConfig } from '~/utils.ts';
+import { SingleStoreColumn, SingleStoreColumnBuilder, SingleStoreGeneratedColumnConfig } from './common.ts';
+
+export type SingleStoreVectorBuilderInitial<TName extends string> = SingleStoreVectorBuilder<{
+	name: TName;
+	dataType: 'array';
+	columnType: 'SingleStoreVector';
+	data: Array<number>;
+	driverParam: string;
+	enumValues: undefined;
+}>;
+
+export class SingleStoreVectorBuilder<T extends ColumnBuilderBaseConfig<'array', 'SingleStoreVector'>>
+	extends SingleStoreColumnBuilder<T, SingleStoreVectorConfig>
+{
+	static override readonly [entityKind]: string = 'SingleStoreVectorBuilder';
+
+	constructor(name: T['name'], config: SingleStoreVectorConfig) {
+		super(name, 'array', 'SingleStoreVector');
+		this.config.dimensions = config.dimensions;
+		this.config.elementType = config.elementType;
+	}
+
+	/** @internal */
+	override build<TTableName extends string>(
+		table: AnySingleStoreTable<{ name: TTableName }>,
+	): SingleStoreVector<MakeColumnConfig<T, TTableName>> {
+		return new SingleStoreVector<MakeColumnConfig<T, TTableName>>(
+			table,
+			this.config as ColumnBuilderRuntimeConfig<any, any>,
+		);
+	}
+
+	/** @internal */
+	override generatedAlwaysAs(as: SQL<unknown> | (() => SQL) | T['data'], config?: SingleStoreGeneratedColumnConfig) {
+		throw new Error('not implemented');
+	}
+}
+
+export class SingleStoreVector<T extends ColumnBaseConfig<'array', 'SingleStoreVector'>>
+	extends SingleStoreColumn<T, SingleStoreVectorConfig>
+{
+	static override readonly [entityKind]: string = 'SingleStoreVector';
+
+	dimensions: number = this.config.dimensions;
+	elementType: ElementType | undefined = this.config.elementType;
+
+	getSQLType(): string {
+		return `vector(${this.dimensions}, ${this.elementType || 'F32'})`;
+	}
+
+	override mapToDriverValue(value: Array<number>) {
+		return JSON.stringify(value);
+	}
+
+	override mapFromDriverValue(value: string): Array<number> {
+		return JSON.parse(value);
+	}
+}
+
+type ElementType = 'I8' | 'I16' | 'I32' | 'I64' | 'F32' | 'F64';
+
+export interface SingleStoreVectorConfig {
+	dimensions: number;
+	elementType?: ElementType;
+}
+
+export function vector(
+	config: SingleStoreVectorConfig,
+): SingleStoreVectorBuilderInitial<''>;
+export function vector<TName extends string>(
+	name: TName,
+	config: SingleStoreVectorConfig,
+): SingleStoreVectorBuilderInitial<TName>;
+export function vector(a: string | SingleStoreVectorConfig, b?: SingleStoreVectorConfig) {
+	const { name, config } = getColumnNameAndConfig<SingleStoreVectorConfig>(a, b);
+	return new SingleStoreVectorBuilder(name, config);
+}

drizzle-orm/src/singlestore-core/expressions.ts

@@ -23,3 +23,12 @@ export function substring(
 	chunks.push(sql`)`);
 	return sql.join(chunks);
 }
+
+// Vectors
+export function dotProduct(column: SingleStoreColumn | SQL.Aliased, value: Array<number>): SQL {
+	return sql`${column} <*> ${JSON.stringify(value)}`;
+}
+
+export function euclideanDistance(column: SingleStoreColumn | SQL.Aliased, value: Array<number>): SQL {
+	return sql`${column} <-> ${JSON.stringify(value)}`;
+}

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

@@ -34,6 +34,7 @@ import {
 	uniqueIndex,
 	varbinary,
 	varchar,
+	vector,
 	year,
 } from '~/singlestore-core/index.ts';
 import { singlestoreSchema } from '~/singlestore-core/schema.ts';
@@ -917,6 +918,8 @@ Expect<
 		varchar: varchar('varchar', { length: 1 }),
 		varchar2: varchar('varchar2', { length: 1, enum: ['a', 'b', 'c'] }),
 		varchardef: varchar('varchardef', { length: 1 }).default(''),
+		vector: vector('vector', { dimensions: 1 }),
+		vector2: vector('vector2', { dimensions: 1, elementType: 'I8' }),
 		year: year('year'),
 		yeardef: year('yeardef').default(0),
 	});
@@ -1015,6 +1018,8 @@ Expect<
 		varchar: varchar({ length: 1 }),
 		varchar2: varchar({ length: 1, enum: ['a', 'b', 'c'] }),
 		varchardef: varchar({ length: 1 }).default(''),
+		vector: vector({ dimensions: 1 }),
+		vector2: vector({ dimensions: 1, elementType: 'I8' }),
 		year: year(),
 		yeardef: year().default(0),
 	});

integration-tests/tests/singlestore/singlestore-common.ts

@@ -58,8 +58,10 @@ import {
 	uniqueIndex,
 	uniqueKeyName,
 	varchar,
+	vector,
 	year,
 } from 'drizzle-orm/singlestore-core';
+import { dotProduct, euclideanDistance } from 'drizzle-orm/singlestore-core/expressions';
 import { migrate } from 'drizzle-orm/singlestore/migrator';
 import getPort from 'get-port';
 import { v4 as uuid } from 'uuid';
@@ -156,6 +158,12 @@ const aggregateTable = singlestoreTable('aggregate_table', {
 	nullOnly: int('null_only'),
 });
 
+const vectorSearchTable = singlestoreTable('vector_search', {
+	id: serial('id').notNull(),
+	text: text('text').notNull(),
+	embedding: vector('embedding', { dimensions: 10 }),
+});
+
 // To test another schema and multischema
 const mySchema = singlestoreSchema(`mySchema`);
 
@@ -366,6 +374,31 @@ export function tests(driver?: string) {
 			]);
 		}
 
+		async function setupVectorSearchTest(db: TestSingleStoreDB) {
+			await db.execute(sql`drop table if exists \`vector_search\``);
+			await db.execute(
+				sql`
+					create table \`vector_search\` (
+						\`id\` integer primary key auto_increment not null,
+						\`text\` text not null,
+						\`embedding\` vector(10) not null
+					)
+				`,
+			);
+			await db.insert(vectorSearchTable).values([
+				{
+					id: 1,
+					text: 'I like dogs',
+					embedding: [0.6119, 0.1395, 0.2921, 0.3664, 0.4561, 0.7852, 0.1997, 0.5142, 0.5924, 0.0465],
+				},
+				{
+					id: 2,
+					text: 'I like cats',
+					embedding: [0.6075, 0.1705, 0.0651, 0.9489, 0.9656, 0.8084, 0.3046, 0.0977, 0.6842, 0.4402],
+				},
+			]);
+		}
+
 		test('table config: unsigned ints', async () => {
 			const unsignedInts = singlestoreTable('cities1', {
 				bigint: bigint('bigint', { mode: 'number', unsigned: true }),
@@ -2907,6 +2940,36 @@ export function tests(driver?: string) {
 			expect(result2[0]?.value).toBe(null);
 		});
 
+		test('simple vector search', async (ctx) => {
+			const { db } = ctx.singlestore;
+			const table = vectorSearchTable;
+			const embedding = [0.42, 0.93, 0.88, 0.57, 0.32, 0.64, 0.76, 0.52, 0.19, 0.81]; // ChatGPT's 10 dimension embedding for "dogs are cool" not sure how accurate but it works
+			await setupVectorSearchTest(db);
+
+			const withRankEuclidean = db.select({
+				id: table.id,
+				text: table.text,
+				rank: sql`row_number() over (order by ${euclideanDistance(table.embedding, embedding)})`.as('rank'),
+			}).from(table).as('with_rank');
+			const withRankDotProduct = db.select({
+				id: table.id,
+				text: table.text,
+				rank: sql`row_number() over (order by ${dotProduct(table.embedding, embedding)})`.as('rank'),
+			}).from(table).as('with_rank');
+			const result1 = await db.select({ id: withRankEuclidean.id, text: withRankEuclidean.text }).from(
+				withRankEuclidean,
+			).where(eq(withRankEuclidean.rank, 1));
+			const result2 = await db.select({ id: withRankDotProduct.id, text: withRankDotProduct.text }).from(
+				withRankDotProduct,
+			).where(eq(withRankDotProduct.rank, 1));
+
+			expect(result1.length).toEqual(1);
+			expect(result1[0]).toEqual({ id: 1, text: 'I like dogs' });
+
+			expect(result2.length).toEqual(1);
+			expect(result2[0]).toEqual({ id: 1, text: 'I like dogs' });
+		});
+
 		test('test $onUpdateFn and $onUpdate works as $default', async (ctx) => {
 			const { db } = ctx.singlestore;