drizzle-orm 0.26.1 → 0.26.2-83ca12d

package/postgres-js/index.d.ts

@@ -1,7 +1,47 @@
-export { P as PostgresJsDatabase, a as PostgresJsPreparedQuery, f as PostgresJsQueryResultHKT, c as PostgresJsSession, b as PostgresJsSessionOptions, e as PostgresJsTransaction, d as drizzle } from '../driver.d-19470274.js';
-import 'postgres';
-import '../db.d-2eb7c122.js';
-import '../column.d-c31e7ad3.js';
+import { Sql, RowList, Row, TransactionSql } from 'postgres';
+import { ah as PreparedQueryConfig, ai as PreparedQuery, a6 as SelectedFieldsOrdered, ak as PgSession, u as PgDialect, aj as PgTransactionConfig, al as PgTransaction, am as QueryResultHKT, t as PgDatabase } from '../db.d-89e25221.js';
+import { L as Logger, Q as Query, ay as Assume, D as DrizzleConfig } from '../column.d-66a08b85.js';
+import { T as TablesRelationalConfig, R as RelationalSchemaConfig } from '../query-promise.d-afecc38e.js';
 import '../migrator.js';
-import '../query-promise.d-3b15626b.js';
-import '../select.types.d-34d7f74e.js';
+import '../select.types.d-1bd49d37.js';
+
+declare class PostgresJsPreparedQuery<T extends PreparedQueryConfig> extends PreparedQuery<T> {
+    private client;
+    private query;
+    private params;
+    private logger;
+    private fields;
+    private customResultMapper?;
+    constructor(client: Sql, query: string, params: unknown[], logger: Logger, fields: SelectedFieldsOrdered | undefined, customResultMapper?: ((rows: unknown[][]) => T['execute']) | undefined);
+    execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
+    all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
+}
+interface PostgresJsSessionOptions {
+    logger?: Logger;
+}
+declare class PostgresJsSession<TSQL extends Sql, TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends PgSession<PostgresJsQueryResultHKT, TFullSchema, TSchema> {
+    client: TSQL;
+    private schema;
+    logger: Logger;
+    constructor(client: TSQL, dialect: PgDialect, schema: RelationalSchemaConfig<TSchema> | undefined, 
+    /** @internal */
+    options?: PostgresJsSessionOptions);
+    prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: unknown[][]) => T['execute']): PreparedQuery<T>;
+    query(query: string, params: unknown[]): Promise<RowList<Row[]>>;
+    queryObjects<T extends Row>(query: string, params: unknown[]): Promise<RowList<T[]>>;
+    transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+}
+declare class PostgresJsTransaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends PgTransaction<PostgresJsQueryResultHKT, TFullSchema, TSchema> {
+    constructor(dialect: PgDialect, 
+    /** @internal */
+    session: PostgresJsSession<TransactionSql, TFullSchema, TSchema>, schema: RelationalSchemaConfig<TSchema> | undefined, nestedIndex?: number);
+    transaction<T>(transaction: (tx: PostgresJsTransaction<TFullSchema, TSchema>) => Promise<T>): Promise<T>;
+}
+interface PostgresJsQueryResultHKT extends QueryResultHKT {
+    type: RowList<Assume<this['row'], Row>[]>;
+}
+
+type PostgresJsDatabase<TSchema extends Record<string, unknown> = Record<string, never>> = PgDatabase<PostgresJsQueryResultHKT, TSchema>;
+declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(client: Sql, config?: DrizzleConfig<TSchema>): PostgresJsDatabase<TSchema>;
+
+export { PostgresJsDatabase, PostgresJsPreparedQuery, PostgresJsQueryResultHKT, PostgresJsSession, PostgresJsSessionOptions, PostgresJsTransaction, drizzle };

package/postgres-js/index.mjs

@@ -1,9 +1,16 @@
-import { N as NoopLogger, D as DefaultLogger } from '../logger-caf75bde.mjs';
-import { P as PreparedQuery, a as PgSession, b as PgTransaction, c as PgDatabase } from '../session-5f4fc058.mjs';
-import { a9 as fillPlaceholders, ao as mapResultRow, K as extractTablesRelationalConfig, U as createTableRelationsHelpers, aw as PgDialect } from '../relations-c9e54a8f.mjs';
+import { NoopLogger, DefaultLogger } from '../index.mjs';
+import { P as PreparedQuery, a as PgSession, b as PgTransaction, c as PgDatabase } from '../session-108d31ca.mjs';
+import { t as tracer, f as fillPlaceholders, m as mapResultRow, e as extractTablesRelationalConfig, c as createTableRelationsHelpers, P as PgDialect } from '../relations-d3070559.mjs';
 import '../errors-bb636d84.mjs';
