Merge branch 'beta' into transactions

.eslintrc.yaml

@@ -0,0 +1,19 @@
+root: true
+extends:
+  - 'plugin:@typescript-eslint/base'
+parser: '@typescript-eslint/parser'
+plugins:
+  - import
+  - unused-imports
+rules:
+  '@typescript-eslint/consistent-type-imports':
+    - error
+    - disallowTypeAnnotations: false
+      fixStyle: inline-type-imports
+  import/no-cycle: error
+  import/no-self-import: error
+  import/no-empty-named-blocks: error
+  unused-imports/no-unused-imports: error
+  import/no-useless-path-segments: error
+  import/newline-after-import: error
+  import/no-duplicates: error

README.md

@@ -70,7 +70,7 @@ export const users = pgTable('users', {
   id: serial('id').primaryKey(),
   fullName: text('full_name').notNull(),
   phone: varchar('phone', { length: 20 }).notNull(),
-  role: text<'user' | 'admin'>('role').default('user').notNull(),
+  role: text('role', { enum: ['user', 'admin'] }).default('user').notNull(),
   cityId: integer('city_id').references(() => cities.id),
   createdAt: timestamp('created_at').defaultNow().notNull(),
   updatedAt: timestamp('updated_at').defaultNow().notNull(),

changelogs/drizzle-orm/0.23.6.md

@@ -0,0 +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 (#382)
+- 🐛 Fixed regression in `pgEnum.enumValues` type (#358)
+- 🎉 Allowed readonly arrays to be passed to `pgEnum`

changelogs/drizzle-orm/0.23.7.md

@@ -0,0 +1 @@
+- 🎉 Added `INSERT IGNORE` support for MySQL (#305)

changelogs/drizzle-orm/0.23.8.md

@@ -0,0 +1 @@
+- 🎉 Fixed dates timezone differences for timestamps in Postgres and MySQL (contributed by @AppelBoomHD via #288)

changelogs/drizzle-zod/0.2.1.md

@@ -0,0 +1 @@
+- 🐛 Fix insert schemas generation

drizzle-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.23.5",
+  "version": "0.23.8",
   "description": "Drizzle ORM package for SQL databases",
   "scripts": {
     "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
@@ -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/decimal.ts

@@ -15,8 +15,8 @@ export interface MySqlDecimalHKT extends ColumnHKTBase {
 
 export type MySqlDecimalBuilderInitial<TName extends string> = MySqlDecimalBuilder<{
 	name: TName;
-	data: number;
-	driverParam: number | string;
+	data: string;
+	driverParam: string;
 	notNull: false;
 	hasDefault: false;
 }>;

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/mysql-core/columns/timestamp.ts

@@ -50,7 +50,11 @@ export class MySqlTimestamp<T extends ColumnBaseConfig>
 	}
 
 	override mapFromDriverValue(value: string): Date {
-		return new Date(value);
+		return new Date(value + '+0000');
+	}
+
+	override mapToDriverValue(value: Date): string {
+		return value.toISOString().slice(0, 19).replace('T', ' ');
 	}
 }
 

drizzle-orm/src/mysql-core/db.ts

@@ -41,7 +41,7 @@ export class MySqlDatabase<TQueryResult extends QueryResultHKT> {
 
 				return new Proxy(
 					new WithSubquery(qb.getSQL(), qb.getSelectedFields() as SelectedFields, alias, true),
-					new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }),
+					new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }),
 				) as WithSubqueryWithSelection<TSelection, TAlias>;
 			},
 		};

drizzle-orm/src/mysql-core/dialect.ts

@@ -292,7 +292,7 @@ export class MySqlDialect {
 		return sql`${withSql}select ${selection} from ${table}${joinsSql}${whereSql}${groupBySql}${havingSql}${orderBySql}${limitSql}${offsetSql}${lockingClausesSql}`;
 	}
 
-	buildInsertQuery({ table, values, onConflict, returning }: MySqlInsertConfig): SQL {
+	buildInsertQuery({ table, values, ignore, onConflict, returning }: MySqlInsertConfig): SQL {
 		const isSingleValue = values.length === 1;
 		const valuesSqlList: ((SQLChunk | SQL)[] | SQL)[] = [];
 		const columns: Record<string, AnyMySqlColumn> = table[Table.Symbol.Columns];
@@ -319,13 +319,15 @@ export class MySqlDialect {
 
 		const valuesSql = sql.fromList(valuesSqlList);
 
+		const ignoreSql = ignore ? sql` ignore` : undefined;
+
 		const returningSql = returning
 			? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}`
 			: undefined;
 
 		const onConflictSql = onConflict ? sql` on duplicate key ${onConflict}` : undefined;
 
-		return sql`insert into ${table} ${insertOrder} values ${valuesSql}${onConflictSql}`;
+		return sql`insert${ignoreSql} into ${table} ${insertOrder} values ${valuesSql}${onConflictSql}`;
 	}
 
 	sqlToQuery(sql: SQL): Query {

drizzle-orm/src/mysql-core/query-builders/insert.ts

@@ -19,6 +19,7 @@ import type { MySqlUpdateSetSource } from './update';
 export interface MySqlInsertConfig<TTable extends AnyMySqlTable = AnyMySqlTable> {
 	table: TTable;
 	values: Record<string, Param | SQL>[];
+	ignore: boolean;
 	onConflict?: SQL;
 	returning?: SelectedFieldsOrdered;
 }
@@ -32,12 +33,19 @@ export type MySqlInsertValue<TTable extends AnyMySqlTable> = Simplify<
 >;
 
 export class MySqlInsertBuilder<TTable extends AnyMySqlTable, TQueryResult extends QueryResultHKT> {
+	private shouldIgnore: boolean = false;
+
 	constructor(
 		private table: TTable,
 		private session: MySqlSession,
 		private dialect: MySqlDialect,
 	) {}
 
+	ignore(): this {
+		this.shouldIgnore = true;
+		return this;
+	}
+
 	values(value: MySqlInsertValue<TTable>): MySqlInsert<TTable, TQueryResult>;
 	values(values: MySqlInsertValue<TTable>[]): MySqlInsert<TTable, TQueryResult>;
 	/**
@@ -68,7 +76,7 @@ export class MySqlInsertBuilder<TTable extends AnyMySqlTable, TQueryResult exten
 			return result;
 		});
 
-		return new MySqlInsert(this.table, mappedValues, this.session, this.dialect);
+		return new MySqlInsert(this.table, mappedValues, this.shouldIgnore, this.session, this.dialect);
 	}
 }
 
@@ -87,11 +95,12 @@ export class MySqlInsert<TTable extends AnyMySqlTable, TQueryResult extends Quer
 	constructor(
 		table: TTable,
 		values: MySqlInsertConfig['values'],
+		ignore: boolean,
 		private session: MySqlSession,
 		private dialect: MySqlDialect,
 	) {
 		super();
-		this.config = { table, values };
+		this.config = { table, values, ignore };
 	}
 
 	onDuplicateKeyUpdate(config: {

drizzle-orm/src/mysql-core/query-builders/select.ts

@@ -182,7 +182,7 @@ export abstract class MySqlSelectQueryBuilder<
 				on = on(
 					new Proxy(
 						this.config.fields,
-						new SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' }),
+						new SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' }),
 					) as TSelection,
 				);
 			}
@@ -322,7 +322,7 @@ export abstract class MySqlSelectQueryBuilder<
 	): SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias> {
 		return new Proxy(
 			new Subquery(this.getSQL(), this.config.fields, alias),
-			new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }),
+			new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }),
 		) as SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias>;
 	}
 }

drizzle-orm/src/pg-core/README.md

@@ -382,7 +382,7 @@ const publicUsersTable = pgTable('users', {
   id: serial('id').primaryKey(),
   name: text('name').notNull(),
   verified: boolean('verified').notNull().default(false),
-  jsonb: jsonb<string[]>('jsonb'),
+  jsonb: jsonb('jsonb').$type<string[]>(),
   createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
 });
 
@@ -394,7 +394,7 @@ const usersTable = mySchema.table('users', {
   id: serial('id').primaryKey(),
   name: text('name').notNull(),
   verified: boolean('verified').notNull().default(false),
-  jsonb: jsonb<string[]>('jsonb'),
+  jsonb: jsonb('jsonb').$type<string[]>(),
   createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
 });
 ```
@@ -639,7 +639,7 @@ await db.update(users)
   .set({ name: 'Mr. Dan' })
   .where(eq(users.name, 'Dan'));
 
-const updatedUser: InferModel<typeof users> = await db.delete(users)
+const updatedUser: InferModel<typeof users> = await db.update(users)
   .set({ name: 'Mr. Dan' })
   .where(eq(users.name, 'Dan'))
   .returning();

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/pg-core/columns/timestamp.ts

@@ -61,7 +61,11 @@ export class PgTimestamp<T extends ColumnBaseConfig> extends PgColumn<PgTimestam
 	}
 
 	override mapFromDriverValue = (value: string): Date => {
-		return new Date(value);
+		return new Date(this.withTimezone ? value : value + '+0000');
+	};
+
+	override mapToDriverValue = (value: Date): string => {
+		return this.withTimezone ? value.toUTCString() : value.toISOString();
 	};
 }
 

drizzle-orm/src/pg-core/db.ts

@@ -30,7 +30,7 @@ export class PgDatabase<TQueryResult extends QueryResultHKT> {
 
 				return new Proxy(
 					new WithSubquery(qb.getSQL(), qb.getSelectedFields() as SelectedFields, alias, true),
-					new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }),
+					new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }),
 				) as WithSubqueryWithSelection<TSelection, TAlias>;
 			},
 		};

