Fixed types of $client for clients created by drizzle function from credentials (#4742)

* Fixed types of `` for clients created by `drizzle` function from credentials

* Add release notes

---------

Co-authored-by: Andrii Sherman <andreysherman11@gmail.com>

Author: Sukairo-02

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.

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": {

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] });

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]!;

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({

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({

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);

drizzle-orm/src/vercel-postgres/driver.ts

@@ -102,7 +102,7 @@ export function drizzle<
 		),
 	]
 ): VercelPgDatabase<TSchema> & {
-	$client: TClient;
+	$client: VercelPgClient extends TClient ? typeof sql : TClient;
 } {
 	if (isConfig(params[0])) {
 		const { client, ...drizzleConfig } = params[0] as ({ client?: TClient } & DrizzleConfig<TSchema>);