Skip to content

[SingleStore] Add Connection Attributes and Fix Options #4320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SingleStore] Add Connection Attributes and Fix Options #4320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55d1245
add connection attributes to SingleStore driver connection
mitchwadair Mar 26, 2025
cd447af
fix allowing connection strings/options rather than external pool
mitchwadair Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 41 additions & 23 deletions drizzle-orm/src/singlestore/driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import type { Logger } from '~/logger.ts';
import { DefaultLogger } from '~/logger.ts';
import { SingleStoreDatabase } from '~/singlestore-core/db.ts';
import { SingleStoreDialect } from '~/singlestore-core/dialect.ts';
import { type DrizzleConfig, type IfNotImported, type ImportTypeError, isConfig } from '~/utils.ts';
import { type DrizzleConfig, isConfig } from '~/utils.ts';
import { npmVersion } from '~/version.ts';
import type {
SingleStoreDriverClient,
SingleStoreDriverPreparedQueryHKT,
Expand Down Expand Up @@ -102,36 +103,38 @@ function isCallbackClient(client: any): client is CallbackClient {

export type AnySingleStoreDriverConnection = Pool | Connection | CallbackPool | CallbackConnection;

const CONNECTION_ATTRS: PoolOptions['connectAttributes'] = {
_connector_name: 'SingleStore Drizzle ORM Driver',
_connector_version: npmVersion,
};

export function drizzle<
TSchema extends Record<string, unknown> = Record<string, never>,
TClient extends AnySingleStoreDriverConnection = CallbackPool,
>(
...params: IfNotImported<
CallbackPool,
[ImportTypeError<'singlestore'>],
[
TClient | string,
] | [
TClient | string,
SingleStoreDriverDrizzleConfig<TSchema>,
] | [
(
& SingleStoreDriverDrizzleConfig<TSchema>
& ({
connection: string | PoolOptions;
} | {
client: TClient;
})
),
]
>
...params: [
TClient | string,
] | [
TClient | string,
SingleStoreDriverDrizzleConfig<TSchema>,
] | [
(
& SingleStoreDriverDrizzleConfig<TSchema>
& ({
connection: string | PoolOptions;
} | {
client: TClient;
})
),
]
): SingleStoreDriverDatabase<TSchema> & {
$client: TClient;
} {
if (typeof params[0] === 'string') {
const connectionString = params[0]!;
const instance = createPool({
uri: connectionString,
connectAttributes: CONNECTION_ATTRS,
});

return construct(instance, params[1]) as any;
Expand All @@ -144,9 +147,24 @@ export function drizzle<

if (client) return construct(client, drizzleConfig) as any;

const instance = typeof connection === 'string'
? createPool({ uri: connection, supportBigNumbers: true })
: createPool(connection!);
let opts: PoolOptions = {};
if (typeof connection === 'string') {
opts = {
uri: connection,
supportBigNumbers: true,
connectAttributes: CONNECTION_ATTRS,
};
} else {
opts = {
...connection,
connectAttributes: {
...connection!.connectAttributes,
...CONNECTION_ATTRS,
},
};
}

const instance = createPool(opts);
const db = construct(instance, drizzleConfig);

return db as any;
Expand Down
Loading