Merge pull request #354 from drizzle-team/kysely-fix

Author: dankochetov

changelogs/drizzle-orm/0.23.4.md

@@ -0,0 +1 @@
+- 🐛 Fixed broken types in Kysely and Knex adapters

drizzle-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.23.3",
+  "version": "0.23.4",
   "description": "Drizzle ORM package for SQL databases",
   "scripts": {
     "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",

drizzle-orm/src/table.ts

@@ -1,6 +1,6 @@
 import type { AnyColumn, GetColumnData } from './column';
 import type { OptionalKeyOnly, RequiredKeyOnly } from './operations';
-import type { Equal, Simplify, Update } from './utils';
+import type { Simplify, Update } from './utils';
 
 export interface TableConfig<TColumn extends AnyColumn = AnyColumn> {
 	name: string;
@@ -76,7 +76,9 @@ export function getTableName<T extends Table>(table: T): T['_']['name'] {
 }
 
 export type MapColumnName<TName extends string, TColumn extends AnyColumn, TDBColumNames extends boolean> =
-	Equal<TDBColumNames, true> extends true ? TColumn['_']['name'] : TName;
+	[TName] extends [never] ? never
+		: TDBColumNames extends true ? TColumn['_']['name']
+		: TName;
 
 export type InferModel<
 	TTable extends AnyTable,

drizzle-orm/tests/kysely/index.ts

@@ -2,6 +2,7 @@ import { Kysely, PostgresDialect } from 'kysely';
 import { Pool } from 'pg';
 import { type Equal, Expect } from 'tests/utils';
 import type { Kyselify } from '~/kysely';
+import { char, mysqlTable, timestamp, varchar } from '~/mysql-core';
 import { pgTable, serial, text } from '~/pg-core';
 import type { InferModel } from '~/table';
 import type { PromiseOf } from '~/utils';
@@ -23,3 +24,34 @@ const db = new Kysely<Database>({
 
 const result = db.selectFrom('test').selectAll().execute();
 Expect<Equal<PromiseOf<typeof result>, InferModel<typeof test>[]>>();
+
+{
+	const units = mysqlTable('units', {
+		id: char('id', { length: 16 }).primaryKey(),
+		name: varchar('name', { length: 255 }).notNull(),
+		abbreviation: varchar('abbreviation', { length: 10 }).notNull(),
+		created_at: timestamp('created_at').defaultNow().notNull(),
+		updated_at: timestamp('updated_at').defaultNow().notNull().onUpdateNow(),
+	});
+
+	type UnitModel = typeof units;
+
+	interface Database {
+		units: Kyselify<UnitModel>;
+	}
+
+	const db = new Kysely<Database>({
+		dialect: new PostgresDialect({
+			pool: new Pool(),
+		}),
+	});
+
+	await db
+		.insertInto('units')
+		.values({
+			id: 'my-unique-id',
+			abbreviation: 'foo',
+			name: 'bar',
+		})
+		.execute();
+}