Add more bugfixes

Author: dankochetov

changelogs/drizzle-orm/0.23.6.md

@@ -1,3 +1,6 @@
 - 🐛 Fixed referencing the selected aliased field in the same query
 - 🐛 Fixed decimal column data type in MySQL
 - 🐛 Fixed mode autocompletion for integer column in SQLite
+- 🐛 Fixed extra parentheses in the generated SQL for the `IN` operator (#383)
+- 🐛 Fixed regression in `pgEnum.enumValues` type (#358)
+- 🎉 Allowed readonly arrays to be passed to `pgEnum`

drizzle-orm/package.json

@@ -126,6 +126,7 @@
     "sql.js": "^1.8.0",
     "sqlite3": "^5.1.2",
     "vite-tsconfig-paths": "^4.0.7",
-    "vitest": "^0.29.8"
+    "vitest": "^0.29.8",
+    "zod": "^3.20.2"
   }
 }

drizzle-orm/src/mysql-core/columns/enum.ts

@@ -42,9 +42,9 @@ export class MySqlEnumColumnBuilder<T extends ColumnBuilderBaseConfig>
 }
 
 export class MySqlEnumColumn<T extends ColumnBaseConfig>
-	extends MySqlColumn<MySqlEnumColumnHKT, T, { values: string[] }>
+	extends MySqlColumn<MySqlEnumColumnHKT, T, { values: readonly string[] }>
 {
-	readonly values: string[] = this.config.values;
+	readonly values: readonly string[] = this.config.values;
 
 	getSQLType(): string {
 		return `enum(${this.values.map((value) => `'${value}'`).join(',')})`;
@@ -53,8 +53,9 @@ export class MySqlEnumColumn<T extends ColumnBaseConfig>
 
 export function mysqlEnum<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(
 	name: TName,
-	values: Writable<T>,
-): MySqlEnumColumnBuilderInitial<TName, Writable<T>> {
+	values: T | Writable<T>,
+): MySqlEnumColumnBuilderInitial<TName, Writable<T>>;
+export function mysqlEnum(name: string, values: string[]) {
 	if (values.length === 0) throw Error(`You have an empty array for "${name}" enum values`);
 
 	return new MySqlEnumColumnBuilder(name, values);

drizzle-orm/src/pg-core/columns/enum.ts

@@ -27,7 +27,7 @@ export interface PgEnum<TValues extends [string, ...string[]]> {
 	<TName extends string>(name: TName): PgEnumColumnBuilderInitial<TName, TValues>;
 
 	readonly enumName: string;
-	readonly enumValues: string[];
+	readonly enumValues: TValues;
 	/** @internal */
 	[isPgEnumSym]: true;
 }
@@ -71,7 +71,7 @@ export class PgEnumColumn<T extends ColumnBaseConfig> extends PgColumn<PgEnumCol
 // Gratitude to zod for the enum function types
 export function pgEnum<U extends string, T extends Readonly<[U, ...U[]]>>(
 	enumName: string,
-	values: Writable<T>,
+	values: T | Writable<T>,
 ): PgEnum<Writable<T>> {
 	const enumInstance = Object.assign(
 		<TName extends string>(name: TName): PgEnumColumnBuilderInitial<TName, Writable<T>> =>

drizzle-orm/src/sql/expressions/conditions.ts

@@ -172,7 +172,7 @@ export function inArray(
 		if (values.length === 0) {
 			throw new Error('inArray requires at least one value');
 		}
-		return sql`${column} in (${values.map((v) => bindIfParam(v, column))})`;
+		return sql`${column} in ${values.map((v) => bindIfParam(v, column))}`;
 	}
 
 	return sql`${column} in ${bindIfParam(values, column)}`;

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

@@ -365,3 +365,9 @@ Expect<
 		col1: decimal('col1').default('1'),
 	});
 }
+
+{
+	const a = ['a', 'b', 'c'] as const;
+	const test1 = mysqlEnum('test', a);
+	const test2 = mysqlEnum('test', ['a', 'b', 'c']);
+}

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

@@ -1,5 +1,6 @@
 import type { Equal } from 'type-tests/utils';
 import { Expect } from 'type-tests/utils';
+import { z } from 'zod';
 import { eq, gt } from '~/expressions';
 import {
 	bigint,
@@ -749,3 +750,14 @@ await db.refreshMaterializedView(newYorkers2).withNoData().concurrently();
 	});
 	Expect<Equal<{ col1: string }, InferModel<typeof test>>>;
 }
+
+{
+	const a = ['a', 'b', 'c'] as const;
+	const b = pgEnum('test', a);
+	const c = z.enum(b.enumValues);
+}
+
+{
+	const b = pgEnum('test', ['a', 'b', 'c']);
+	const c = z.enum(b.enumValues);
+}