From 2816180ee72bd2de865be27401b9af6d14fa8934 Mon Sep 17 00:00:00 2001 From: prodrigues Date: Thu, 14 Nov 2024 01:31:25 +0000 Subject: [PATCH] remove mode from drizzle-orm --- drizzle-orm/src/singlestore-core/db.ts | 3 --- .../singlestore-core/query-builders/query.ts | 5 ----- drizzle-orm/src/singlestore-core/session.ts | 5 +---- drizzle-orm/src/singlestore-proxy/driver.ts | 2 +- drizzle-orm/src/singlestore/driver.ts | 20 ++++--------------- drizzle-orm/src/singlestore/session.ts | 6 ------ drizzle-orm/type-tests/singlestore/db.ts | 5 ++--- 7 files changed, 8 insertions(+), 38 deletions(-) diff --git a/drizzle-orm/src/singlestore-core/db.ts b/drizzle-orm/src/singlestore-core/db.ts index 2f4814544..6e8f18f44 100644 --- a/drizzle-orm/src/singlestore-core/db.ts +++ b/drizzle-orm/src/singlestore-core/db.ts @@ -18,7 +18,6 @@ import { import { RelationalQueryBuilder } from './query-builders/query.ts'; import type { SelectedFields } from './query-builders/select.types.ts'; import type { - Mode, PreparedQueryHKTBase, SingleStoreQueryResultHKT, SingleStoreQueryResultKind, @@ -55,7 +54,6 @@ export class SingleStoreDatabase< /** @internal */ readonly session: SingleStoreSession, schema: RelationalSchemaConfig | undefined, - protected readonly mode: Mode, ) { this._ = schema ? { @@ -80,7 +78,6 @@ export class SingleStoreDatabase< columns, dialect, session, - this.mode, ); } } diff --git a/drizzle-orm/src/singlestore-core/query-builders/query.ts b/drizzle-orm/src/singlestore-core/query-builders/query.ts index b42fb4f39..c15f7ad59 100644 --- a/drizzle-orm/src/singlestore-core/query-builders/query.ts +++ b/drizzle-orm/src/singlestore-core/query-builders/query.ts @@ -12,7 +12,6 @@ import type { Query, QueryWithTypings, SQL } from '~/sql/sql.ts'; import type { KnownKeysOnly } from '~/utils.ts'; import type { SingleStoreDialect } from '../dialect.ts'; import type { - Mode, PreparedQueryHKTBase, PreparedQueryKind, SingleStorePreparedQueryConfig, @@ -35,7 +34,6 @@ export class RelationalQueryBuilder< private tableConfig: TableRelationalConfig, private dialect: SingleStoreDialect, private session: SingleStoreSession, - private mode: Mode, ) {} findMany>( @@ -51,7 +49,6 @@ export class RelationalQueryBuilder< this.session, config ? (config as DBQueryConfig<'many', true>) : {}, 'many', - this.mode, ); } @@ -68,7 +65,6 @@ export class RelationalQueryBuilder< this.session, config ? { ...(config as DBQueryConfig<'many', true> | undefined), limit: 1 } : { limit: 1 }, 'first', - this.mode, ); } } @@ -91,7 +87,6 @@ export class SingleStoreRelationalQuery< private session: SingleStoreSession, private config: DBQueryConfig<'many', true> | true, private queryMode: 'many' | 'first', - private mode?: Mode, ) { super(); } diff --git a/drizzle-orm/src/singlestore-core/session.ts b/drizzle-orm/src/singlestore-core/session.ts index 78d477a27..bc31f3d97 100644 --- a/drizzle-orm/src/singlestore-core/session.ts +++ b/drizzle-orm/src/singlestore-core/session.ts @@ -7,8 +7,6 @@ import { SingleStoreDatabase } from './db.ts'; import type { SingleStoreDialect } from './dialect.ts'; import type { SelectedFieldsOrdered } from './query-builders/select.types.ts'; -export type Mode = 'default'; - export interface SingleStoreQueryResultHKT { readonly $brand: 'SingleStoreQueryResultHKT'; readonly row: unknown; @@ -140,9 +138,8 @@ export abstract class SingleStoreTransaction< session: SingleStoreSession, protected schema: RelationalSchemaConfig | undefined, protected readonly nestedIndex: number, - mode: Mode, ) { - super(dialect, session, schema, mode); + super(dialect, session, schema); } rollback(): never { diff --git a/drizzle-orm/src/singlestore-proxy/driver.ts b/drizzle-orm/src/singlestore-proxy/driver.ts index 6752dedb7..ea24ae2d8 100644 --- a/drizzle-orm/src/singlestore-proxy/driver.ts +++ b/drizzle-orm/src/singlestore-proxy/driver.ts @@ -53,7 +53,7 @@ export function drizzle = Record; } diff --git a/drizzle-orm/src/singlestore/driver.ts b/drizzle-orm/src/singlestore/driver.ts index b413a5ebc..ba294f6dc 100644 --- a/drizzle-orm/src/singlestore/driver.ts +++ b/drizzle-orm/src/singlestore/driver.ts @@ -11,9 +11,7 @@ import { } from '~/relations.ts'; import { SingleStoreDatabase } from '~/singlestore-core/db.ts'; import { SingleStoreDialect } from '~/singlestore-core/dialect.ts'; -import type { Mode } from '~/singlestore-core/session.ts'; import { type DrizzleConfig, type IfNotImported, type ImportTypeError, isConfig } from '~/utils.ts'; -import { DrizzleError } from '../errors.ts'; import type { SingleStoreDriverClient, SingleStoreDriverPreparedQueryHKT, @@ -37,9 +35,8 @@ export class SingleStoreDriverDriver { createSession( schema: RelationalSchemaConfig | undefined, - mode: Mode, ): SingleStoreDriverSession, TablesRelationalConfig> { - return new SingleStoreDriverSession(this.client, this.dialect, schema, { logger: this.options.logger, mode }); + return new SingleStoreDriverSession(this.client, this.dialect, schema, { logger: this.options.logger }); } } @@ -53,7 +50,7 @@ export class SingleStoreDriverDatabase< export type SingleStoreDriverDrizzleConfig = Record> = & Omit, 'schema'> - & ({ schema: TSchema; mode: Mode } | { schema?: undefined; mode?: Mode }); + & ({ schema: TSchema } | { schema?: undefined }); function construct< TSchema extends Record = Record, @@ -76,13 +73,6 @@ function construct< let schema: RelationalSchemaConfig | undefined; if (config.schema) { - if (config.mode === undefined) { - throw new DrizzleError({ - message: - 'You need to specify "mode": "planetscale" or "default" when providing a schema. Read more: https://orm.drizzle.team/docs/rqb#modes', - }); - } - const tablesConfig = extractTablesRelationalConfig( config.schema, createTableRelationsHelpers, @@ -94,11 +84,9 @@ function construct< }; } - const mode = config.mode ?? 'default'; - const driver = new SingleStoreDriverDriver(clientForInstance as SingleStoreDriverClient, dialect, { logger }); - const session = driver.createSession(schema, mode); - const db = new SingleStoreDriverDatabase(dialect, session, schema as any, mode) as SingleStoreDriverDatabase; + const session = driver.createSession(schema); + const db = new SingleStoreDriverDatabase(dialect, session, schema as any) as SingleStoreDriverDatabase; ( db).$client = client; return db as any; diff --git a/drizzle-orm/src/singlestore/session.ts b/drizzle-orm/src/singlestore/session.ts index f5868cb70..fd70a1d52 100644 --- a/drizzle-orm/src/singlestore/session.ts +++ b/drizzle-orm/src/singlestore/session.ts @@ -18,7 +18,6 @@ import type { RelationalSchemaConfig, TablesRelationalConfig } from '~/relations import type { SingleStoreDialect } from '~/singlestore-core/dialect.ts'; import type { SelectedFieldsOrdered } from '~/singlestore-core/query-builders/select.types.ts'; import { - type Mode, type PreparedQueryKind, SingleStorePreparedQuery, type SingleStorePreparedQueryConfig, @@ -185,7 +184,6 @@ export class SingleStoreDriverPreparedQuery( @@ -272,7 +268,6 @@ export class SingleStoreDriverSession< session as SingleStoreSession, this.schema, 0, - this.mode, ); if (config) { const setTransactionConfigSql = this.getSetTransactionSQL(config); @@ -319,7 +314,6 @@ export class SingleStoreDriverTransaction< this.session, this.schema, this.nestedIndex + 1, - this.mode, ); await tx.execute(sql.raw(`savepoint ${savepointName}`)); try { diff --git a/drizzle-orm/type-tests/singlestore/db.ts b/drizzle-orm/type-tests/singlestore/db.ts index bde149b08..b314e504d 100644 --- a/drizzle-orm/type-tests/singlestore/db.ts +++ b/drizzle-orm/type-tests/singlestore/db.ts @@ -7,8 +7,7 @@ export const db = drizzle(pool); { drizzle(pool); - // @ts-expect-error - missing mode drizzle(pool, { schema: {} }); - drizzle(pool, { schema: {}, mode: 'default' }); - drizzle(pool, { mode: 'default' }); + drizzle(pool, { schema: {} }); + drizzle(pool, {}); }