+import '../package-1b949c2d.mjs';
 
 class PostgresJsPreparedQuery extends PreparedQuery {
+    client;
+    query;
+    params;
+    logger;
+    fields;
+    customResultMapper;
     constructor(client, query, params, logger, fields, customResultMapper) {
         super();
         this.client = client;
@@ -14,29 +21,56 @@ class PostgresJsPreparedQuery extends PreparedQuery {
         this.customResultMapper = customResultMapper;
     }
     async execute(placeholderValues = {}) {
-        const params = fillPlaceholders(this.params, placeholderValues);
-        this.logger.logQuery(this.query, params);
-        const { fields, query, client, joinsNotNullableMap, customResultMapper } = this;
-        if (!fields && !customResultMapper) {
-            return client.unsafe(query, params);
-        }
-        const rows = await client.unsafe(query, params).values();
-        return customResultMapper
-            ? customResultMapper(rows)
-            : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+        return tracer.startActiveSpan('drizzle.execute', async (span) => {
+            const params = fillPlaceholders(this.params, placeholderValues);
+            span?.setAttributes({
+                'drizzle.query.text': this.query,
+                'drizzle.query.params': JSON.stringify(params),
+            });
+            this.logger.logQuery(this.query, params);
+            const { fields, query, client, joinsNotNullableMap, customResultMapper } = this;
+            if (!fields && !customResultMapper) {
+                return tracer.startActiveSpan('drizzle.driver.execute', () => {
+                    return client.unsafe(query, params);
+                });
+            }
+            const rows = await tracer.startActiveSpan('drizzle.driver.execute', () => {
+                span?.setAttributes({
+                    'drizzle.query.text': query,
+                    'drizzle.query.params': JSON.stringify(params),
+                });
+                return client.unsafe(query, params).values();
+            });
+            return tracer.startActiveSpan('drizzle.mapResponse', () => {
+                return customResultMapper
+                    ? customResultMapper(rows)
+                    : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+            });
+        });
     }
     all(placeholderValues = {}) {
-        const params = fillPlaceholders(this.params, placeholderValues);
-        this.logger.logQuery(this.query, params);
-        return this.client.unsafe(this.query, params);
-    }
-    values(placeholderValues = {}) {
-        const params = fillPlaceholders(this.params, placeholderValues);
-        this.logger.logQuery(this.query, params);
-        return this.client.unsafe(this.query, params).values();
+        return tracer.startActiveSpan('drizzle.execute', async (span) => {
+            const params = fillPlaceholders(this.params, placeholderValues);
+            span?.setAttributes({
+                'drizzle.query.text': this.query,
+                'drizzle.query.params': JSON.stringify(params),
+            });
+            this.logger.logQuery(this.query, params);
+            return tracer.startActiveSpan('drizzle.driver.execute', () => {
+                span?.setAttributes({
+                    'drizzle.query.text': this.query,
+                    'drizzle.query.params': JSON.stringify(params),
+                });
+                return this.client.unsafe(this.query, params);
+            });
+        });
     }
 }
 class PostgresJsSession extends PgSession {
+    client;
+    schema;
+    options;
+    logger;
     constructor(client, dialect, schema, 
     /** @internal */
     options = {}) {
@@ -68,6 +102,7 @@ class PostgresJsSession extends PgSession {
     }
 }
 class PostgresJsTransaction extends PgTransaction {
+    session;
     constructor(dialect, 
     /** @internal */
     session, schema, nestedIndex = 0) {

package/postgres-js/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../src/postgres-js/session.ts","../../src/postgres-js/driver.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../src/postgres-js/session.ts","../../src/postgres-js/driver.ts"],"sourcesContent":[null,null],"names":[],"mappings":"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"}

package/postgres-js/migrator.d.ts

@@ -1,10 +1,10 @@
 import { MigrationConfig } from '../migrator.js';
-import { P as PostgresJsDatabase } from '../driver.d-19470274.js';
+import { PostgresJsDatabase } from './index.js';
 import 'postgres';
-import '../db.d-2eb7c122.js';
-import '../column.d-c31e7ad3.js';
-import '../query-promise.d-3b15626b.js';
-import '../select.types.d-34d7f74e.js';
+import '../db.d-89e25221.js';
+import '../column.d-66a08b85.js';
+import '../query-promise.d-afecc38e.js';
+import '../select.types.d-1bd49d37.js';
 
 declare function migrate<TSchema extends Record<string, unknown>>(db: PostgresJsDatabase<TSchema>, config: string | MigrationConfig): Promise<void>;
 

package/{query-promise.d-3b15626b.d.ts → query-promise.d-afecc38e.d.ts}

@@ -1,4 +1,4 @@
-import { A as AnyColumn, S as SQL, a7 as SQLChunk, a9 as Placeholder, J as SQLWrapper, G as GetColumnData, T as Table, aj as AnyTable, a8 as sql, aw as SimplifyShallow, aA as ValueOrArray, ax as Assume, ay as Equal, ap as InferModelFromColumns, aG as ColumnsWithTable, ag as TableConfig } from './column.d-c31e7ad3.js';
+import { A as AnyColumn, a as SQL, ab as SQLChunk, ad as Placeholder, Y as SQLWrapper, G as GetColumnData, T as Table, an as AnyTable, ac as sql, ax as SimplifyShallow, aB as ValueOrArray, ay as Assume, az as Equal, as as InferModelFromColumns, aH as ColumnsWithTable, ak as TableConfig } from './column.d-66a08b85.js';
 
 declare function bindIfParam(value: unknown, column: AnyColumn | SQL.Aliased): SQLChunk;
 /**
@@ -614,4 +614,4 @@ declare abstract class QueryPromise<T> implements Promise<T> {
     abstract execute(): Promise<T>;
 }
 
-export { normalizeRelation as $, ExtractRelationsFromTableExtraConfigSchema as A, operators as B, Operators as C, orderByOperators as D, ExtractTableRelationsFromSchema as E, OrderByOperators as F, FindTableByDBName as G, DBQueryConfig as H, TableRelationalConfig as I, TablesRelationalConfig as J, RelationalSchemaConfig as K, ExtractTablesWithRelations as L, Many as M, ReturnTypeOrValue as N, One as O, BuildRelationResult as P, QueryPromise as Q, Relation as R, NonUndefinedKeysOnly as S, TableRelationsKeysOnly as T, BuildQueryResult as U, RelationConfig as V, extractTablesRelationalConfig as W, relations as X, createOne as Y, createMany as Z, NormalizedRelation as _, and as a, createTableRelationsHelpers as a0, TableRelationsHelpers as a1, BuildRelationalQueryResult as a2, mapRelationalRow as a3, bindIfParam as b, not as c, gte as d, eq as e, lte as f, gt as g, notInArray as h, inArray as i, isNull as j, isNotNull as k, lt as l, exists as m, ne as n, or as o, notExists as p, between as q, notBetween as r, like as s, notLike as t, ilike as u, notIlike as v, asc as w, desc as x, Relations as y, ExtractObjectValues as z };
+export { normalizeRelation as $, TableRelationsKeysOnly as A, ExtractObjectValues as B, ExtractRelationsFromTableExtraConfigSchema as C, operators as D, ExtractTableRelationsFromSchema as E, Operators as F, orderByOperators as G, OrderByOperators as H, FindTableByDBName as I, DBQueryConfig as J, TableRelationalConfig as K, ExtractTablesWithRelations as L, Many as M, ReturnTypeOrValue as N, One as O, BuildRelationResult as P, QueryPromise as Q, RelationalSchemaConfig as R, NonUndefinedKeysOnly as S, TablesRelationalConfig as T, BuildQueryResult as U, RelationConfig as V, extractTablesRelationalConfig as W, relations as X, createOne as Y, createMany as Z, NormalizedRelation as _, Relation as a, createTableRelationsHelpers as a0, TableRelationsHelpers as a1, BuildRelationalQueryResult as a2, mapRelationalRow as a3, bindIfParam as b, and as c, not as d, eq as e, gte as f, gt as g, lte as h, inArray as i, notInArray as j, isNull as k, lt as l, isNotNull as m, ne as n, or as o, exists as p, notExists as q, between as r, notBetween as s, like as t, notLike as u, ilike as v, notIlike as w, asc as x, desc as y, Relations as z };

package/{relations-23963f0c.cjs → relations-01342313.cjs}

@@ -1,5 +1,7 @@
 'use strict';
 
+var _package = require('./package-b95b1bef.cjs');
+
 /*
     `Column` only accepts a full `ColumnConfig` as its generic.
     To infer parts of the config, use `AnyColumn` that accepts a partial config.
@@ -151,6 +153,158 @@ function getTableName(table) {
     return table[TableName];
 }
 
+/** @internal */
+function mapResultRow(columns, row, joinsNotNullableMap) {
+    // Key -> nested object key, value -> table name if all fields in the nested object are from the same table, false otherwise
+    const nullifyMap = {};
+    const result = columns.reduce((result, { path, field }, columnIndex) => {
+        let decoder;
+        if (field instanceof Column) {
+            decoder = field;
+        }
+        else if (field instanceof SQL) {
+            decoder = field.decoder;
+        }
+        else {
+            decoder = field.sql.decoder;
+        }
+        let node = result;
+        for (const [pathChunkIndex, pathChunk] of path.entries()) {
+            if (pathChunkIndex < path.length - 1) {
+                if (!(pathChunk in node)) {
+                    node[pathChunk] = {};
+                }
+                node = node[pathChunk];
+            }
+            else {
+                const rawValue = row[columnIndex];
+                const value = node[pathChunk] = rawValue === null ? null : decoder.mapFromDriverValue(rawValue);
+                if (joinsNotNullableMap && field instanceof Column && path.length === 2) {
+                    const objectName = path[0];
+                    if (!(objectName in nullifyMap)) {
+                        nullifyMap[objectName] = value === null ? getTableName(field.table) : false;
+                    }
+                    else if (typeof nullifyMap[objectName] === 'string' && nullifyMap[objectName] !== getTableName(field.table)) {
+                        nullifyMap[objectName] = false;
+                    }
+                }
+            }
+        }
+        return result;
+    }, {});
+    // Nullify all nested objects from nullifyMap that are nullable
+    if (joinsNotNullableMap && Object.keys(nullifyMap).length > 0) {
+        for (const [objectName, tableName] of Object.entries(nullifyMap)) {
+            if (typeof tableName === 'string' && !joinsNotNullableMap[tableName]) {
+                result[objectName] = null;
+            }
+        }
+    }
+    return result;
+}
+/** @internal */
+function orderSelectedFields(fields, pathPrefix) {
+    return Object.entries(fields).reduce((result, [name, field]) => {
+        if (typeof name !== 'string') {
+            return result;
+        }
+        const newPath = pathPrefix ? [...pathPrefix, name] : [name];
+        if (field instanceof Column
+            || field instanceof SQL
+            || field instanceof SQL.Aliased) {
+            result.push({ path: newPath, field });
+        }
+        else if (field instanceof Table) {
+            result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
+        }
+        else {
+            result.push(...orderSelectedFields(field, newPath));
+        }
+        return result;
+    }, []);
+}
+/** @internal */
+function mapUpdateSet(table, values) {
+    const entries = Object.entries(values)
+        .filter(([, value]) => value !== undefined)
+        .map(([key, value]) => {
+        // eslint-disable-next-line unicorn/prefer-ternary
+        if (value instanceof SQL) {
+            return [key, value];
+        }
+        else {
+            return [key, new Param(value, table[Table.Symbol.Columns][key])];
+        }
+    });
+    if (entries.length === 0) {
+        throw new Error('No values to set');
+    }
+    return Object.fromEntries(entries);
+}
+/** @internal */
+function applyMixins(baseClass, extendedClasses) {
+    for (const extendedClass of extendedClasses) {
+        for (const name of Object.getOwnPropertyNames(extendedClass.prototype)) {
+            Object.defineProperty(baseClass.prototype, name, Object.getOwnPropertyDescriptor(extendedClass.prototype, name) || Object.create(null));
+        }
+    }
+}
+function getTableColumns(table) {
+    return table[Table.Symbol.Columns];
+}
+/** @internal */
+function getTableLikeName(table) {
+    return table instanceof Subquery
+        ? table[SubqueryConfig].alias
+        : table instanceof View
+            ? table[ViewBaseConfig].name
+            : table instanceof SQL
+                ? undefined
+                : table[Table.Symbol.IsAlias]
+                    ? table[Table.Symbol.Name]
+                    : table[Table.Symbol.BaseName];
+}
+function iife(fn, ...args) {
+    return fn(...args);
+}
+
+let otel;
+let rawTracer;
+try {
+    otel = require('@opentelemetry/api');
+}
+catch (err) {
+    if (err.code !== 'MODULE_NOT_FOUND' && err.code !== 'ERR_MODULE_NOT_FOUND') {
+        throw err;
+    }
+}
+/** @internal */
+const tracer = {
+    startActiveSpan(name, fn) {
+        if (!otel) {
+            return fn();
+        }
+        if (!rawTracer) {
+            rawTracer = otel.trace.getTracer('drizzle-orm', _package.version);
+        }
+        return iife((otel, rawTracer) => rawTracer.startActiveSpan(name, ((span) => {
+            try {
+                return fn(span);
+            }
+            catch (e) {
+                span.setStatus({
+                    code: otel.SpanStatusCode.ERROR,
+                    message: e instanceof Error ? e.message : 'Unknown error',
+                });
+                throw e;
+            }
+            finally {
+                span.end();
+            }
+        })), otel, rawTracer);
+    },
+};
+
 function bindIfParam(value, column) {
     if (isDriverValueEncoder(column) && !isSQLWrapper(value) && !(value instanceof Param) && !(value instanceof Placeholder)
         && !(value instanceof Column) && !(value instanceof Table) && !(value instanceof View)) {
@@ -334,7 +488,7 @@ function exists(subquery) {
  * @see exists for the inverse of this test
  */
 function notExists(subquery) {
-    return sql `exists (${subquery})`;
+    return sql `not exists (${subquery})`;
 }
 function between(column, min, max) {
     return sql `${column} between ${bindIfParam(min, column)} and ${bindIfParam(max, column)}`;
@@ -483,7 +637,8 @@ function mergeQueries(queries) {
     for (const query of queries) {
         result.sql += query.sql;
         result.params.push(...query.params);
-        if (result.typings && query.typings?.length) {
+        if (query.typings?.length) {
+            result.typings = result.typings || [];
             result.typings.push(...query.typings);
         }
     }
@@ -506,7 +661,14 @@ class SQL {
         return this;
     }
     toQuery(config) {
-        return this.buildQueryFromSourceParams(this.queryChunks, config);
+        return tracer.startActiveSpan('drizzle.buildSQL', (span) => {
+            const query = this.buildQueryFromSourceParams(this.queryChunks, config);
+            span?.setAttributes({
+                'drizzle.query.text': query.sql,
+                'drizzle.query.params': JSON.stringify(query.params),
+            });
+            return query;
+        });
     }
     buildQueryFromSourceParams(chunks, _config) {
         const config = Object.assign({}, _config, {
@@ -1137,118 +1299,6 @@ class PrimaryKey {
     }
 }
 
-/** @internal */
-function mapResultRow(columns, row, joinsNotNullableMap) {
-    // Key -> nested object key, value -> table name if all fields in the nested object are from the same table, false otherwise
-    const nullifyMap = {};
-    const result = columns.reduce((result, { path, field }, columnIndex) => {
-        let decoder;
-        if (field instanceof Column) {
-            decoder = field;
-        }
-        else if (field instanceof SQL) {
-            decoder = field.decoder;
-        }
-        else {
-            decoder = field.sql.decoder;
-        }
-        let node = result;
-        for (const [pathChunkIndex, pathChunk] of path.entries()) {
-            if (pathChunkIndex < path.length - 1) {
-                if (!(pathChunk in node)) {
-                    node[pathChunk] = {};
-                }
-                node = node[pathChunk];
-            }
-            else {
-                const rawValue = row[columnIndex];
-                const value = node[pathChunk] = rawValue === null ? null : decoder.mapFromDriverValue(rawValue);
-                if (joinsNotNullableMap && field instanceof Column && path.length === 2) {
-                    const objectName = path[0];
-                    if (!(objectName in nullifyMap)) {
-                        nullifyMap[objectName] = value === null ? getTableName(field.table) : false;
-                    }
-                    else if (typeof nullifyMap[objectName] === 'string' && nullifyMap[objectName] !== getTableName(field.table)) {
-                        nullifyMap[objectName] = false;
-                    }
-                }
-            }
-        }
-        return result;
-    }, {});
-    // Nullify all nested objects from nullifyMap that are nullable
-    if (joinsNotNullableMap && Object.keys(nullifyMap).length > 0) {
-        for (const [objectName, tableName] of Object.entries(nullifyMap)) {
-            if (typeof tableName === 'string' && !joinsNotNullableMap[tableName]) {
-                result[objectName] = null;
-            }
-        }
-    }
-    return result;
-}
-/** @internal */
-function orderSelectedFields(fields, pathPrefix) {
-    return Object.entries(fields).reduce((result, [name, field]) => {
-        if (typeof name !== 'string') {
-            return result;
-        }
-        const newPath = pathPrefix ? [...pathPrefix, name] : [name];
-        if (field instanceof Column
-            || field instanceof SQL
-            || field instanceof SQL.Aliased) {
-            result.push({ path: newPath, field });
-        }
-        else if (field instanceof Table) {
-            result.push(...orderSelectedFields(field[Table.Symbol.Columns], newPath));
-        }
-        else {
-            result.push(...orderSelectedFields(field, newPath));
-        }
-        return result;
-    }, []);
-}
-/** @internal */
-function mapUpdateSet(table, values) {
-    const entries = Object.entries(values)
-        .filter(([, value]) => value !== undefined)
-        .map(([key, value]) => {
-        // eslint-disable-next-line unicorn/prefer-ternary
-        if (value instanceof SQL) {
-            return [key, value];
-        }
-        else {
-            return [key, new Param(value, table[Table.Symbol.Columns][key])];
-        }
-    });
-    if (entries.length === 0) {
-        throw new Error('No values to set');
-    }
-    return Object.fromEntries(entries);
-}
-/** @internal */
-function applyMixins(baseClass, extendedClasses) {
-    for (const extendedClass of extendedClasses) {
-        for (const name of Object.getOwnPropertyNames(extendedClass.prototype)) {
-            Object.defineProperty(baseClass.prototype, name, Object.getOwnPropertyDescriptor(extendedClass.prototype, name) || Object.create(null));
-        }
-    }
-}
-function getTableColumns(table) {
-    return table[Table.Symbol.Columns];
-}
-/** @internal */
-function getTableLikeName(table) {
-    return table instanceof Subquery
-        ? table[SubqueryConfig].alias
-        : table instanceof View
-            ? table[ViewBaseConfig].name
-            : table instanceof SQL
-                ? undefined
-                : table[Table.Symbol.IsAlias]
-                    ? table[Table.Symbol.Name]
-                    : table[Table.Symbol.BaseName];
-}
-
 class PgDialect {
     async migrate(migrations, session) {
         const migrationTableCreate = sql `
@@ -2049,17 +2099,22 @@ class PgSelect extends PgSelectQueryBuilder {
     constructor() {
         super(...arguments);
         this.execute = (placeholderValues) => {
-            return this._prepare().execute(placeholderValues);
+            return tracer.startActiveSpan('drizzle.operation', () => {
+                return this._prepare().execute(placeholderValues);
+            });
         };
     }
     _prepare(name) {
-        if (!this.session) {
+        const { session, config, dialect, joinsNotNullableMap } = this;
+        if (!session) {
             throw new Error('Cannot execute a query on a query builder. Please use a database instance instead.');
         }
-        const fieldsList = orderSelectedFields(this.config.fields);
-        const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), fieldsList, name);
-        query.joinsNotNullableMap = this.joinsNotNullableMap;
-        return query;
+        return tracer.startActiveSpan('drizzle.prepareQuery', () => {
+            const fieldsList = orderSelectedFields(config.fields);
+            const query = session.prepareQuery(dialect.sqlToQuery(this.getSQL()), fieldsList, name);
+            query.joinsNotNullableMap = joinsNotNullableMap;
+            return query;
+        });
     }
     /**
      * Create a prepared statement for this query. This allows
@@ -3069,6 +3124,7 @@ exports.getTableName = getTableName;
 exports.getViewConfig = getViewConfig;
 exports.gt = gt;
 exports.gte = gte;
+exports.iife = iife;
 exports.ilike = ilike;
 exports.inArray = inArray;
 exports.index = index;
@@ -3121,6 +3177,7 @@ exports.relations = relations;
 exports.sql = sql;
 exports.time = time;
 exports.timestamp = timestamp;
+exports.tracer = tracer;
 exports.uniqueIndex = uniqueIndex;
 exports.uuid = uuid;
-//# sourceMappingURL=relations-23963f0c.cjs.map
+//# sourceMappingURL=relations-01342313.cjs.map