Merge branch 'fix-empty-array-generation' of https://github.com/L-Mar…

…io564/drizzle-orm into fix-empty-array-generation
drizzle-team · Aug 7, 2024 · ca314f1 · ca314f1
2 parents 39c1419 + c7b5d8f
commit ca314f1
Show file tree

Hide file tree

Showing 12 changed files with 733 additions and 303 deletions.
diff --git a/changelogs/drizzle-orm/0.32.2.md b/changelogs/drizzle-orm/0.32.2.md
@@ -0,0 +1,4 @@
+- Fix AWS Data API type hints bugs in RQB
+- Fix set transactions in MySQL bug - thanks @roguesherlock
+- Add forwaring dependencies within useLiveQuery, fixes [#2651](https://github.com/drizzle-team/drizzle-orm/issues/2651) - thanks @anstapol 
+- Export additional types from SQLite package, like `AnySQLiteUpdate` - thanks @veloii
diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-orm",
-	"version": "0.32.1",
+	"version": "0.32.2",
 	"description": "Drizzle ORM package for SQL databases",
 	"type": "module",
 	"scripts": {

diff --git a/drizzle-orm/src/expo-sqlite/query.ts b/drizzle-orm/src/expo-sqlite/query.ts
@@ -7,6 +7,7 @@ import { SQLiteRelationalQuery } from '~/sqlite-core/query-builders/query.ts';
 
 export const useLiveQuery = <T extends Pick<AnySQLiteSelect, '_' | 'then'> | SQLiteRelationalQuery<'sync', unknown>>(
 	query: T,
+	deps: unknown[] = [],
 ) => {
 	const [data, setData] = useState<Awaited<T>>(
 		(is(query, SQLiteRelationalQuery) && query.mode === 'first' ? undefined : []) as Awaited<T>,
@@ -43,7 +44,7 @@ export const useLiveQuery = <T extends Pick<AnySQLiteSelect, '_' | 'then'> | SQL
 		return () => {
 			listener?.remove();
 		};
-	}, []);
+	}, deps);
 
 	return {
 		data,

diff --git a/drizzle-orm/src/mysql-core/session.ts b/drizzle-orm/src/mysql-core/session.ts
@@ -98,7 +98,7 @@ export abstract class MySqlSession<
 			parts.push(`isolation level ${config.isolationLevel}`);
 		}
 
-		return parts.length ? sql.join(['set transaction ', parts.join(' ')]) : undefined;
+		return parts.length ? sql`set transaction ${sql.raw(parts.join(' '))}` : undefined;
 	}
 
 	protected getStartTransactionSQL(config: MySqlTransactionConfig): SQL | undefined {
@@ -112,7 +112,7 @@ export abstract class MySqlSession<
 			parts.push(config.accessMode);
 		}
 
-		return parts.length ? sql.join(['start transaction ', parts.join(' ')]) : undefined;
+		return parts.length ? sql`start transaction ${sql.raw(parts.join(' '))}` : undefined;
 	}
 }
 

diff --git a/drizzle-orm/src/sql/sql.ts b/drizzle-orm/src/sql/sql.ts
@@ -213,7 +213,7 @@ export class SQL<T = unknown> implements SQLWrapper {
 					return { sql: this.mapInlineParam(mappedValue, config), params: [] };
 				}
 
-				let typings: QueryTypingsValue[] | undefined;
+				let typings: QueryTypingsValue[] = ['none'];
 				if (prepareTyping) {
 					typings = [prepareTyping(chunk.encoder)];
 				}
@@ -263,7 +263,7 @@ export class SQL<T = unknown> implements SQLWrapper {
 				return { sql: this.mapInlineParam(chunk, config), params: [] };
 			}
 
-			return { sql: escapeParam(paramStartIndex.value++, chunk), params: [chunk] };
+			return { sql: escapeParam(paramStartIndex.value++, chunk), params: [chunk], typings: ['none'] };
 		}));
 	}
 

diff --git a/drizzle-orm/src/sqlite-core/query-builders/update.ts b/drizzle-orm/src/sqlite-core/query-builders/update.ts
@@ -134,7 +134,7 @@ export type SQLiteUpdate<
 	TReturning extends Record<string, unknown> | undefined = Record<string, unknown> | undefined,
 > = SQLiteUpdateBase<TTable, TResultType, TRunResult, TReturning, true, never>;
 
