drizzle-orm 0.39.2-1177ad8 → 0.39.2-aaa57ff

package/op-sqlite/session.js

@@ -8,9 +8,10 @@ import {
 } from "../sqlite-core/session.js";
 import { mapResultRow } from "../utils.js";
 class OPSQLiteSession extends SQLiteSession {
-  constructor(client, dialect, schema, options = {}) {
+  constructor(client, dialect, relations, schema, options = {}) {
     super(dialect);
     this.client = client;
+    this.relations = relations;
     this.schema = schema;
     this.logger = options.logger ?? new NoopLogger();
   }
@@ -27,8 +28,20 @@ class OPSQLiteSession extends SQLiteSession {
       customResultMapper
     );
   }
+  prepareRelationalQuery(query, fields, executeMethod, customResultMapper) {
+    return new OPSQLitePreparedQuery(
+      this.client,
+      query,
+      this.logger,
+      fields,
+      executeMethod,
+      false,
+      customResultMapper,
+      true
+    );
+  }
   transaction(transaction, config = {}) {
-    const tx = new OPSQLiteTransaction("async", this.dialect, this, this.schema);
+    const tx = new OPSQLiteTransaction("async", this.dialect, this, this.relations, this.schema);
     this.run(sql.raw(`begin${config?.behavior ? " " + config.behavior : ""}`));
     try {
       const result = transaction(tx);
@@ -44,7 +57,14 @@ class OPSQLiteTransaction extends SQLiteTransaction {
   static [entityKind] = "OPSQLiteTransaction";
   transaction(transaction) {
     const savepointName = `sp${this.nestedIndex}`;
-    const tx = new OPSQLiteTransaction("async", this.dialect, this.session, this.schema, this.nestedIndex + 1);
+    const tx = new OPSQLiteTransaction(
+      "async",
+      this.dialect,
+      this.session,
+      this.relations,
+      this.schema,
+      this.nestedIndex + 1
+    );
     this.session.run(sql.raw(`savepoint ${savepointName}`));
     try {
       const result = transaction(tx);
@@ -57,13 +77,14 @@ class OPSQLiteTransaction extends SQLiteTransaction {
   }
 }
 class OPSQLitePreparedQuery extends SQLitePreparedQuery {
-  constructor(client, query, logger, fields, executeMethod, _isResponseInArrayMode, customResultMapper) {
+  constructor(client, query, logger, fields, executeMethod, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
     super("sync", executeMethod, query);
     this.client = client;
     this.logger = logger;
     this.fields = fields;
     this._isResponseInArrayMode = _isResponseInArrayMode;
     this.customResultMapper = customResultMapper;
+    this.isRqbV2Query = isRqbV2Query;
   }
   static [entityKind] = "OPSQLitePreparedQuery";
   run(placeholderValues) {
@@ -72,6 +93,8 @@ class OPSQLitePreparedQuery extends SQLitePreparedQuery {
     return this.client.executeAsync(this.query.sql, params);
   }
   async all(placeholderValues) {
+    if (this.isRqbV2Query)
+      return this.allRqbV2(placeholderValues);
     const { fields, joinsNotNullableMap, query, logger, customResultMapper, client } = this;
     if (!fields && !customResultMapper) {
       const params = fillPlaceholders(query.params, placeholderValues ?? {});
@@ -84,7 +107,16 @@ class OPSQLitePreparedQuery extends SQLitePreparedQuery {
     }
     return rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
   }
+  async allRqbV2(placeholderValues) {
+    const { query, logger, customResultMapper, client } = this;
+    const params = fillPlaceholders(query.params, placeholderValues ?? {});
+    logger.logQuery(query.sql, params);
+    const rows = client.execute(query.sql, params).rows?._array || [];
+    return customResultMapper(rows);
+  }
   async get(placeholderValues) {
+    if (this.isRqbV2Query)
+      return this.getRqbV2(placeholderValues);
     const { fields, joinsNotNullableMap, customResultMapper, query, logger, client } = this;
     const params = fillPlaceholders(query.params, placeholderValues ?? {});
     logger.logQuery(query.sql, params);
@@ -102,6 +134,17 @@ class OPSQLitePreparedQuery extends SQLitePreparedQuery {
     }
     return mapResultRow(fields, row, joinsNotNullableMap);
   }
+  async getRqbV2(placeholderValues) {
+    const { customResultMapper, query, logger, client } = this;
+    const params = fillPlaceholders(query.params, placeholderValues ?? {});
+    logger.logQuery(query.sql, params);
+    const rows = client.execute(query.sql, params).rows?._array || [];
+    const row = rows[0];
+    if (!row) {
+      return void 0;
+    }
+    return customResultMapper([row]);
+  }
   values(placeholderValues) {
     const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
     this.logger.logQuery(this.query.sql, params);

package/op-sqlite/session.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/op-sqlite/session.ts"],"sourcesContent":["import type { OPSQLiteConnection, QueryResult } from '@op-engineering/op-sqlite';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { RelationalSchemaConfig, TablesRelationalConfig } from '~/relations.ts';\nimport { fillPlaceholders, type Query, sql } from '~/sql/sql.ts';\nimport type { SQLiteAsyncDialect } from '~/sqlite-core/dialect.ts';\nimport { SQLiteTransaction } from '~/sqlite-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport {\n\ttype PreparedQueryConfig as PreparedQueryConfigBase,\n\ttype SQLiteExecuteMethod,\n\tSQLitePreparedQuery,\n\tSQLiteSession,\n\ttype SQLiteTransactionConfig,\n} from '~/sqlite-core/session.ts';\nimport { mapResultRow } from '~/utils.ts';\n\nexport interface OPSQLiteSessionOptions {\n\tlogger?: Logger;\n}\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class OPSQLiteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends SQLiteSession<'async', QueryResult, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'OPSQLiteSession';\n\n\tprivate logger: Logger;\n\n\tconstructor(\n\t\tprivate client: OPSQLiteConnection,\n\t\tdialect: SQLiteAsyncDialect,\n\t\tprivate schema: RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: OPSQLiteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t}\n\n\tprepareQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => unknown,\n\t): OPSQLitePreparedQuery<T> {\n\t\treturn new OPSQLitePreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: OPSQLiteTransaction<TFullSchema, TSchema>) => T,\n\t\tconfig: SQLiteTransactionConfig = {},\n\t): T {\n\t\tconst tx = new OPSQLiteTransaction('async', this.dialect, this, this.schema);\n\t\tthis.run(sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));\n\t\ttry {\n\t\t\tconst result = transaction(tx);\n\t\t\tthis.run(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tthis.run(sql`rollback`);\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class OPSQLiteTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends SQLiteTransaction<'async', QueryResult, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'OPSQLiteTransaction';\n\n\toverride transaction<T>(transaction: (tx: OPSQLiteTransaction<TFullSchema, TSchema>) => T): T {\n\t\tconst savepointName = `sp${this.nestedIndex}`;\n\t\tconst tx = new OPSQLiteTransaction('async', this.dialect, this.session, this.schema, this.nestedIndex + 1);\n\t\tthis.session.run(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = transaction(tx);\n\t\t\tthis.session.run(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tthis.session.run(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class OPSQLitePreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends SQLitePreparedQuery<\n\t{ type: 'async'; run: QueryResult; all: T['all']; get: T['get']; values: T['values']; execute: T['execute'] }\n> {\n\tstatic override readonly [entityKind]: string = 'OPSQLitePreparedQuery';\n\n\tconstructor(\n\t\tprivate client: OPSQLiteConnection,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (rows: unknown[][]) => unknown,\n\t) {\n\t\tsuper('sync', executeMethod, query);\n\t}\n\n\trun(placeholderValues?: Record<string, unknown>): Promise<QueryResult> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\treturn this.client.executeAsync(this.query.sql, params);\n\t}\n\n\tasync all(placeholderValues?: Record<string, unknown>): Promise<T['all']> {\n\t\tconst { fields, joinsNotNullableMap, query, logger, customResultMapper, client } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\treturn client.execute(query.sql, params).rows?._array || [];\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues) as unknown[][];\n\t\tif (customResultMapper) {\n\t\t\treturn customResultMapper(rows) as T['all'];\n\t\t}\n\t\treturn rows.map((row) => mapResultRow(fields!, row, joinsNotNullableMap));\n\t}\n\n\tasync get(placeholderValues?: Record<string, unknown>): Promise<T['get']> {\n\t\tconst { fields, joinsNotNullableMap, customResultMapper, query, logger, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst rows = client.execute(query.sql, params).rows?._array || [];\n\t\t\treturn rows[0];\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues) as unknown[][];\n\t\tconst row = rows[0];\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tif (customResultMapper) {\n\t\t\treturn customResultMapper(rows) as T['get'];\n\t\t}\n\n\t\treturn mapResultRow(fields!, row, joinsNotNullableMap);\n\t}\n\n\tvalues(placeholderValues?: Record<string, unknown>): Promise<T['values']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.client.executeRawAsync(this.query.sql, params);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n"],"mappings":"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","names":["rows"]}
+{"version":3,"sources":["../../src/op-sqlite/session.ts"],"sourcesContent":["import type { OPSQLiteConnection, QueryResult } from '@op-engineering/op-sqlite';\nimport type * as V1 from '~/_relations.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { AnyRelations, TablesRelationalConfig } from '~/relations.ts';\nimport { fillPlaceholders, type Query, sql } from '~/sql/sql.ts';\nimport type { SQLiteAsyncDialect } from '~/sqlite-core/dialect.ts';\nimport { SQLiteTransaction } from '~/sqlite-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport {\n\ttype PreparedQueryConfig as PreparedQueryConfigBase,\n\ttype SQLiteExecuteMethod,\n\tSQLitePreparedQuery,\n\tSQLiteSession,\n\ttype SQLiteTransactionConfig,\n} from '~/sqlite-core/session.ts';\nimport { mapResultRow } from '~/utils.ts';\n\nexport interface OPSQLiteSessionOptions {\n\tlogger?: Logger;\n}\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class OPSQLiteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTTablesConfig extends TablesRelationalConfig,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteSession<'async', QueryResult, TFullSchema, TRelations, TTablesConfig, TSchema> {\n\tstatic override readonly [entityKind]: string = 'OPSQLiteSession';\n\n\tprivate logger: Logger;\n\n\tconstructor(\n\t\tprivate client: OPSQLiteConnection,\n\t\tdialect: SQLiteAsyncDialect,\n\t\tprivate relations: AnyRelations | undefined,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: OPSQLiteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t}\n\n\tprepareQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => unknown,\n\t): OPSQLitePreparedQuery<T> {\n\t\treturn new OPSQLitePreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => unknown,\n\t): OPSQLitePreparedQuery<T, true> {\n\t\treturn new OPSQLitePreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: OPSQLiteTransaction<TFullSchema, TRelations, TTablesConfig, TSchema>) => T,\n\t\tconfig: SQLiteTransactionConfig = {},\n\t): T {\n\t\tconst tx = new OPSQLiteTransaction('async', this.dialect, this, this.relations, this.schema);\n\t\tthis.run(sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));\n\t\ttry {\n\t\t\tconst result = transaction(tx);\n\t\t\tthis.run(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tthis.run(sql`rollback`);\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class OPSQLiteTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTTablesConfig extends TablesRelationalConfig,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteTransaction<'async', QueryResult, TFullSchema, TRelations, TTablesConfig, TSchema> {\n\tstatic override readonly [entityKind]: string = 'OPSQLiteTransaction';\n\n\toverride transaction<T>(\n\t\ttransaction: (tx: OPSQLiteTransaction<TFullSchema, TRelations, TTablesConfig, TSchema>) => T,\n\t): T {\n\t\tconst savepointName = `sp${this.nestedIndex}`;\n\t\tconst tx = new OPSQLiteTransaction(\n\t\t\t'async',\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tthis.session.run(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = transaction(tx);\n\t\t\tthis.session.run(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tthis.session.run(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class OPSQLitePreparedQuery<\n\tT extends PreparedQueryConfig = PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends SQLitePreparedQuery<\n\t{ type: 'async'; run: QueryResult; all: T['all']; get: T['get']; values: T['values']; execute: T['execute'] }\n> {\n\tstatic override readonly [entityKind]: string = 'OPSQLitePreparedQuery';\n\n\tconstructor(\n\t\tprivate client: OPSQLiteConnection,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => unknown,\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper('sync', executeMethod, query);\n\t}\n\n\trun(placeholderValues?: Record<string, unknown>): Promise<QueryResult> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\treturn this.client.executeAsync(this.query.sql, params);\n\t}\n\n\tasync all(placeholderValues?: Record<string, unknown>): Promise<T['all']> {\n\t\tif (this.isRqbV2Query) return this.allRqbV2(placeholderValues);\n\n\t\tconst { fields, joinsNotNullableMap, query, logger, customResultMapper, client } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\treturn client.execute(query.sql, params).rows?._array || [];\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues) as unknown[][];\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['all'];\n\t\t}\n\t\treturn rows.map((row) => mapResultRow(fields!, row, joinsNotNullableMap));\n\t}\n\n\tprivate async allRqbV2(placeholderValues?: Record<string, unknown>): Promise<T['all']> {\n\t\tconst { query, logger, customResultMapper, client } = this;\n\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tconst rows = client.execute(query.sql, params).rows?._array || [];\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => unknown)(rows) as T['all'];\n\t}\n\n\tasync get(placeholderValues?: Record<string, unknown>): Promise<T['get']> {\n\t\tif (this.isRqbV2Query) return this.getRqbV2(placeholderValues);\n\n\t\tconst { fields, joinsNotNullableMap, customResultMapper, query, logger, client } = this;\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst rows = client.execute(query.sql, params).rows?._array || [];\n\t\t\treturn rows[0];\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues) as unknown[][];\n\t\tconst row = rows[0];\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['get'];\n\t\t}\n\n\t\treturn mapResultRow(fields!, row, joinsNotNullableMap);\n\t}\n\n\tprivate async getRqbV2(placeholderValues?: Record<string, unknown>): Promise<T['get']> {\n\t\tconst { customResultMapper, query, logger, client } = this;\n\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tconst rows = client.execute(query.sql, params).rows?._array || [];\n\t\tconst row = rows[0];\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => unknown)([row]) as T['get'];\n\t}\n\n\tvalues(placeholderValues?: Record<string, unknown>): Promise<T['values']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.client.executeRawAsync(this.query.sql, params);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n"],"mappings":"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","names":["rows"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.39.2-1177ad8",
+  "version": "0.39.2-aaa57ff",
   "description": "Drizzle ORM package for SQL databases",
   "type": "module",
   "scripts": {
@@ -62,7 +62,7 @@
     "@types/sql.js": "*",
     "@vercel/postgres": ">=0.8.0",
     "@xata.io/client": "*",
-    "better-sqlite3": ">=7",
+    "better-sqlite3": ">=9.3.0",
     "bun-types": "*",
     "expo-sqlite": ">=14.0.0",
     "knex": "*",
@@ -177,15 +177,14 @@
     "@planetscale/database": "^1.16.0",
     "@prisma/client": "5.14.0",
     "@tidbcloud/serverless": "^0.1.1",
-    "@types/better-sqlite3": "^7.6.12",
+    "@types/better-sqlite3": "^7.6.4",
     "@types/node": "^20.2.5",
     "@types/pg": "^8.10.1",
     "@types/react": "^18.2.45",
     "@types/sql.js": "^1.4.4",
-    "@upstash/redis": "^1.34.3",
     "@vercel/postgres": "^0.8.0",
     "@xata.io/client": "^0.29.3",
-    "better-sqlite3": "^11.8.1",
+    "better-sqlite3": "^9.3.0",
     "bun-types": "^1.2.0",
     "cpy": "^10.1.0",
     "expo-sqlite": "^14.0.0",
@@ -206,6 +205,18 @@
     "zx": "^7.2.2"
   },
   "exports": {
+    "./_relations": {
+      "import": {
+        "types": "./_relations.d.ts",
+        "default": "./_relations.js"
+      },
+      "require": {
+        "types": "./_relations.d.cts",
+        "default": "./_relations.cjs"
+      },
+      "types": "./_relations.d.ts",
+      "default": "./_relations.js"
+    },
     "./alias": {
       "import": {
         "types": "./alias.d.ts",
@@ -518,54 +529,6 @@
       "types": "./view-common.d.ts",
       "default": "./view-common.js"
     },
-    "./better-sqlite3/driver": {
-      "import": {
-        "types": "./better-sqlite3/driver.d.ts",
-        "default": "./better-sqlite3/driver.js"
-      },
-      "require": {
-        "types": "./better-sqlite3/driver.d.cts",
-        "default": "./better-sqlite3/driver.cjs"
-      },
-      "types": "./better-sqlite3/driver.d.ts",
-      "default": "./better-sqlite3/driver.js"
-    },
-    "./better-sqlite3": {
-      "import": {
-        "types": "./better-sqlite3/index.d.ts",
-        "default": "./better-sqlite3/index.js"
-      },
-      "require": {
-        "types": "./better-sqlite3/index.d.cts",
-        "default": "./better-sqlite3/index.cjs"
-      },
-      "types": "./better-sqlite3/index.d.ts",
-      "default": "./better-sqlite3/index.js"
-    },
-    "./better-sqlite3/migrator": {
-      "import": {
-        "types": "./better-sqlite3/migrator.d.ts",
-        "default": "./better-sqlite3/migrator.js"
-      },
-      "require": {
-        "types": "./better-sqlite3/migrator.d.cts",
-        "default": "./better-sqlite3/migrator.cjs"
-      },
-      "types": "./better-sqlite3/migrator.d.ts",
-      "default": "./better-sqlite3/migrator.js"
-    },
-    "./better-sqlite3/session": {
-      "import": {
-        "types": "./better-sqlite3/session.d.ts",
-        "default": "./better-sqlite3/session.js"
-      },
-      "require": {
-        "types": "./better-sqlite3/session.d.cts",
-        "default": "./better-sqlite3/session.cjs"
-      },
-      "types": "./better-sqlite3/session.d.ts",
-      "default": "./better-sqlite3/session.js"
-    },
     "./bun-sql/driver": {
       "import": {
         "types": "./bun-sql/driver.d.ts",
@@ -614,6 +577,54 @@
       "types": "./bun-sql/session.d.ts",
       "default": "./bun-sql/session.js"
     },
+    "./better-sqlite3/driver": {
+      "import": {
+        "types": "./better-sqlite3/driver.d.ts",
+        "default": "./better-sqlite3/driver.js"
+      },
+      "require": {
+        "types": "./better-sqlite3/driver.d.cts",
+        "default": "./better-sqlite3/driver.cjs"
+      },
+      "types": "./better-sqlite3/driver.d.ts",
+      "default": "./better-sqlite3/driver.js"
+    },
+    "./better-sqlite3": {
+      "import": {
+        "types": "./better-sqlite3/index.d.ts",
+        "default": "./better-sqlite3/index.js"
+      },
+      "require": {
+        "types": "./better-sqlite3/index.d.cts",
+        "default": "./better-sqlite3/index.cjs"
+      },
+      "types": "./better-sqlite3/index.d.ts",
+      "default": "./better-sqlite3/index.js"
+    },
+    "./better-sqlite3/migrator": {
+      "import": {
+        "types": "./better-sqlite3/migrator.d.ts",
+        "default": "./better-sqlite3/migrator.js"
+      },
+      "require": {
+        "types": "./better-sqlite3/migrator.d.cts",
+        "default": "./better-sqlite3/migrator.cjs"
+      },
+      "types": "./better-sqlite3/migrator.d.ts",
+      "default": "./better-sqlite3/migrator.js"
+    },
+    "./better-sqlite3/session": {
+      "import": {
+        "types": "./better-sqlite3/session.d.ts",
+        "default": "./better-sqlite3/session.js"
+      },
+      "require": {
+        "types": "./better-sqlite3/session.d.cts",
+        "default": "./better-sqlite3/session.cjs"
+      },
+      "types": "./better-sqlite3/session.d.ts",
+      "default": "./better-sqlite3/session.js"
+    },
     "./bun-sqlite/driver": {
       "import": {
         "types": "./bun-sqlite/driver.d.ts",
@@ -2750,66 +2761,6 @@
       "types": "./aws-data-api/pg/session.d.ts",
       "default": "./aws-data-api/pg/session.js"
     },
-    "./cache/core/cache": {
-      "import": {
-        "types": "./cache/core/cache.d.ts",
-        "default": "./cache/core/cache.js"
-      },
-      "require": {
-        "types": "./cache/core/cache.d.cts",
-        "default": "./cache/core/cache.cjs"
-      },
-      "types": "./cache/core/cache.d.ts",
-      "default": "./cache/core/cache.js"
-    },
-    "./cache/core": {
-      "import": {
-        "types": "./cache/core/index.d.ts",
-        "default": "./cache/core/index.js"
-      },
-      "require": {
-        "types": "./cache/core/index.d.cts",
-        "default": "./cache/core/index.cjs"
-      },
-      "types": "./cache/core/index.d.ts",
-      "default": "./cache/core/index.js"
-    },
-    "./cache/core/types": {
-      "import": {
-        "types": "./cache/core/types.d.ts",
-        "default": "./cache/core/types.js"
-      },
-      "require": {
-        "types": "./cache/core/types.d.cts",
-        "default": "./cache/core/types.cjs"
-      },
-      "types": "./cache/core/types.d.ts",
-      "default": "./cache/core/types.js"
-    },
-    "./cache/upstash/cache": {
-      "import": {
-        "types": "./cache/upstash/cache.d.ts",
-        "default": "./cache/upstash/cache.js"
-      },
-      "require": {
-        "types": "./cache/upstash/cache.d.cts",
-        "default": "./cache/upstash/cache.cjs"
-      },
-      "types": "./cache/upstash/cache.d.ts",
-      "default": "./cache/upstash/cache.js"
-    },
-    "./cache/upstash": {
-      "import": {
-        "types": "./cache/upstash/index.d.ts",
-        "default": "./cache/upstash/index.js"
-      },
-      "require": {
-        "types": "./cache/upstash/index.d.cts",
-        "default": "./cache/upstash/index.cjs"
-      },
-      "types": "./cache/upstash/index.d.ts",
-      "default": "./cache/upstash/index.js"
-    },
     "./libsql/http": {
       "import": {
         "types": "./libsql/http/index.d.ts",
@@ -3218,6 +3169,18 @@
       "types": "./mysql-core/columns/year.d.ts",
       "default": "./mysql-core/columns/year.js"
     },
+    "./mysql-core/query-builders/_query": {
+      "import": {
+        "types": "./mysql-core/query-builders/_query.d.ts",
+        "default": "./mysql-core/query-builders/_query.js"
+      },
+      "require": {
+        "types": "./mysql-core/query-builders/_query.d.cts",
+        "default": "./mysql-core/query-builders/_query.cjs"
+      },
+      "types": "./mysql-core/query-builders/_query.d.ts",
+      "default": "./mysql-core/query-builders/_query.js"
+    },
     "./mysql-core/query-builders/count": {
       "import": {
         "types": "./mysql-core/query-builders/count.d.ts",
@@ -3722,6 +3685,18 @@
       "types": "./pg-core/columns/varchar.d.ts",
       "default": "./pg-core/columns/varchar.js"
     },
+    "./pg-core/query-builders/_query": {
+      "import": {
+        "types": "./pg-core/query-builders/_query.d.ts",
+        "default": "./pg-core/query-builders/_query.js"
+      },
+      "require": {
+        "types": "./pg-core/query-builders/_query.d.cts",
+        "default": "./pg-core/query-builders/_query.cjs"
+      },
+      "types": "./pg-core/query-builders/_query.d.ts",
+      "default": "./pg-core/query-builders/_query.js"
+    },
     "./pg-core/query-builders/count": {
       "import": {
         "types": "./pg-core/query-builders/count.d.ts",
@@ -4610,6 +4585,18 @@
       "types": "./sqlite-core/columns/text.d.ts",
       "default": "./sqlite-core/columns/text.js"
     },
+    "./sqlite-core/query-builders/_query": {
+      "import": {
+        "types": "./sqlite-core/query-builders/_query.d.ts",
+        "default": "./sqlite-core/query-builders/_query.js"
+      },
+      "require": {
+        "types": "./sqlite-core/query-builders/_query.d.cts",
+        "default": "./sqlite-core/query-builders/_query.cjs"
+      },
+      "types": "./sqlite-core/query-builders/_query.d.ts",
+      "default": "./sqlite-core/query-builders/_query.js"
+    },
     "./sqlite-core/query-builders/count": {
       "import": {
         "types": "./sqlite-core/query-builders/count.d.ts",

package/pg-core/db.cjs

@@ -27,29 +27,33 @@ var import_query_builders = require("./query-builders/index.cjs");
 var import_selection_proxy = require("../selection-proxy.cjs");
 var import_sql = require("../sql/sql.cjs");
 var import_subquery = require("../subquery.cjs");
+var import_query = require("./query-builders/_query.cjs");
 var import_count = require("./query-builders/count.cjs");
-var import_query = require("./query-builders/query.cjs");
+var import_query2 = require("./query-builders/query.cjs");
 var import_raw = require("./query-builders/raw.cjs");
 var import_refresh_materialized_view = require("./query-builders/refresh-materialized-view.cjs");
 class PgDatabase {
-  constructor(dialect, session, schema) {
+  constructor(dialect, session, relations, schema) {
     this.dialect = dialect;
     this.session = session;
+    const rel = relations ?? {};
     this._ = schema ? {
       schema: schema.schema,
       fullSchema: schema.fullSchema,
       tableNamesMap: schema.tableNamesMap,
+      relations: rel,
       session
     } : {
       schema: void 0,
       fullSchema: {},
       tableNamesMap: {},
+      relations: rel,
       session
     };
-    this.query = {};
+    this._query = {};
     if (this._.schema) {
       for (const [tableName, columns] of Object.entries(this._.schema)) {
-        this.query[tableName] = new import_query.RelationalQueryBuilder(
+        this._query[tableName] = new import_query._RelationalQueryBuilder(
           schema.fullSchema,
           this._.schema,
           this._.tableNamesMap,
@@ -60,8 +64,25 @@ class PgDatabase {
         );
       }
     }
+    this.query = {};
+    if (relations) {
+      for (const [tableName, relation] of Object.entries(relations.tablesConfig)) {
+        this.query[tableName] = new import_query2.RelationalQueryBuilder(
+          relations.tables,
+          relations.tablesConfig,
+          relations.tableNamesMap,
+          relation.table,
+          relation,
+          dialect,
+          session
+        );
+      }
+    }
   }
   static [import_entity.entityKind] = "PgDatabase";
+  /** @deprecated */
+  _query;
+  // TO-DO: Figure out how to pass DrizzleTypeError without breaking withReplicas
   query;
   /**
    * Creates a subquery that defines a temporary named result set as a CTE.
@@ -116,7 +137,6 @@ class PgDatabase {
   $count(source, filters) {
     return new import_count.PgCountBuilder({ source, filters, session: this.session });
   }
-  $cache;
   /**
    * Incorporates a previously defined CTE (using `$with`) into the main query.
    *
@@ -303,7 +323,10 @@ class PgDatabase {
     );
   }
   transaction(transaction, config) {
-    return this.session.transaction(transaction, config);
+    return this.session.transaction(
+      transaction,
+      config
+    );
   }
 }
 const withReplicas = (primary, replicas, getReplica = () => replicas[Math.floor(Math.random() * replicas.length)]) => {
@@ -334,6 +357,9 @@ const withReplicas = (primary, replicas, getReplica = () => replicas[Math.floor(
     $count,
     $with,
     with: _with,
+    get _query() {
+      return getReplica(replicas)._query;
+    },
     get query() {
       return getReplica(replicas).query;
     }