relq 1.0.116 → 1.0.117

package/dist/cjs/condition/condition-collector.cjs

@@ -16,6 +16,7 @@ const network_condition_builder_1 = require("./network-condition-builder.cjs");
 const postgis_condition_builder_1 = require("./postgis-condition-builder.cjs");
 class ConditionCollector {
     conditions = [];
+    _tables;
     _jsonb;
     _array;
     _fulltext;
@@ -229,11 +230,23 @@ class ConditionCollector {
         return this.isNotNull(column);
     }
     in(column, values) {
-        this.conditions.push({ method: 'in', column, values });
+        if (typeof values === 'function') {
+            const subquery = values(this._tables);
+            this.conditions.push({ method: 'in', column, values: subquery.toString() });
+        }
+        else {
+            this.conditions.push({ method: 'in', column, values });
+        }
         return this;
     }
     notIn(column, values) {
-        this.conditions.push({ method: 'notIn', column, values });
+        if (typeof values === 'function') {
+            const subquery = values(this._tables);
+            this.conditions.push({ method: 'notIn', column, values: subquery.toString() });
+        }
+        else {
+            this.conditions.push({ method: 'notIn', column, values });
+        }
         return this;
     }
     exists(subquery) {
@@ -398,11 +411,17 @@ function buildConditionSQL(condition) {
             return `(${startCol}, ${endCol}) OVERLAPS (${(0, pg_format_1.default)('%L', startVal)}, ${(0, pg_format_1.default)('%L', endVal)})`;
         }
         case 'in': {
+            if (typeof values === 'string') {
+                return `${col} IN (${values})`;
+            }
             const valueList = Array.isArray(values) ? values : [values];
             const formattedValues = valueList.map(v => (0, pg_format_1.default)('%L', v)).join(', ');
             return `${col} IN (${formattedValues})`;
         }
         case 'notIn': {
+            if (typeof values === 'string') {
+                return `${col} NOT IN (${values})`;
+            }
             const valueList = Array.isArray(values) ? values : [values];
             const formattedValues = valueList.map(v => (0, pg_format_1.default)('%L', v)).join(', ');
             return `${col} NOT IN (${formattedValues})`;

package/dist/cjs/core/helpers/ConnectedAggregateBuilder.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectedAggregateBuilder = void 0;
 const methods_1 = require("./methods.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 class ConnectedAggregateBuilder {
     builder;
     relq;
@@ -73,7 +74,10 @@ class ConnectedAggregateBuilder {
         return this;
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     having(callback) {

package/dist/cjs/core/helpers/ConnectedCountBuilder.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectedCountBuilder = void 0;
 const methods_1 = require("./methods.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 class ConnectedCountBuilder {
     builder;
     relq;
@@ -22,6 +23,7 @@ class ConnectedCountBuilder {
     }
     where(callback) {
         this.builder.where((q) => {
+            q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
             const wrapped = this.wrapConditionBuilder(q);
             return callback(wrapped);
         });

package/dist/cjs/core/helpers/ConnectedDeleteBuilder.cjs

@@ -4,6 +4,7 @@ exports.ConnectedDeleteBuilder = void 0;
 const methods_1 = require("./methods.cjs");
 const ReturningExecutor_1 = require("./ReturningExecutor.cjs");
 const capability_guard_1 = require("./capability-guard.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 class ConnectedDeleteBuilder {
     builder;
     relq;
@@ -35,7 +36,10 @@ class ConnectedDeleteBuilder {
         });
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     toString() {

package/dist/cjs/core/helpers/ConnectedSelectBuilder.cjs

@@ -5,6 +5,7 @@ const methods_1 = require("./methods.cjs");
 const select_joins_1 = require("./select-joins.cjs");
 const select_pagination_1 = require("./select-pagination.cjs");
 const capability_guard_1 = require("./capability-guard.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 const sql_expression_1 = require("../../select/sql-expression.cjs");
 const table_proxy_1 = require("../../select/table-proxy.cjs");
 const fk_resolver_1 = require("../../utils/fk-resolver.cjs");
@@ -116,7 +117,10 @@ class ConnectedSelectBuilder {
         }
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     orderBy(column, direction) {

package/dist/cjs/core/helpers/ConnectedTransactionBuilder.cjs

@@ -1,44 +1,103 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectedTransactionBuilder = void 0;
-const transaction_builder_1 = require("../../transaction/transaction-builder.cjs");
+exports.TransactionClient = void 0;
+exports.executeTransaction = executeTransaction;
+const ConnectedRawQueryBuilder_1 = require("./ConnectedRawQueryBuilder.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 const methods_1 = require("./methods.cjs");
-class ConnectedTransactionBuilder {
+class TransactionClient {
+    client;
     relq;
-    constructor(relq) {
+    schema;
+    constructor(client, relq) {
+        this.client = client;
         this.relq = relq;
+        const internal = this.relq[methods_1.INTERNAL];
+        this.schema = internal.getSchema?.() ?? this.relq.schema;
     }
-    builder = new transaction_builder_1.TransactionBuilder();
-    toString() {
-        return this.builder.toString();
+    get table() {
+        return (0, table_accessor_1.createTableAccessor)(this, this.schema);
     }
-    async begin() {
-        const sql = this.builder.toString();
-        return this.relq[methods_1.INTERNAL].executeRun(sql);
+    raw(query, ...params) {
+        return new ConnectedRawQueryBuilder_1.ConnectedRawQueryBuilder(query, params, this);
     }
-    async commit() {
-        const sql = this.builder.commit();
-        return this.relq[methods_1.INTERNAL].executeRun(sql);
+    get [methods_1.INTERNAL]() {
+        const parentInternal = this.relq[methods_1.INTERNAL];
+        const queryViaClient = async (sql) => {
+            const start = performance.now();
+            const pgResult = await this.client.query(sql);
+            return {
+                result: {
+                    rows: pgResult.rows,
+                    rowCount: pgResult.rowCount,
+                    command: pgResult.command,
+                    fields: pgResult.fields?.map((f) => ({ name: f.name, dataTypeID: f.dataTypeID })) ?? [],
+                },
+                duration: performance.now() - start,
+            };
+        };
+        const buildMetadata = (result, duration) => ({
+            rowCount: result.rowCount,
+            command: result.command,
+            duration,
+            fields: result.fields,
+        });
+        return {
+            executeQuery: queryViaClient,
+            async executeSelect(sql, tableName) {
+                const { result, duration } = await queryViaClient(sql);
+                const rows = tableName
+                    ? parentInternal.transformResultsFromDb(tableName, result.rows)
+                    : result.rows;
+                return { data: rows, metadata: buildMetadata(result, duration) };
+            },
+            async executeSelectOne(sql, tableName) {
+                const { result, duration } = await queryViaClient(sql);
+                const row = result.rows[0]
+                    ? (tableName ? parentInternal.transformFromDbColumns(tableName, result.rows[0]) : result.rows[0])
+                    : null;
+                return { data: row, metadata: buildMetadata(result, duration) };
+            },
+            async executeCount(sql) {
+                const { result, duration } = await queryViaClient(sql);
+                const count = result.rows[0]?.count ? parseInt(result.rows[0].count, 10) : 0;
+                return { count, metadata: buildMetadata(result, duration) };
+            },
+            async executeRun(sql) {
+                const { result, duration } = await queryViaClient(sql);
+                return { success: true, metadata: buildMetadata(result, duration) };
+            },
+            transformToDbColumns: parentInternal.transformToDbColumns,
+            transformFromDbColumns: parentInternal.transformFromDbColumns,
+            transformResultsFromDb: parentInternal.transformResultsFromDb,
+            hasColumnMapping: parentInternal.hasColumnMapping,
+            validateData: parentInternal.validateData,
+            getSchema: parentInternal.getSchema,
+            getRelations: parentInternal.getRelations,
+            getTableDef: parentInternal.getTableDef,
+            getClientForCursor: async () => ({ client: this.client, release: () => { } }),
+        };
     }
-    async rollback() {
-        const sql = this.builder.rollback();
-        return this.relq[methods_1.INTERNAL].executeRun(sql);
-    }
-    isolationLevel(level) {
-        this.builder.isolation(level);
-        return this;
-    }
-    readOnly() {
-        this.builder.readOnly();
-        return this;
+}
+exports.TransactionClient = TransactionClient;
+async function executeTransaction(relq, callback) {
+    await relq.ensureInitialized();
+    const { client, release } = await relq[methods_1.INTERNAL].getClientForCursor();
+    try {
+        await client.query('BEGIN');
+        const tx = new TransactionClient(client, relq);
+        const result = await callback(tx);
+        await client.query('COMMIT');
+        return result;
     }
-    readWrite() {
-        this.builder.readWrite();
-        return this;
+    catch (error) {
+        try {
+            await client.query('ROLLBACK');
+        }
+        catch { }
+        throw error;
     }
-    deferrable() {
-        this.builder.deferrable();
-        return this;
+    finally {
+        release();
     }
 }
-exports.ConnectedTransactionBuilder = ConnectedTransactionBuilder;

package/dist/cjs/core/helpers/ConnectedUpdateBuilder.cjs

@@ -4,6 +4,7 @@ exports.ConnectedUpdateBuilder = void 0;
 const methods_1 = require("./methods.cjs");
 const ReturningExecutor_1 = require("./ReturningExecutor.cjs");
 const capability_guard_1 = require("./capability-guard.cjs");
+const table_accessor_1 = require("../shared/table-accessor.cjs");
 class ConnectedUpdateBuilder {
     builder;
     relq;
@@ -48,7 +49,10 @@ class ConnectedUpdateBuilder {
         });
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     toString() {

package/dist/cjs/core/helpers/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debugLog = exports.INTERNAL = exports.ReturningExecutor = exports.PaginateBuilder = exports.ConnectedRawQueryBuilder = exports.ConnectedQueryBuilder = exports.ConnectedTransactionBuilder = exports.ConnectedCountBuilder = exports.ConnectedInsertBuilder = exports.ConnectedDeleteBuilder = exports.ConnectedUpdateBuilder = exports.ConnectedSelectBuilder = exports.ConnectedCTEBuilder = exports.ConnectedAggregateBuilder = void 0;
+exports.debugLog = exports.INTERNAL = exports.ReturningExecutor = exports.PaginateBuilder = exports.ConnectedRawQueryBuilder = exports.ConnectedQueryBuilder = exports.executeTransaction = exports.TransactionClient = exports.ConnectedCountBuilder = exports.ConnectedInsertBuilder = exports.ConnectedDeleteBuilder = exports.ConnectedUpdateBuilder = exports.ConnectedSelectBuilder = exports.ConnectedCTEBuilder = exports.ConnectedAggregateBuilder = void 0;
 var ConnectedAggregateBuilder_1 = require("./ConnectedAggregateBuilder.cjs");
 Object.defineProperty(exports, "ConnectedAggregateBuilder", { enumerable: true, get: function () { return ConnectedAggregateBuilder_1.ConnectedAggregateBuilder; } });
 var ConnectedCTEBuilder_1 = require("./ConnectedCTEBuilder.cjs");
@@ -16,7 +16,8 @@ Object.defineProperty(exports, "ConnectedInsertBuilder", { enumerable: true, get
 var ConnectedCountBuilder_1 = require("./ConnectedCountBuilder.cjs");
 Object.defineProperty(exports, "ConnectedCountBuilder", { enumerable: true, get: function () { return ConnectedCountBuilder_1.ConnectedCountBuilder; } });
 var ConnectedTransactionBuilder_1 = require("./ConnectedTransactionBuilder.cjs");
-Object.defineProperty(exports, "ConnectedTransactionBuilder", { enumerable: true, get: function () { return ConnectedTransactionBuilder_1.ConnectedTransactionBuilder; } });
+Object.defineProperty(exports, "TransactionClient", { enumerable: true, get: function () { return ConnectedTransactionBuilder_1.TransactionClient; } });
+Object.defineProperty(exports, "executeTransaction", { enumerable: true, get: function () { return ConnectedTransactionBuilder_1.executeTransaction; } });
 var ConnectedQueryBuilder_1 = require("./ConnectedQueryBuilder.cjs");
 Object.defineProperty(exports, "ConnectedQueryBuilder", { enumerable: true, get: function () { return ConnectedQueryBuilder_1.ConnectedQueryBuilder; } });
 var ConnectedRawQueryBuilder_1 = require("./ConnectedRawQueryBuilder.cjs");

package/dist/cjs/core/relq-base.cjs

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelqBase = void 0;
 const node_events_1 = require("node:events");
@@ -173,8 +206,9 @@ class RelqBase {
     raw(query, ...params) {
         return new helpers_1.ConnectedRawQueryBuilder(query, params, this);
     }
-    transaction() {
-        return new helpers_1.ConnectedTransactionBuilder(this);
+    async transaction(callback) {
+        const { executeTransaction } = await Promise.resolve().then(() => __importStar(require("./helpers/ConnectedTransactionBuilder.cjs")));
+        return executeTransaction(this, callback);
     }
     with(name, query) {
         return new helpers_1.ConnectedCTEBuilder(this).with(name, query);

package/dist/esm/condition/condition-collector.js

@@ -8,6 +8,7 @@ import { NetworkConditionCollector, buildNetworkConditionSQL } from "./network-c
 import { PostgisConditionCollector, buildPostgisConditionSQL } from "./postgis-condition-builder.js";
 export class ConditionCollector {
     conditions = [];
+    _tables;
     _jsonb;
     _array;
     _fulltext;
@@ -221,11 +222,23 @@ export class ConditionCollector {
         return this.isNotNull(column);
     }
     in(column, values) {
-        this.conditions.push({ method: 'in', column, values });
+        if (typeof values === 'function') {
+            const subquery = values(this._tables);
+            this.conditions.push({ method: 'in', column, values: subquery.toString() });
+        }
+        else {
+            this.conditions.push({ method: 'in', column, values });
+        }
         return this;
     }
     notIn(column, values) {
-        this.conditions.push({ method: 'notIn', column, values });
+        if (typeof values === 'function') {
+            const subquery = values(this._tables);
+            this.conditions.push({ method: 'notIn', column, values: subquery.toString() });
+        }
+        else {
+            this.conditions.push({ method: 'notIn', column, values });
+        }
         return this;
     }
     exists(subquery) {
@@ -389,11 +402,17 @@ export function buildConditionSQL(condition) {
             return `(${startCol}, ${endCol}) OVERLAPS (${format('%L', startVal)}, ${format('%L', endVal)})`;
         }
         case 'in': {
+            if (typeof values === 'string') {
+                return `${col} IN (${values})`;
+            }
             const valueList = Array.isArray(values) ? values : [values];
             const formattedValues = valueList.map(v => format('%L', v)).join(', ');
             return `${col} IN (${formattedValues})`;
         }
         case 'notIn': {
+            if (typeof values === 'string') {
+                return `${col} NOT IN (${values})`;
+            }
             const valueList = Array.isArray(values) ? values : [values];
             const formattedValues = valueList.map(v => format('%L', v)).join(', ');
             return `${col} NOT IN (${formattedValues})`;

package/dist/esm/core/helpers/ConnectedAggregateBuilder.js

@@ -1,4 +1,5 @@
 import { INTERNAL } from "./methods.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 export class ConnectedAggregateBuilder {
     builder;
     relq;
@@ -70,7 +71,10 @@ export class ConnectedAggregateBuilder {
         return this;
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = createTableAccessor(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     having(callback) {

package/dist/esm/core/helpers/ConnectedCountBuilder.js

@@ -1,4 +1,5 @@
 import { INTERNAL } from "./methods.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 export class ConnectedCountBuilder {
     builder;
     relq;
@@ -19,6 +20,7 @@ export class ConnectedCountBuilder {
     }
     where(callback) {
         this.builder.where((q) => {
+            q._tables = createTableAccessor(this.relq, this.relq.schema);
             const wrapped = this.wrapConditionBuilder(q);
             return callback(wrapped);
         });

package/dist/esm/core/helpers/ConnectedDeleteBuilder.js

@@ -1,6 +1,7 @@
 import { INTERNAL } from "./methods.js";
 import { ReturningExecutor } from "./ReturningExecutor.js";
 import { requireCapability } from "./capability-guard.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 export class ConnectedDeleteBuilder {
     builder;
     relq;
@@ -32,7 +33,10 @@ export class ConnectedDeleteBuilder {
         });
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = createTableAccessor(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     toString() {

package/dist/esm/core/helpers/ConnectedSelectBuilder.js

@@ -2,6 +2,7 @@ import { INTERNAL } from "./methods.js";
 import { executeTypeSafeJoin, executeTypeSafeJoinMany, executeTypeSafeJoinManyThrough } from "./select-joins.js";
 import { executeCursorEach, executePagination } from "./select-pagination.js";
 import { requireCapability } from "./capability-guard.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 import { AggregateFunctions } from "../../select/sql-expression.js";
 import { createTableProxy } from "../../select/table-proxy.js";
 import { resolveForeignKey } from "../../utils/fk-resolver.js";
@@ -113,7 +114,10 @@ export class ConnectedSelectBuilder {
         }
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = createTableAccessor(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     orderBy(column, direction) {

package/dist/esm/core/helpers/ConnectedTransactionBuilder.js

@@ -1,40 +1,98 @@
-import { TransactionBuilder } from "../../transaction/transaction-builder.js";
+import { ConnectedRawQueryBuilder } from "./ConnectedRawQueryBuilder.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 import { INTERNAL } from "./methods.js";
-export class ConnectedTransactionBuilder {
+export class TransactionClient {
+    client;
     relq;
-    constructor(relq) {
+    schema;
+    constructor(client, relq) {
+        this.client = client;
         this.relq = relq;
+        const internal = this.relq[INTERNAL];
+        this.schema = internal.getSchema?.() ?? this.relq.schema;
     }
-    builder = new TransactionBuilder();
-    toString() {
-        return this.builder.toString();
+    get table() {
+        return createTableAccessor(this, this.schema);
     }
-    async begin() {
-        const sql = this.builder.toString();
-        return this.relq[INTERNAL].executeRun(sql);
+    raw(query, ...params) {
+        return new ConnectedRawQueryBuilder(query, params, this);
     }
-    async commit() {
-        const sql = this.builder.commit();
-        return this.relq[INTERNAL].executeRun(sql);
+    get [INTERNAL]() {
+        const parentInternal = this.relq[INTERNAL];
+        const queryViaClient = async (sql) => {
+            const start = performance.now();
+            const pgResult = await this.client.query(sql);
+            return {
+                result: {
+                    rows: pgResult.rows,
+                    rowCount: pgResult.rowCount,
+                    command: pgResult.command,
+                    fields: pgResult.fields?.map((f) => ({ name: f.name, dataTypeID: f.dataTypeID })) ?? [],
+                },
+                duration: performance.now() - start,
+            };
+        };
+        const buildMetadata = (result, duration) => ({
+            rowCount: result.rowCount,
+            command: result.command,
+            duration,
+            fields: result.fields,
+        });
+        return {
+            executeQuery: queryViaClient,
+            async executeSelect(sql, tableName) {
+                const { result, duration } = await queryViaClient(sql);
+                const rows = tableName
+                    ? parentInternal.transformResultsFromDb(tableName, result.rows)
+                    : result.rows;
+                return { data: rows, metadata: buildMetadata(result, duration) };
+            },
+            async executeSelectOne(sql, tableName) {
+                const { result, duration } = await queryViaClient(sql);
+                const row = result.rows[0]
+                    ? (tableName ? parentInternal.transformFromDbColumns(tableName, result.rows[0]) : result.rows[0])
+                    : null;
+                return { data: row, metadata: buildMetadata(result, duration) };
+            },
+            async executeCount(sql) {
+                const { result, duration } = await queryViaClient(sql);
+                const count = result.rows[0]?.count ? parseInt(result.rows[0].count, 10) : 0;
+                return { count, metadata: buildMetadata(result, duration) };
+            },
+            async executeRun(sql) {
+                const { result, duration } = await queryViaClient(sql);
+                return { success: true, metadata: buildMetadata(result, duration) };
+            },
+            transformToDbColumns: parentInternal.transformToDbColumns,
+            transformFromDbColumns: parentInternal.transformFromDbColumns,
+            transformResultsFromDb: parentInternal.transformResultsFromDb,
+            hasColumnMapping: parentInternal.hasColumnMapping,
+            validateData: parentInternal.validateData,
+            getSchema: parentInternal.getSchema,
+            getRelations: parentInternal.getRelations,
+            getTableDef: parentInternal.getTableDef,
+            getClientForCursor: async () => ({ client: this.client, release: () => { } }),
+        };
     }
-    async rollback() {
-        const sql = this.builder.rollback();
-        return this.relq[INTERNAL].executeRun(sql);
-    }
-    isolationLevel(level) {
-        this.builder.isolation(level);
-        return this;
-    }
-    readOnly() {
-        this.builder.readOnly();
-        return this;
+}
+export async function executeTransaction(relq, callback) {
+    await relq.ensureInitialized();
+    const { client, release } = await relq[INTERNAL].getClientForCursor();
+    try {
+        await client.query('BEGIN');
+        const tx = new TransactionClient(client, relq);
+        const result = await callback(tx);
+        await client.query('COMMIT');
+        return result;
     }
-    readWrite() {
-        this.builder.readWrite();
-        return this;
+    catch (error) {
+        try {
+            await client.query('ROLLBACK');
+        }
+        catch { }
+        throw error;
     }
-    deferrable() {
-        this.builder.deferrable();
-        return this;
+    finally {
+        release();
     }
 }

package/dist/esm/core/helpers/ConnectedUpdateBuilder.js

@@ -1,6 +1,7 @@
 import { INTERNAL } from "./methods.js";
 import { ReturningExecutor } from "./ReturningExecutor.js";
 import { requireCapability } from "./capability-guard.js";
+import { createTableAccessor } from "../shared/table-accessor.js";
 export class ConnectedUpdateBuilder {
     builder;
     relq;
@@ -45,7 +46,10 @@ export class ConnectedUpdateBuilder {
         });
     }
     where(callback) {
-        this.builder.where(callback);
+        this.builder.where((q) => {
+            q._tables = createTableAccessor(this.relq, this.relq.schema);
+            return callback(q);
+        });
         return this;
     }
     toString() {

package/dist/esm/core/helpers/index.js

@@ -5,7 +5,7 @@ export { ConnectedUpdateBuilder } from "./ConnectedUpdateBuilder.js";
 export { ConnectedDeleteBuilder } from "./ConnectedDeleteBuilder.js";
 export { ConnectedInsertBuilder } from "./ConnectedInsertBuilder.js";
 export { ConnectedCountBuilder } from "./ConnectedCountBuilder.js";
-export { ConnectedTransactionBuilder } from "./ConnectedTransactionBuilder.js";
+export { TransactionClient, executeTransaction } from "./ConnectedTransactionBuilder.js";
 export { ConnectedQueryBuilder } from "./ConnectedQueryBuilder.js";
 export { ConnectedRawQueryBuilder } from "./ConnectedRawQueryBuilder.js";
 export { PaginateBuilder } from "./PaginateBuilder.js";

package/dist/esm/core/relq-base.js

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 import { RelqConnectionError } from "../errors/relq-errors.js";
 import { ConditionCollector } from "../condition/condition-collector.js";
-import { ConnectedCTEBuilder, ConnectedRawQueryBuilder, ConnectedTransactionBuilder, INTERNAL, debugLog } from "./helpers/index.js";
+import { ConnectedCTEBuilder, ConnectedRawQueryBuilder, INTERNAL, debugLog } from "./helpers/index.js";
 import { ConnectedScalarSelectBuilder } from "../select/scalar-select-builder.js";
 import { buildColumnMappings, transformToDbColumns, transformFromDbColumns, transformResultsFromDb, hasColumnMapping } from "./shared/column-mapping.js";
 import { validateData } from "./shared/validation.js";
@@ -170,8 +170,9 @@ export class RelqBase {
     raw(query, ...params) {
         return new ConnectedRawQueryBuilder(query, params, this);
     }
-    transaction() {
-        return new ConnectedTransactionBuilder(this);
+    async transaction(callback) {
+        const { executeTransaction } = await import("./helpers/ConnectedTransactionBuilder.js");
+        return executeTransaction(this, callback);
     }
     with(name, query) {
         return new ConnectedCTEBuilder(this).with(name, query);

package/dist/index.d.ts

@@ -919,10 +919,16 @@ export interface TypedConditionBuilder<TTable = any> {
 	lessThanOrEqual<K extends ColumnName<TTable>>(column: K, value: ConditionValue<TTable, K>): TypedConditionBuilder<TTable>;
 	/** Alias for isNotNull - creates an IS NOT NULL condition */
 	notNull<K extends ColumnName<TTable>>(column: K): TypedConditionBuilder<TTable>;
-	/** Creates an IN condition for array matching */
+	/** Creates an IN condition for array matching or subquery */
 	in<K extends ColumnName<TTable>>(column: K, values: ConditionValue<TTable, K>[]): TypedConditionBuilder<TTable>;
-	/** Creates a NOT IN condition for array exclusion */
+	in<K extends ColumnName<TTable>>(column: K, subquery: (t: any) => {
+		toString(): string;
+	}): TypedConditionBuilder<TTable>;
+	/** Creates a NOT IN condition for array exclusion or subquery */
 	notIn<K extends ColumnName<TTable>>(column: K, values: ConditionValue<TTable, K>[]): TypedConditionBuilder<TTable>;
+	notIn<K extends ColumnName<TTable>>(column: K, subquery: (t: any) => {
+		toString(): string;
+	}): TypedConditionBuilder<TTable>;
 	/** Creates an EXISTS condition with subquery */
 	exists(subquery: string): TypedConditionBuilder<TTable>;
 	/** Creates a NOT EXISTS condition with subquery */
@@ -9703,43 +9709,6 @@ declare class ConnectedSelectBuilder<TSchema = any, TTable = any, TColumns exten
 	 */
 	pagination<T = InferResultType<TSchema, TTable, TColumns> & TJoined>(options: PaginationOptions): Promise<PaginatedResult<T>>;
 }
-declare class ConnectedTransactionBuilder {
-	private relq;
-	constructor(relq: RelqBase);
-	private builder;
-	/**
-	 * Get SQL string (always available)
-	 */
-	toString(): string;
-	/**
-	 * Begin transaction
-	 */
-	begin(): Promise<RelqRun>;
-	/**
-	 * Commit transaction
-	 */
-	commit(): Promise<RelqRun>;
-	/**
-	 * Rollback transaction
-	 */
-	rollback(): Promise<RelqRun>;
-	/**
-	 * Set isolation level
-	 */
-	isolationLevel(level: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE"): this;
-	/**
-	 * Set transaction as read only
-	 */
-	readOnly(): this;
-	/**
-	 * Set transaction as read write
-	 */
-	readWrite(): this;
-	/**
-	 * Set transaction as deferrable
-	 */
-	deferrable(): this;
-}
 declare class ConnectedRawQueryBuilder {
 	private query;
 	private params;
@@ -9819,6 +9788,18 @@ declare class ConnectedRawQueryBuilder {
 	count(): Promise<RelqCount>;
 }
 declare const INTERNAL: unique symbol;
+declare class TransactionClient<TSchema = any> {
+	private client;
+	private relq;
+	private schema;
+	constructor(client: any, relq: RelqBase<TSchema>);
+	get table(): TableAccessor<TSchema, this>;
+	raw(query: string, ...params: QueryValue[]): ConnectedRawQueryBuilder;
+	/**
+	 * INTERNAL accessor — same interface as RelqBase but queries go through the tx client
+	 */
+	get [INTERNAL](): RelqInternal;
+}
 /**
  * Marker interface for scalar subquery results.
  * Contains type information and SQL generation capability.
@@ -10087,9 +10068,12 @@ export declare abstract class RelqBase<TSchema = any> {
 	 */
 	raw(query: string, ...params: QueryValue[]): ConnectedRawQueryBuilder;
 	/**
-	 * Create a transaction builder
+	 * Run a callback inside a transaction.
+	 * Acquires a dedicated client, runs BEGIN, executes the callback,
+	 * then COMMIT on success or ROLLBACK on error.
+	 * Returns whatever the callback returns with full type inference.
 	 */
-	transaction(): ConnectedTransactionBuilder;
+	transaction<TResult>(callback: (tx: TransactionClient<TSchema>) => Promise<TResult>): Promise<TResult>;
 	/**
 	 * Start a CTE (Common Table Expression) query
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.116",
+  "version": "1.0.117",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",