-type AnySQLiteUpdate = SQLiteUpdateBase<any, any, any, any, any, any>;
+export type AnySQLiteUpdate = SQLiteUpdateBase<any, any, any, any, any, any>;
 
 export interface SQLiteUpdateBase<
 	TTable extends SQLiteTable = SQLiteTable,

diff --git a/integration-tests/package.json b/integration-tests/package.json
@@ -8,7 +8,7 @@
 		"test": "pnpm test:vitest",
 		"test:vitest": "vitest run",
 		"test:esm": "node tests/imports.test.mjs && node tests/imports.test.cjs",
-		"test:data-api": "sst shell vitest run tests/awsdatapi.test.ts"
+		"test:data-api": "sst shell vitest run tests/pg/awsdatapi.test.ts"
 	},
 	"keywords": [],
 	"author": "Drizzle Team",

diff --git a/integration-tests/tests/mysql/mysql-common.ts b/integration-tests/tests/mysql/mysql-common.ts
@@ -2059,6 +2059,45 @@ export function tests(driver?: string) {
 			await db.execute(sql`drop table ${products}`);
 		});
 
+		test('transaction with options (set isolationLevel)', async (ctx) => {
+			const { db } = ctx.mysql;
+
+			const users = mysqlTable('users_transactions', {
+				id: serial('id').primaryKey(),
+				balance: int('balance').notNull(),
+			});
+			const products = mysqlTable('products_transactions', {
+				id: serial('id').primaryKey(),
+				price: int('price').notNull(),
+				stock: int('stock').notNull(),
+			});
+
+			await db.execute(sql`drop table if exists ${users}`);
+			await db.execute(sql`drop table if exists ${products}`);
+
+			await db.execute(sql`create table users_transactions (id serial not null primary key, balance int not null)`);
+			await db.execute(
+				sql`create table products_transactions (id serial not null primary key, price int not null, stock int not null)`,
+			);
+
+			const [{ insertId: userId }] = await db.insert(users).values({ balance: 100 });
+			const user = await db.select().from(users).where(eq(users.id, userId)).then((rows) => rows[0]!);
+			const [{ insertId: productId }] = await db.insert(products).values({ price: 10, stock: 10 });
+			const product = await db.select().from(products).where(eq(products.id, productId)).then((rows) => rows[0]!);
+
+			await db.transaction(async (tx) => {
+				await tx.update(users).set({ balance: user.balance - product.price }).where(eq(users.id, user.id));
+				await tx.update(products).set({ stock: product.stock - 1 }).where(eq(products.id, product.id));
+			}, { isolationLevel: 'serializable' });
+
+			const result = await db.select().from(users);
+
+			expect(result).toEqual([{ id: 1, balance: 90 }]);
+
+			await db.execute(sql`drop table ${users}`);
+			await db.execute(sql`drop table ${products}`);
+		});
+
 		test('transaction rollback', async (ctx) => {
 			const { db } = ctx.mysql;
 

diff --git a/integration-tests/tests/mysql/mysql-planetscale.test.ts b/integration-tests/tests/mysql/mysql-planetscale.test.ts
@@ -59,6 +59,7 @@ skipTests([
 	// to redefine in this file
 	'utc config for datetime',
 	'transaction',
+	'transaction with options (set isolationLevel)',
 	'having',
 	'select count()',
 	'insert via db.execute w/ query builder',

diff --git a/integration-tests/tests/mysql/mysql-proxy.test.ts b/integration-tests/tests/mysql/mysql-proxy.test.ts
@@ -129,6 +129,7 @@ skipTests([
 	'nested transaction',
 	'transaction rollback',
 	'transaction',
+	'transaction with options (set isolationLevel)',
 	'migrator',
 ]);
 

diff --git a/integration-tests/tests/mysql/tidb-serverless.test.ts b/integration-tests/tests/mysql/tidb-serverless.test.ts
@@ -66,6 +66,7 @@ skipTests([
 	'select iterator w/ prepared statement',
 	'select iterator',
 	'transaction',
+	'transaction with options (set isolationLevel)',
 	'Insert all defaults in multiple rows',
 	'Insert all defaults in 1 row',
 	'$default with empty array',