@baasix/baasix 0.1.61 → 0.1.63

package/dist/routes/schema-diff.route.js

@@ -0,0 +1,320 @@
+import { getSqlClient, getDatabase } from "../utils/db.js";
+import { schemaManager } from "../utils/schemaManager.js";
+import { adminOnly } from "../utils/auth.js";
+import { APIError } from "../utils/errorHandler.js";
+/**
+ * Determines which schema fields should produce actual database columns.
+ * Relation-only fields (no explicit type) do NOT produce columns,
+ * but BelongsTo relations produce a foreignKey column.
+ */
+function getExpectedColumns(schema) {
+    const columns = new Map();
+    for (const [fieldName, fieldSchema] of Object.entries(schema.fields)) {
+        const fs = fieldSchema;
+        // BelongsTo relations create a foreign key column
+        if (fs.relType === "BelongsTo") {
+            const foreignKey = fs.foreignKey || `${fieldName}_Id`;
+            if (foreignKey === fieldName && fs.type) {
+                // Field itself is the FK column with explicit type
+                columns.set(fieldName, { type: fs.type, fromField: fieldName });
+            }
+            else if (foreignKey !== fieldName) {
+                // Separate FK column
+                columns.set(foreignKey, { type: fs.type || "UUID", fromField: fieldName });
+            }
+            // If foreignKey === fieldName but no explicit type, handled by FK logic
+            if (foreignKey === fieldName && !fs.type) {
+                columns.set(foreignKey, { type: "UUID", fromField: fieldName });
+            }
+            continue;
+        }
+        // Skip relation-only fields (no explicit type)
+        if (fs.relType && !fs.type)
+            continue;
+        columns.set(fieldName, { type: fs.type || "String", fromField: fieldName });
+    }
+    // Implicit columns from schema flags
+    if (schema.timestamps !== false) {
+        if (!columns.has("createdAt"))
+            columns.set("createdAt", { type: "DateTime", fromField: "[timestamps]" });
+        if (!columns.has("updatedAt"))
+            columns.set("updatedAt", { type: "DateTime", fromField: "[timestamps]" });
+    }
+    if (schema.paranoid) {
+        if (!columns.has("deletedAt"))
+            columns.set("deletedAt", { type: "DateTime", fromField: "[paranoid]" });
+    }
+    if (schema.sortEnabled) {
+        if (!columns.has("sort"))
+            columns.set("sort", { type: "Integer", fromField: "[sortEnabled]" });
+    }
+    if (schema.usertrack) {
+        if (!columns.has("userCreated"))
+            columns.set("userCreated", { type: "UUID", fromField: "[usertrack]" });
+        if (!columns.has("userUpdated"))
+            columns.set("userUpdated", { type: "UUID", fromField: "[usertrack]" });
+    }
+    return columns;
+}
+const registerEndpoint = (app, context) => {
+    /**
+     * GET /utils/schema-diff
+     * Compare schema definitions with actual database tables/columns.
+     * Admin-only endpoint.
+     */
+    app.get("/utils/schema-diff", adminOnly, async (req, res, next) => {
+        try {
+            const sql = getSqlClient();
+            // 1. Get all tables in the public schema from the actual database
+            // Tables to exclude from comparison (e.g. PostGIS internal tables)
+            const excludedTables = ['spatial_ref_sys'];
+            const dbTables = await sql `
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_schema = 'public'
+          AND table_type = 'BASE TABLE'
+          AND table_name != ALL(${excludedTables})
+        ORDER BY table_name
+      `;
+            const dbTableNames = new Set(dbTables.map((t) => t.table_name));
+            // 2. Get all columns per table from the database
+            const dbColumns = await sql `
+        SELECT table_name, column_name, data_type, is_nullable, column_default,
+               character_maximum_length, numeric_precision, numeric_scale
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name != ALL(${excludedTables})
+        ORDER BY table_name, ordinal_position
+      `;
+            const dbColumnsByTable = new Map();
+            for (const col of dbColumns) {
+                if (!dbColumnsByTable.has(col.table_name)) {
+                    dbColumnsByTable.set(col.table_name, []);
+                }
+                dbColumnsByTable.get(col.table_name).push(col);
+            }
+            // 3. Get all schema definitions from baasix
+            const allSchemaDefinitions = new Map();
+            // Access internal schemaDefinitions via the public API
+            const schemasMap = schemaManager.getAllSchemas();
+            for (const [collectionName] of schemasMap) {
+                const schemaDef = await schemaManager.getSchemaDefinition(collectionName);
+                if (schemaDef) {
+                    allSchemaDefinitions.set(collectionName, schemaDef);
+                }
+            }
+            const schemaCollectionNames = new Set(allSchemaDefinitions.keys());
+            // 4. Compute diffs
+            // Tables in schema but not in database
+            const tablesOnlyInSchema = [];
+            for (const name of schemaCollectionNames) {
+                if (!dbTableNames.has(name)) {
+                    tablesOnlyInSchema.push(name);
+                }
+            }
+            // Tables in database but not in schema
+            const tablesOnlyInDb = [];
+            for (const name of dbTableNames) {
+                if (!schemaCollectionNames.has(name)) {
+                    tablesOnlyInDb.push(name);
+                }
+            }
+            // Per-table field diffs (only for tables that exist in both)
+            const fieldDiffs = [];
+            for (const [collectionName, schemaDef] of allSchemaDefinitions) {
+                if (!dbTableNames.has(collectionName))
+                    continue; // table doesn't exist in DB
+                const expectedColumns = getExpectedColumns(schemaDef);
+                const actualColumns = dbColumnsByTable.get(collectionName) || [];
+                const actualColumnNames = new Set(actualColumns.map((c) => c.column_name));
+                const fieldsOnlyInSchema = [];
+                const fieldsOnlyInDb = [];
+                // Fields in schema but not in database
+                for (const [colName, meta] of expectedColumns) {
+                    if (!actualColumnNames.has(colName)) {
+                        fieldsOnlyInSchema.push({ column: colName, type: meta.type, fromField: meta.fromField });
+                    }
+                }
+                // Fields in database but not in schema
+                for (const col of actualColumns) {
+                    if (!expectedColumns.has(col.column_name)) {
+                        fieldsOnlyInDb.push({
+                            column: col.column_name,
+                            dataType: col.data_type,
+                            isNullable: col.is_nullable,
+                            columnDefault: col.column_default,
+                        });
+                    }
+                }
+                if (fieldsOnlyInSchema.length > 0 || fieldsOnlyInDb.length > 0) {
+                    fieldDiffs.push({
+                        collection: collectionName,
+                        fieldsOnlyInSchema,
+                        fieldsOnlyInDb,
+                    });
+                }
+            }
+            // 5. Summary
+            const summary = {
+                totalSchemaCollections: schemaCollectionNames.size,
+                totalDbTables: dbTableNames.size,
+                tablesOnlyInSchemaCount: tablesOnlyInSchema.length,
+                tablesOnlyInDbCount: tablesOnlyInDb.length,
+                collectionsWithFieldDiffs: fieldDiffs.length,
+            };
+            return res.status(200).json({
+                data: {
+                    summary,
+                    tablesOnlyInSchema,
+                    tablesOnlyInDb,
+                    fieldDiffs,
+                },
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    });
+    /**
+     * DELETE /utils/schema-diff/table/schema/:collection
+     * Remove a collection from schema definitions (keeps database table).
+     */
+    app.delete("/utils/schema-diff/table/schema/:collection", adminOnly, async (req, res, next) => {
+        try {
+            const { collection } = req.params;
+            // Verify collection exists in schema
+            const schemaDef = await schemaManager.getSchemaDefinition(collection);
+            if (!schemaDef) {
+                throw new APIError(`Collection '${collection}' not found in schema definitions`, 404);
+            }
+            // Prevent deleting system schemas
+            if (collection.startsWith("baasix_")) {
+                throw new APIError(`Cannot remove system schema '${collection}'`, 400);
+            }
+            await schemaManager.removeSchemaDefinition(collection);
+            return res.status(200).json({
+                data: { message: `Schema definition '${collection}' removed successfully` },
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    });
+    /**
+     * DELETE /utils/schema-diff/table/db/:table
+     * Drop a table from the database (keeps schema definition).
+     */
+    app.delete("/utils/schema-diff/table/db/:table", adminOnly, async (req, res, next) => {
+        try {
+            const { table } = req.params;
+            const sql = getSqlClient();
+            // Validate table name: only allow alphanumeric and underscores
+            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
+                throw new APIError("Invalid table name", 400);
+            }
+            // Verify table exists
+            const exists = await sql `
+        SELECT EXISTS (
+          SELECT FROM information_schema.tables
+          WHERE table_schema = 'public' AND table_name = ${table}
+        )
+      `;
+            if (!exists[0].exists) {
+                throw new APIError(`Table '${table}' not found in database`, 404);
+            }
+            // Prevent dropping system tables
+            if (table.startsWith("baasix_")) {
+                throw new APIError(`Cannot drop system table '${table}'`, 400);
+            }
+            await sql.unsafe(`DROP TABLE IF EXISTS "${table}" CASCADE`);
+            return res.status(200).json({
+                data: { message: `Table '${table}' dropped from database successfully` },
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    });
+    /**
+     * DELETE /utils/schema-diff/field/schema/:collection/:field
+     * Remove a field from a schema definition (keeps database column).
+     */
+    app.delete("/utils/schema-diff/field/schema/:collection/:field", adminOnly, async (req, res, next) => {
+        try {
+            const { collection, field } = req.params;
+            const schemaDef = await schemaManager.getSchemaDefinition(collection);
+            if (!schemaDef) {
+                throw new APIError(`Collection '${collection}' not found in schema definitions`, 404);
+            }
+            if (!schemaDef.fields || !schemaDef.fields[field]) {
+                throw new APIError(`Field '${field}' not found in schema for '${collection}'`, 404);
+            }
+            // Remove the field from schema
+            const updatedSchema = { ...schemaDef };
+            const updatedFields = { ...updatedSchema.fields };
+            delete updatedFields[field];
+            updatedSchema.fields = updatedFields;
+            // Persist updated schema
+            const db = getDatabase();
+            const { pgTable, text, jsonb, timestamp } = await import("drizzle-orm/pg-core");
+            const { eq } = await import("drizzle-orm");
+            const baasixSchemaDefinition = pgTable("baasix_SchemaDefinition", {
+                collectionName: text("collectionName").primaryKey().notNull(),
+                schema: jsonb("schema").notNull(),
+                createdAt: timestamp("createdAt", { withTimezone: true }).defaultNow(),
+                updatedAt: timestamp("updatedAt", { withTimezone: true }).defaultNow(),
+            });
+            await db
+                .update(baasixSchemaDefinition)
+                .set({ schema: updatedSchema, updatedAt: new Date() })
+                .where(eq(baasixSchemaDefinition.collectionName, collection));
+            // Update in-memory schema definition
+            // Re-initialize the model so in-memory state matches
+            await schemaManager.updateModel(collection, updatedSchema);
+            return res.status(200).json({
+                data: { message: `Field '${field}' removed from schema definition of '${collection}'` },
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    });
+    /**
+     * DELETE /utils/schema-diff/field/db/:collection/:column
+     * Drop a column from a database table (keeps schema field).
+     */
+    app.delete("/utils/schema-diff/field/db/:collection/:column", adminOnly, async (req, res, next) => {
+        try {
+            const { collection, column } = req.params;
+            const sql = getSqlClient();
+            // Validate names
+            if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(collection) || !/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(column)) {
+                throw new APIError("Invalid table or column name", 400);
+            }
+            // Verify column exists
+            const colExists = await sql `
+        SELECT EXISTS (
+          SELECT FROM information_schema.columns
+          WHERE table_schema = 'public'
+            AND table_name = ${collection}
+            AND column_name = ${column}
+        )
+      `;
+            if (!colExists[0].exists) {
+                throw new APIError(`Column '${column}' not found in table '${collection}'`, 404);
+            }
+            await sql.unsafe(`ALTER TABLE "${collection}" DROP COLUMN IF EXISTS "${column}" CASCADE`);
+            return res.status(200).json({
+                data: { message: `Column '${column}' dropped from table '${collection}'` },
+            });
+        }
+        catch (error) {
+            next(error);
+        }
+    });
+};
+export default {
+    id: "schema-diff",
+    handler: registerEndpoint,
+};
+//# sourceMappingURL=schema-diff.route.js.map

package/dist/routes/schema-diff.route.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-diff.route.js","sourceRoot":"","sources":["../../baasix/routes/schema-diff.route.ts"],"names":[],"mappings":"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"}

package/dist/services/ItemsService.d.ts

@@ -1,3 +1,4 @@
+import { Transaction } from '../utils/db.js';
 import type { QueryOptions as BaseQueryOptions, ServiceParams as BaseServiceParams, OperationOptions, ReadResult } from '../types/index.js';
 export type QueryOptions = BaseQueryOptions;
 export type ServiceParams = BaseServiceParams;
@@ -131,7 +132,7 @@ export declare class ItemsService {
     /**
      * Read records by query
      */
-    readByQuery(query?: QueryOptions, bypassPermissions?: boolean): Promise<ReadResult>;
+    readByQuery(query?: QueryOptions, bypassPermissions?: boolean, transaction?: Transaction): Promise<ReadResult>;
     /**
      * Execute aggregate query
      */
@@ -139,7 +140,7 @@ export declare class ItemsService {
     /**
      * Read a single record by ID
      */
-    readOne(id: string | number, query?: QueryOptions, bypassPermissions?: boolean): Promise<any>;
+    readOne(id: string | number, query?: QueryOptions, bypassPermissions?: boolean, transaction?: Transaction): Promise<any>;
     /**
      * Create a new record
      * Uses createOneCore for the transactional logic and executes after hooks after commit
@@ -242,11 +243,11 @@ export declare class ItemsService {
     /**
      * Alias for readByQuery
      */
-    list(query?: QueryOptions, bypassPermissions?: boolean): Promise<ReadResult>;
+    list(query?: QueryOptions, bypassPermissions?: boolean, transaction?: Transaction): Promise<ReadResult>;
     /**
      * Alias for readOne
      */
-    read(id: string | number, query?: QueryOptions, bypassPermissions?: boolean): Promise<any>;
+    read(id: string | number, query?: QueryOptions, bypassPermissions?: boolean, transaction?: Transaction): Promise<any>;
     /**
      * Alias for createOne
      */

package/dist/services/ItemsService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ItemsService.d.ts","sourceRoot":"","sources":["../../baasix/services/ItemsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ItemsService.d.ts","sourceRoot":"","sources":["../../baasix/services/ItemsService.ts"],"names":[],"mappings":"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"}

package/dist/services/ItemsService.js

@@ -833,7 +833,8 @@ export class ItemsService {
     /**
      * Read with two-query approach for HasMany sorting
      */
-    async readWithHasManyHandling(query, whereClause, orderByClause, processedIncludes, limit, offset, isAdmin, bypassPermissions, filterJoins = []) {
+    async readWithHasManyHandling(query, whereClause, orderByClause, processedIncludes, limit, offset, isAdmin, bypassPermissions, filterJoins = [], transaction) {
+        const dbClient = transaction || db;
         console.log('[ItemsService] Using Drizzle query builder for HasMany sorting/filtering');
         // STEP 1: Build ID query using PostgreSQL DISTINCT ON for proper deduplication
         // DISTINCT ON ensures we get unique IDs BEFORE applying LIMIT, not after
@@ -889,7 +890,7 @@ export class ItemsService {
             ? `DISTINCT ON (${distinctOnFields.join(', ')}) ${pkField}`
             : pkField;
         console.log(`[ItemsService] Using DISTINCT ON with fields: ${distinctOnFields.join(', ')}`);
-        let idQuery = db
+        let idQuery = dbClient
             .select({ [this.primaryKey]: sql.raw(distinctOnClause) })
             .from(this.table)
             .$dynamic();
@@ -978,7 +979,7 @@ export class ItemsService {
         }
         const { selectColumns } = buildSelectWithJoins(this.table, directFields, processedIncludes // Use original includes with separate: true for HasMany
         );
-        let fullQuery = db.select(selectColumns).from(this.table);
+        let fullQuery = dbClient.select(selectColumns).from(this.table);
         // Apply joins (only BelongsTo/HasOne, not HasMany)
         for (const include of processedIncludes) {
             if (include.separate)
@@ -998,7 +999,7 @@ export class ItemsService {
         let finalRecords = records;
         if (hasSeparateQueries(processedIncludes)) {
             // This handles both nesting joined relations and loading separate ones
-            finalRecords = await loadSeparateRelations(db, records, processedIncludes, this.collection);
+            finalRecords = await loadSeparateRelations(dbClient, records, processedIncludes, this.collection);
         }
         else {
             // No separate queries, but we still need to nest joined BelongsTo/HasOne relations
@@ -1008,7 +1009,7 @@ export class ItemsService {
         const recordMap = new Map(finalRecords.map(r => [r[this.primaryKey], r]));
         const orderedRecords = ids.map(id => recordMap.get(id)).filter(r => r != null);
         // Get total count using Drizzle query builder (same joins as ID query)
-        let countQuery = db
+        let countQuery = dbClient
             .select({ count: sql `COUNT(DISTINCT ${this.getPrimaryKeyColumn()})`.mapWith(Number) })
             .from(this.table)
             .$dynamic();
@@ -1085,15 +1086,16 @@ export class ItemsService {
     /**
      * Read records by query
      */
-    async readByQuery(query = {}, bypassPermissions = false) {
+    async readByQuery(query = {}, bypassPermissions = false, transaction) {
+        const dbClient = transaction || db;
         // Execute before-read hooks
-        let hookData = await hooksManager.executeHooks(this.collection, 'items.read', this.accountability, { query });
+        let hookData = await hooksManager.executeHooks(this.collection, 'items.read', this.accountability, { query, transaction });
         const modifiedQuery = hookData.query;
         try {
             const isAdmin = await this.isAdministrator();
             // Check if this is an aggregate query
             if (modifiedQuery.aggregate) {
-                return await this.executeAggregateQuery(modifiedQuery, isAdmin, bypassPermissions);
+                return await this.executeAggregateQuery(modifiedQuery, isAdmin, bypassPermissions, transaction);
             }
             // Build query components
             const { whereClause, orderByClause, selectColumns, joins, processedIncludes, limit, offset, filterJoins = [], userRequestedFields = [], userRequestedIncludes = [] } = await this.buildQuery(modifiedQuery, {
@@ -1130,7 +1132,7 @@ export class ItemsService {
             // This matches Sequelize's approach of using a two-query pattern
             if (needsHasManyHandling || hasFilterJoins) {
                 console.log(`[ItemsService] Using readWithHasManyHandling for ${needsHasManyHandling ? 'HasMany sorting' : 'HasMany filtering'}`);
-                return await this.readWithHasManyHandling(modifiedQuery, whereClause, orderByClause, processedIncludes, limit, offset, isAdmin, bypassPermissions, filterJoins);
+                return await this.readWithHasManyHandling(modifiedQuery, whereClause, orderByClause, processedIncludes, limit, offset, isAdmin, bypassPermissions, filterJoins, transaction);
             }
             // Build base query
             console.log(`[ItemsService.readByQuery] Building base query for ${this.collection}, selectColumns has ${Object.keys(selectColumns).length} keys`);
@@ -1138,7 +1140,7 @@ export class ItemsService {
                 console.error(`[ItemsService.readByQuery] ERROR: selectColumns is EMPTY for ${this.collection}! This will cause SQL syntax error.`);
                 console.error(`[ItemsService.readByQuery] query:`, query);
             }
-            let baseQuery = db.select(selectColumns).from(this.table);
+            let baseQuery = dbClient.select(selectColumns).from(this.table);
             // Apply filterJoins using Drizzle's query builder 
             // FilterJoins are created when filtering by relation paths (e.g., "userRoles.role.name")
             if (hasFilterJoins) {
@@ -1206,7 +1208,7 @@ export class ItemsService {
                 // Load separate relations (HasMany, BelongsToMany) and nest joined relations
                 let processedRecords = records;
                 if (hasSeparateQueries(processedIncludes)) {
-                    processedRecords = await loadSeparateRelations(db, records, processedIncludes, this.collection);
+                    processedRecords = await loadSeparateRelations(dbClient, records, processedIncludes, this.collection);
                 }
                 else {
                     // No separate queries, but we still need to nest joined BelongsTo/HasOne relations
@@ -1219,7 +1221,7 @@ export class ItemsService {
                     console.error(`[ItemsService.readByQuery] Primary key name:`, this.primaryKey);
                     console.error(`[ItemsService.readByQuery] Available columns:`, Object.keys(this.table).filter(k => !k.startsWith('_')));
                 }
-                let countQuery = db.select({ count: sql `COUNT(DISTINCT ${primaryKeyColumn})` }).from(this.table);
+                let countQuery = dbClient.select({ count: sql `COUNT(DISTINCT ${primaryKeyColumn})` }).from(this.table);
                 // Apply same joins and where for count
                 if (hasFilterJoins) {
                     // Use filterJoins for count query as well
@@ -1266,7 +1268,7 @@ export class ItemsService {
             // Sanitize auto-added fields (remove fields user didn't request)
             const sanitizedRecords = this.sanitizeAutoAddedFields(strippedRecords, userRequestedFields, userRequestedIncludes);
             // Execute after-read hooks
-            hookData = await hooksManager.executeHooks(this.collection, 'items.read.after', this.accountability, { query: modifiedQuery, result: { data: sanitizedRecords, totalCount } });
+            hookData = await hooksManager.executeHooks(this.collection, 'items.read.after', this.accountability, { query: modifiedQuery, result: { data: sanitizedRecords, totalCount }, transaction });
             return hookData.result;
         }
         catch (error) {
@@ -1277,7 +1279,8 @@ export class ItemsService {
     /**
      * Execute aggregate query
      */
-    async executeAggregateQuery(query, isAdmin, bypassPermissions) {
+    async executeAggregateQuery(query, isAdmin, bypassPermissions, transaction) {
+        const dbClient = transaction || db;
         const { aggregate, groupBy = [], filter = {}, sort, limit: queryLimit, page: queryPage } = query;
         if (!aggregate) {
             throw new APIError('Aggregate query requires aggregate parameter', 400);
@@ -1406,7 +1409,7 @@ export class ItemsService {
         let results;
         if (allJoins.length > 0) {
             // Build aggregate query using Drizzle query builder
-            let aggregateQuery = db.select(selectObj).from(this.table).$dynamic();
+            let aggregateQuery = dbClient.select(selectObj).from(this.table).$dynamic();
             // Apply joins (same as filterJoins)
             for (const join of allJoins) {
                 // Create aliased table with the exact alias
@@ -1461,7 +1464,7 @@ export class ItemsService {
         }
         else {
             // No relation joins - use standard Drizzle API
-            let aggregateQuery = db.select(selectObj).from(this.table).$dynamic();
+            let aggregateQuery = dbClient.select(selectObj).from(this.table).$dynamic();
             if (whereClause) {
                 aggregateQuery = aggregateQuery.where(whereClause);
             }
@@ -1513,7 +1516,7 @@ export class ItemsService {
                     const groupExpr = buildGroupByExpressions([groupField], undefined, pathToAliasMap, this.collection)[0];
                     countSelect[groupField] = groupExpr;
                 }
-                let countQuery = db.select(countSelect).from(this.table).$dynamic();
+                let countQuery = dbClient.select(countSelect).from(this.table).$dynamic();
                 // Apply same joins
                 for (const join of allJoins) {
                     const aliasedTable = alias(join.table, join.alias);
@@ -1542,13 +1545,14 @@ export class ItemsService {
     /**
      * Read a single record by ID
      */
-    async readOne(id, query = {}, bypassPermissions = false) {
+    async readOne(id, query = {}, bypassPermissions = false, transaction) {
+        const dbClient = transaction || db;
         const parsedId = this.parseId(id);
         if (!parsedId) {
             throw new APIError('Invalid ID', 400);
         }
         // Execute before-read-one hooks
-        let hookData = await hooksManager.executeHooks(this.collection, 'items.read.one', this.accountability, { id: parsedId, query });
+        let hookData = await hooksManager.executeHooks(this.collection, 'items.read.one', this.accountability, { id: parsedId, query, transaction });
         try {
             const isAdmin = await this.isAdministrator();
             // Build query with ID filter
@@ -1559,7 +1563,7 @@ export class ItemsService {
                 idFilter: parsedId
             });
             // Build base query
-            let baseQuery = db.select(selectColumns).from(this.table);
+            let baseQuery = dbClient.select(selectColumns).from(this.table);
             // Apply filterJoins first (these come from relation path filters in WHERE clause)
             // use Drizzle query builder methods instead of raw SQL
             if (filterJoins && filterJoins.length > 0) {
@@ -1592,7 +1596,7 @@ export class ItemsService {
             // Load separate relations and nest joined relations
             let finalRecords = records;
             if (hasSeparateQueries(processedIncludes)) {
-                finalRecords = await loadSeparateRelations(db, records, processedIncludes, this.collection);
+                finalRecords = await loadSeparateRelations(dbClient, records, processedIncludes, this.collection);
             }
             else {
                 // No separate queries, but we still need to nest joined BelongsTo/HasOne relations
@@ -1602,7 +1606,7 @@ export class ItemsService {
             // Strip hidden fields from the document
             const strippedDocument = fieldUtils.stripHiddenFields(this.collection, document);
             // Execute after-read-one hooks
-            hookData = await hooksManager.executeHooks(this.collection, 'items.read.one.after', this.accountability, { id: parsedId, query, document: strippedDocument });
+            hookData = await hooksManager.executeHooks(this.collection, 'items.read.one.after', this.accountability, { id: parsedId, query, document: strippedDocument, transaction });
             return hookData.document;
         }
         catch (error) {
@@ -2409,14 +2413,14 @@ export class ItemsService {
     /**
      * Alias for readByQuery
      */
-    async list(query = {}, bypassPermissions = false) {
-        return this.readByQuery(query, bypassPermissions);
+    async list(query = {}, bypassPermissions = false, transaction) {
+        return this.readByQuery(query, bypassPermissions, transaction);
     }
     /**
      * Alias for readOne
      */
-    async read(id, query = {}, bypassPermissions = false) {
-        return this.readOne(id, query, bypassPermissions);
+    async read(id, query = {}, bypassPermissions = false, transaction) {
+        return this.readOne(id, query, bypassPermissions, transaction);
     }
     /**
      * Alias for createOne