Merge commit 'f0d7da21bd3d91ee5442d2a7f98956fc47d83847' into alternation-engine

AlexBlokh · AlexBlokh · commit 9f01dbf28910 · 2025-07-15T15:54:42.000+03:00
diff --git a/.github/workflows/release-feature-branch.yaml b/.github/workflows/release-feature-branch.yaml
@@ -22,7 +22,7 @@ jobs:
           - neon-http
           - neon-serverless
           - drizzle-orm
-          - drizzle-kit
+          # - drizzle-kit 
           - drizzle-zod
           - drizzle-seed
           - drizzle-typebox
@@ -224,7 +224,7 @@ jobs:
       matrix:
         package:
           - drizzle-orm
-          - drizzle-kit
+          # - drizzle-kit
           - drizzle-zod
           - drizzle-seed
           - drizzle-typebox
@@ -318,7 +318,7 @@ jobs:
       matrix:
         package:
           - drizzle-orm
-          - drizzle-kit
+          # - drizzle-kit
           - drizzle-zod
           - drizzle-seed
           - drizzle-typebox
diff --git a/changelogs/drizzle-orm/0.44.3.md b/changelogs/drizzle-orm/0.44.3.md
@@ -0,0 +1,7 @@
+- Fixed types of `$client` for clients created by drizzle function
+
+```ts
+await db.$client.[...]
+```
+
+- Added the `updated_at` column to the `neon_auth.users_sync` table definition.
diff --git a/drizzle-kit/src/cli/commands/generate-postgres.ts b/drizzle-kit/src/cli/commands/generate-postgres.ts
@@ -11,6 +11,7 @@ import {
 	Policy,
 	PostgresEntities,
 	PrimaryKey,
+	Privilege,
 	Role,
 	Schema,
 	Sequence,
@@ -55,6 +56,7 @@ export const handle = async (config: GenerateConfig) => {
 		resolver<Sequence>('sequence'),
 		resolver<Policy>('policy'),
 		resolver<Role>('role'),
+		resolver<Privilege>('privilege'),
 		resolver<PostgresEntities['tables']>('table'),
 		resolver<Column>('column'),
 		resolver<View>('view'),
diff --git a/drizzle-kit/src/cli/commands/pull-postgres.ts b/drizzle-kit/src/cli/commands/pull-postgres.ts
@@ -15,6 +15,7 @@ import {
 	Policy,
 	PostgresEntities,
 	PrimaryKey,
+	Privilege,
 	Role,
 	Schema,
 	Sequence,
@@ -93,6 +94,7 @@ export const handle = async (
 			resolver<Sequence>('sequence'),
 			resolver<Policy>('policy'),
 			resolver<Role>('role'),
+			resolver<Privilege>('privilege'),
 			resolver<PostgresEntities['tables']>('table'),
 			resolver<Column>('column'),
 			resolver<View>('view'),
diff --git a/drizzle-kit/src/cli/commands/push-postgres.ts b/drizzle-kit/src/cli/commands/push-postgres.ts
@@ -10,6 +10,7 @@ import {
 	Policy,
 	PostgresEntities,
 	PrimaryKey,
+	Privilege,
 	Role,
 	Schema,
 	Sequence,
@@ -80,6 +81,7 @@ export const handle = async (
 		resolver<Sequence>('sequence'),
 		resolver<Policy>('policy'),
 		resolver<Role>('role'),
+		resolver<Privilege>('privilege'),
 		resolver<PostgresEntities['tables']>('table'),
 		resolver<Column>('column'),
 		resolver<View>('view'),
diff --git a/drizzle-kit/src/cli/prompts.ts b/drizzle-kit/src/cli/prompts.ts
@@ -11,6 +11,7 @@ export const resolver = <T extends { name: string; schema?: string; table?: stri
 		| 'column'
 		| 'sequence'
 		| 'view'
+		| 'privilege'
 		| 'policy'
 		| 'role'
 		| 'check'
diff --git a/drizzle-kit/src/cli/views.ts b/drizzle-kit/src/cli/views.ts
@@ -391,6 +391,7 @@ export class ResolveSelect<T extends EntityBase> extends Prompt<
 			| 'column'
 			| 'sequence'
 			| 'view'
+			| 'privilege'
 			| 'policy'
 			| 'role'
 			| 'check'
diff --git a/drizzle-kit/src/dialects/mysql/typescript.ts b/drizzle-kit/src/dialects/mysql/typescript.ts
@@ -135,8 +135,8 @@ export const ddlToTypeScript = (
 		if (it.entityType === 'views') imports.add('mysqlView');
 
 		if (it.entityType === 'columns' || it.entityType === 'viewColumn') {
-			const grammarType=typeFor(it.type);
-			if(grammarType)imports.add(grammarType.drizzleImport());
+			const grammarType = typeFor(it.type);
+			if (grammarType) imports.add(grammarType.drizzleImport());
 			if (mysqlImportsList.has(it.type)) imports.add(it.type);
 		}
 	}
diff --git a/drizzle-kit/src/dialects/postgres/diff.ts b/drizzle-kit/src/dialects/postgres/diff.ts
@@ -19,8 +19,8 @@ import {
 	PostgresDDL,
 	PostgresEntities,
 	PrimaryKey,
-	Role,
 	Privilege,
+	Role,
 	Schema,
 	Sequence,
 	tableFromDDL,
diff --git a/drizzle-kit/src/dialects/postgres/statements.ts b/drizzle-kit/src/dialects/postgres/statements.ts
@@ -6,10 +6,10 @@ import type {
 	DiffEntities,
 	Enum,
 	ForeignKey,
-	Privilege,
 	Index,
 	Policy,
 	PrimaryKey,
+	Privilege,
 	Role,
 	Schema,
 	Sequence,
diff --git a/drizzle-kit/src/dialects/postgres/typescript.ts b/drizzle-kit/src/dialects/postgres/typescript.ts
@@ -603,7 +603,7 @@ const mapDefault = (
 				const res = grammarType.toArrayTs(type, parsed);
 				return res.default ? `.default(${res.default})` : '';
 			} catch {
-				console.log("asdasd")
+				console.log('asdasd');
 				return `.default(sql\`${def.value}\`)`;
 			}
 		}
diff --git a/drizzle-kit/src/dialects/sqlite/grammar.ts b/drizzle-kit/src/dialects/sqlite/grammar.ts
@@ -265,7 +265,8 @@ export const typeFor = (sqlType: string): SqlType => {
 	if (Text.is(sqlType)) return Text;
 	if (Blob.is(sqlType)) return Blob;
 
-	throw new Error(`No grammar type for ${sqlType}`);
+	// If no specific type matches, default to Numeric
+	return Numeric;
 };
 
 export function sqlTypeFrom(sqlType: string): string {
diff --git a/drizzle-kit/src/dialects/sqlite/introspect.ts b/drizzle-kit/src/dialects/sqlite/introspect.ts
@@ -83,7 +83,8 @@ export const fromDatabase = async (
 			and m.tbl_name NOT LIKE '\\_cf\\_%' ESCAPE '\\'
 			and m.tbl_name NOT LIKE '\\_litestream\\_%' ESCAPE '\\'
 			and m.tbl_name NOT LIKE 'libsql\\_%' ESCAPE '\\'
-			and m.tbl_name  NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+			and m.tbl_name NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+			and m.tbl_name NOT LIKE 'd1\\_%' ESCAPE '\\'
 		ORDER BY p.cid
 		;
     `,
@@ -109,7 +110,8 @@ export const fromDatabase = async (
 			and m.tbl_name NOT LIKE '\\_cf\\_%' ESCAPE '\\'
 			and m.tbl_name NOT LIKE '\\_litestream\\_%' ESCAPE '\\'
 			and m.tbl_name NOT LIKE 'libsql\\_%' ESCAPE '\\'
-			and m.tbl_name  NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+			and m.tbl_name NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+			and m.tbl_name NOT LIKE 'd1\\_%' ESCAPE '\\'
 		ORDER BY m.name COLLATE NOCASE
 		;`,
 	).then((views) => {
@@ -173,7 +175,8 @@ export const fromDatabase = async (
 				and m.tbl_name NOT LIKE '\\_cf\\_%' ESCAPE '\\'
 				and m.tbl_name NOT LIKE '\\_litestream\\_%' ESCAPE '\\'
 				and m.tbl_name NOT LIKE 'libsql\\_%' ESCAPE '\\'
-				and m.tbl_name  NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+				and m.tbl_name NOT LIKE 'sqlite\\_%' ESCAPE '\\'
+				and m.tbl_name NOT LIKE 'd1\\_%' ESCAPE '\\'
 			ORDER BY m.name COLLATE NOCASE, p.cid
 			;
 		`,
diff --git a/drizzle-kit/src/ext/api-postgres.ts b/drizzle-kit/src/ext/api-postgres.ts
@@ -16,6 +16,7 @@ import {
 	Policy,
 	PostgresEntities,
 	PrimaryKey,
+	Privilege,
 	Role,
 	Schema,
 	Sequence,
@@ -78,6 +79,7 @@ export const generateMigration = async (
 		resolver<Sequence>('sequence'),
 		resolver<Policy>('policy'),
 		resolver<Role>('role'),
+		resolver<Privilege>('privilege'),
 		resolver<PostgresEntities['tables']>('table'),
 		resolver<Column>('column'),
 		resolver<View>('view'),
@@ -132,6 +134,7 @@ export const pushSchema = async (
 		resolver<Sequence>('sequence'),
 		resolver<Policy>('policy'),
 		resolver<Role>('role'),
+		resolver<Privilege>('privilege'),
 		resolver<PostgresEntities['tables']>('table'),
 		resolver<Column>('column'),
 		resolver<View>('view'),
diff --git a/drizzle-kit/src/utils/parse-pgarray/index.ts b/drizzle-kit/src/utils/parse-pgarray/index.ts
@@ -42,7 +42,7 @@ semantics.addOperation('parseArray', {
 
 export type ArrayValue = string | null | ArrayValue[];
 
-/* 
+/*
 	every value will be a string
  */
 export function parseArray(array: string) {
diff --git a/drizzle-kit/tests/mysql/mysql-defaults.test.ts b/drizzle-kit/tests/mysql/mysql-defaults.test.ts
@@ -470,8 +470,8 @@ test('time', async () => {
 		_,
 		time({ fsp: 3 }).default('15:50:33.123'),
 		`'15:50:33.123'`,
-	);	
-	
+	);
+
 	const res3 = await diffDefault(
 		_,
 		time({ fsp: 6 }).default('15:50:33.123456'),
diff --git a/drizzle-kit/tests/sqlite/pull.test.ts b/drizzle-kit/tests/sqlite/pull.test.ts
@@ -2,10 +2,10 @@ import Database from 'better-sqlite3';
 import { SQL, sql } from 'drizzle-orm';
 import { check, int, sqliteTable, sqliteView, text } from 'drizzle-orm/sqlite-core';
 import * as fs from 'fs';
-import { expect, test } from 'vitest';
-import { diffAfterPull, push, dbFrom } from './mocks';
-import { fromDatabaseForDrizzle } from 'src/dialects/sqlite/introspect';
 import { interimToDDL } from 'src/dialects/sqlite/ddl';
+import { fromDatabaseForDrizzle } from 'src/dialects/sqlite/introspect';
+import { expect, test } from 'vitest';
+import { dbFrom, diffAfterPull, push } from './mocks';
 
 fs.mkdirSync('tests/sqlite/tmp', { recursive: true });
 
@@ -77,7 +77,7 @@ test('introspect checks', async () => {
 	await push({
 		db,
 		to: initSchema,
-	})
+	});
 
 	const schema = await fromDatabaseForDrizzle(db);
 	const { ddl, errors } = interimToDDL(schema);
diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-orm",
-	"version": "0.44.2",
+	"version": "0.44.3",
 	"description": "Drizzle ORM package for SQL databases",
 	"type": "module",
 	"scripts": {
diff --git a/drizzle-orm/src/gel/driver.ts b/drizzle-orm/src/gel/driver.ts
@@ -53,7 +53,7 @@ function construct<
 	client: TClient,
 	config: DrizzleConfig<TSchema> = {},
 ): GelJsDatabase<TSchema> & {
-	$client: TClient;
+	$client: GelClient extends TClient ? Client : TClient;
 } {
 	const dialect = new GelDialect({ casing: config.casing });
 	let logger;
@@ -104,7 +104,7 @@ export function drizzle<
 			),
 		]
 ): GelJsDatabase<TSchema> & {
-	$client: TClient;
+	$client: GelClient extends TClient ? Client : TClient;
 } {
 	if (typeof params[0] === 'string') {
 		const instance = createClient({ dsn: params[0] });
diff --git a/drizzle-orm/src/mysql2/driver.ts b/drizzle-orm/src/mysql2/driver.ts
@@ -64,7 +64,7 @@ function construct<
 	client: TClient,
 	config: MySql2DrizzleConfig<TSchema> = {},
 ): MySql2Database<TSchema> & {
-	$client: TClient;
+	$client: AnyMySql2Connection extends TClient ? CallbackPool : TClient;
 } {
 	const dialect = new MySqlDialect({ casing: config.casing });
 	let logger;
@@ -140,7 +140,7 @@ export function drizzle<
 		),
 	]
 ): MySql2Database<TSchema> & {
-	$client: TClient;
+	$client: AnyMySql2Connection extends TClient ? CallbackPool : TClient;
 } {
 	if (typeof params[0] === 'string') {
 		const connectionString = params[0]!;
diff --git a/drizzle-orm/src/neon-serverless/driver.ts b/drizzle-orm/src/neon-serverless/driver.ts
@@ -53,7 +53,7 @@ function construct<
 	client: TClient,
 	config: DrizzleConfig<TSchema> = {},
 ): NeonDatabase<TSchema> & {
-	$client: TClient;
+	$client: NeonClient extends TClient ? Pool : TClient;
 } {
 	const dialect = new PgDialect({ casing: config.casing });
 	let logger;
@@ -111,7 +111,7 @@ export function drizzle<
 		),
 	]
 ): NeonDatabase<TSchema> & {
-	$client: TClient;
+	$client: NeonClient extends TClient ? Pool : TClient;
 } {
 	if (typeof params[0] === 'string') {
 		const instance = new Pool({
diff --git a/drizzle-orm/src/neon/index.ts b/drizzle-orm/src/neon/index.ts
@@ -1,2 +1,2 @@
-export * from './neon-identity.ts';
+export * from './neon-auth.ts';
 export * from './rls.ts';
diff --git a/drizzle-orm/src/neon/neon-auth.ts b/drizzle-orm/src/neon/neon-auth.ts
@@ -16,4 +16,5 @@ export const usersSync = neonAuthSchema.table('users_sync', {
 	email: text(),
 	createdAt: timestamp('created_at', { withTimezone: true, mode: 'string' }),
 	deletedAt: timestamp('deleted_at', { withTimezone: true, mode: 'string' }),
+	updatedAt: timestamp('updated_at', { withTimezone: true, mode: 'string' }),
 });
diff --git a/drizzle-orm/src/node-postgres/driver.ts b/drizzle-orm/src/node-postgres/driver.ts
@@ -53,7 +53,7 @@ function construct<
 	client: TClient,
 	config: DrizzleConfig<TSchema> = {},
 ): NodePgDatabase<TSchema> & {
-	$client: TClient;
+	$client: NodePgClient extends TClient ? Pool : TClient;
 } {
 	const dialect = new PgDialect({ casing: config.casing });
 	let logger;
@@ -101,17 +101,15 @@ export function drizzle<
 			DrizzleConfig<TSchema>,
 		]
 		| [
-			(
-				& DrizzleConfig<TSchema>
-				& ({
-					connection: string | PoolConfig;
-				} | {
-					client: TClient;
-				})
-			),
+			& DrizzleConfig<TSchema>
+			& ({
+				client: TClient;
+			} | {
+				connection: string | PoolConfig;
+			}),
 		]
 ): NodePgDatabase<TSchema> & {
-	$client: TClient;
+	$client: NodePgClient extends TClient ? Pool : TClient;
 } {
 	if (typeof params[0] === 'string') {
 		const instance = new pg.Pool({
diff --git a/drizzle-orm/src/singlestore/driver.ts b/drizzle-orm/src/singlestore/driver.ts
@@ -65,7 +65,7 @@ function construct<
 	client: TClient,
 	config: SingleStoreDriverDrizzleConfig<TSchema> = {},
 ): SingleStoreDriverDatabase<TSchema> & {
-	$client: TClient;
+	$client: AnySingleStoreDriverConnection extends TClient ? CallbackPool : TClient;
 } {
 	const dialect = new SingleStoreDialect({ casing: config.casing });
 	let logger;
@@ -140,7 +140,7 @@ export function drizzle<
 		),
 	]
 ): SingleStoreDriverDatabase<TSchema> & {
-	$client: TClient;
+	$client: AnySingleStoreDriverConnection extends TClient ? CallbackPool : TClient;
 } {
 	if (typeof params[0] === 'string') {
 		const connectionString = params[0]!;
@@ -160,21 +160,19 @@ export function drizzle<
 		if (client) return construct(client, drizzleConfig) as any;
 
 		let opts: PoolOptions = {};
-		if (typeof connection === 'string') {
-			opts = {
+		opts = typeof connection === 'string'
+			? {
 				uri: connection,
 				supportBigNumbers: true,
 				connectAttributes: CONNECTION_ATTRS,
-			};
-		} else {
-			opts = {
+			}
+			: {
 				...connection,
 				connectAttributes: {
 					...connection!.connectAttributes,
 					...CONNECTION_ATTRS,
 				},
 			};
-		}
 
 		const instance = createPool(opts);
 		const db = construct(instance, drizzleConfig);
diff --git a/drizzle-orm/src/sql/sql.ts b/drizzle-orm/src/sql/sql.ts
diff --git a/drizzle-orm/src/vercel-postgres/driver.ts b/drizzle-orm/src/vercel-postgres/driver.ts
diff --git a/integration-tests/tests/bun/bun-sql.test.ts b/integration-tests/tests/bun/bun-sql.test.ts
diff --git a/integration-tests/tests/pg/pg-common.ts b/integration-tests/tests/pg/pg-common.ts

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ export const ddlToTypeScript = (`
`135`	`135`	`if (it.entityType === 'views') imports.add('mysqlView');`
`136`	`136`
`137`	`137`	`if (it.entityType === 'columns' \|\| it.entityType === 'viewColumn') {`
`138`		`- const grammarType=typeFor(it.type);`
`139`		`- if(grammarType)imports.add(grammarType.drizzleImport());`
	`138`	`+ const grammarType = typeFor(it.type);`
	`139`	`+ if (grammarType) imports.add(grammarType.drizzleImport());`
`140`	`140`	`if (mysqlImportsList.has(it.type)) imports.add(it.type);`
`141`	`141`	`}`
`142`	`142`	`}`