drizzle-orm/src/pg-core/query-builders/select.ts

@@ -175,7 +175,7 @@ export abstract class PgSelectQueryBuilder<
 				on = on(
 					new Proxy(
 						this.config.fields,
-						new SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' }),
+						new SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' }),
 					) as TSelection,
 				);
 			}
@@ -315,7 +315,7 @@ export abstract class PgSelectQueryBuilder<
 	): SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias> {
 		return new Proxy(
 			new Subquery(this.getSQL(), this.config.fields, alias),
-			new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }),
+			new SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }),
 		) as SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias>;
 	}
 }

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/src/sqlite-core/README.md

@@ -461,9 +461,7 @@ const users = sqliteTable('users', {
   createdAt: integer('created_at', { mode: 'timestamp' }),
 });
 
-type NewUser = InferModel<typeof users>;
-
-const db = drizzle(...);
+type NewUser = InferModel<typeof users, "insert">;
 
 const newUser: NewUser = {
   name: 'Andrew',
@@ -472,10 +470,10 @@ const newUser: NewUser = {
 
 db.insert(users).values(newUser).run();
 
-const insertedUsers/*: NewUser[]*/ = db.insert(users).values(newUsers).returning().all();
+const insertedUsers/*: NewUser[]*/ = db.insert(users).values(newUser).returning().all();
 
 const insertedUsersIds/*: { insertedId: number }[]*/ = db.insert(users)
-  .values(newUsers)
+  .values(newUser)
   .returning({ insertedId: users.id })
   .all();
 ```