@vantreeseba/drizzle-graphql 5.4.0 → 5.6.0

package/dist/index.cjs

@@ -107,8 +107,276 @@ var uncapitalize = (input) => input?.length ? `${input[0].toLocaleLowerCase()}${
 var capitalize = (input) => input?.length ? `${input[0].toLocaleUpperCase()}${input.length > 1 ? input.slice(1, input.length) : ""}` : input;
 
 // src/util/data-mappers/index.ts
+var import_drizzle_orm2 = require("drizzle-orm");
+var import_graphql3 = require("graphql");
+
+// src/util/type-converter/index.ts
 var import_drizzle_orm = require("drizzle-orm");
+var import_mysql_core = require("drizzle-orm/mysql-core");
+var import_pg_core = require("drizzle-orm/pg-core");
+var import_sqlite_core = require("drizzle-orm/sqlite-core");
+var import_graphql2 = require("graphql");
+
+// src/util/scalars/index.ts
 var import_graphql = require("graphql");
+var import_graphql_scalars = require("graphql-scalars");
+var asDecimalString = (value) => {
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+  if (typeof value === "number") {
+    if (!Number.isInteger(value)) {
+      throw new import_graphql.GraphQLError(`BigInt cannot represent non-integer value: ${value}`);
+    }
+    if (!Number.isSafeInteger(value)) {
+      throw new import_graphql.GraphQLError(
+        `BigInt cannot represent the number ${value} without precision loss \u2014 pass it as a string instead`
+      );
+    }
+    return String(value);
+  }
+  if (typeof value === "string") {
+    if (!/^-?\d+$/.test(value)) {
+      throw new import_graphql.GraphQLError(`BigInt cannot represent non-integer value: "${value}"`);
+    }
+    return value;
+  }
+  throw new import_graphql.GraphQLError(`BigInt cannot represent value: ${JSON.stringify(value)}`);
+};
+var GraphQLBigIntString = new import_graphql.GraphQLScalarType({
+  name: "BigInt",
+  description: "A 64-bit integer, transported as a decimal string so that values beyond JavaScript's safe integer range survive the round-trip intact.",
+  serialize: asDecimalString,
+  parseValue: asDecimalString,
+  parseLiteral: (ast) => {
+    if (ast.kind !== import_graphql.Kind.STRING && ast.kind !== import_graphql.Kind.INT) {
+      throw new import_graphql.GraphQLError(`BigInt cannot represent a ${ast.kind}`, { nodes: ast });
+    }
+    return asDecimalString(ast.value);
+  }
+});
+var numericStringPattern = /^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/;
+var asNumericString = (value) => {
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      throw new import_graphql.GraphQLError(`Decimal cannot represent non-finite value: ${value}`);
+    }
+    return String(value);
+  }
+  if (typeof value === "string") {
+    if (!numericStringPattern.test(value)) {
+      throw new import_graphql.GraphQLError(`Decimal cannot represent non-numeric value: "${value}"`);
+    }
+    return value;
+  }
+  throw new import_graphql.GraphQLError(`Decimal cannot represent value: ${JSON.stringify(value)}`);
+};
+var GraphQLDecimalString = new import_graphql.GraphQLScalarType({
+  name: "Decimal",
+  description: "An arbitrary-precision decimal, transported as a numeric string so that values beyond JavaScript's double-precision range survive the round-trip intact.",
+  serialize: asNumericString,
+  parseValue: asNumericString,
+  parseLiteral: (ast) => {
+    if (ast.kind !== import_graphql.Kind.STRING && ast.kind !== import_graphql.Kind.INT && ast.kind !== import_graphql.Kind.FLOAT) {
+      throw new import_graphql.GraphQLError(`Decimal cannot represent a ${ast.kind}`, { nodes: ast });
+    }
+    return asNumericString(ast.value);
+  }
+});
+
+// src/util/type-converter/index.ts
+var allowedNameChars = /^[a-zA-Z0-9_]+$/;
+var enumMap = /* @__PURE__ */ new WeakMap();
+var generateEnumCached = (column, columnName, tableName) => {
+  if (enumMap.has(column)) {
+    return enumMap.get(column);
+  }
+  const gqlEnum = new import_graphql2.GraphQLEnumType({
+    name: `${capitalize(tableName)}${capitalize(columnName)}Enum`,
+    values: Object.fromEntries(
+      column.enumValues.map((e, index) => [
+        allowedNameChars.test(e) ? e : `Option${index}`,
+        {
+          value: e,
+          description: `Value: ${e}`
+        }
+      ])
+    )
+  });
+  enumMap.set(column, gqlEnum);
+  return gqlEnum;
+};
+var geoXyType = new import_graphql2.GraphQLObjectType({
+  name: "PgGeometryObject",
+  fields: {
+    x: { type: import_graphql2.GraphQLFloat },
+    y: { type: import_graphql2.GraphQLFloat }
+  }
+});
+var geoXyInputType = new import_graphql2.GraphQLInputObjectType({
+  name: "PgGeometryObjectInput",
+  fields: {
+    x: { type: import_graphql2.GraphQLFloat },
+    y: { type: import_graphql2.GraphQLFloat }
+  }
+});
+var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
+  const dimensions = column.dimensions;
+  if (dimensions !== void 0 && dimensions > 0) {
+    const inner = columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+    const innerDesc = inner.description ?? inner.type.name;
+    let type = inner.type;
+    let description = innerDesc;
+    for (let i = 0; i < dimensions; i++) {
+      type = new import_graphql2.GraphQLList(new import_graphql2.GraphQLNonNull(type));
+      description = `Array<${description}>`;
+    }
+    return { type, description };
+  }
+  return columnBaseToGraphQLCore(column, columnName, tableName, isInput);
+};
+var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
+  const { type: baseType, constraint } = (0, import_drizzle_orm.extractExtendedColumnType)(column);
+  switch (baseType) {
+    case "boolean":
+      return { type: import_graphql2.GraphQLBoolean, description: "Boolean" };
+    case "object":
+      if (column instanceof import_pg_core.PgTimestamp || column instanceof import_pg_core.PgDate) {
+        return { type: import_graphql_scalars.GraphQLDateTime, description: "DateTime" };
+      }
+      return column.columnType === "PgGeometryObject" ? {
+        type: isInput ? geoXyInputType : geoXyType,
+        description: "Geometry points XY"
+      } : column.columnType === "PgBytea" ? {
+        type: new import_graphql2.GraphQLList(new import_graphql2.GraphQLNonNull(import_graphql2.GraphQLInt)),
+        description: "Buffer"
+      } : { type: import_graphql_scalars.GraphQLJSON, description: "JSON" };
+    case "string":
+      if (column.enumValues?.length) {
+        return { type: generateEnumCached(column, columnName, tableName) };
+      }
+      if (constraint === "numeric" && !column.dimensions) {
+        return { type: GraphQLDecimalString, description: "Decimal" };
+      }
+      if (column instanceof import_pg_core.PgTimestamp || column instanceof import_pg_core.PgTimestampString) {
+        return { type: import_graphql_scalars.GraphQLDateTime, description: "DateTime" };
+      }
+      if (column instanceof import_pg_core.PgUUID) {
+        return { type: import_graphql_scalars.GraphQLUUID, description: "UUID" };
+      }
+      if (column instanceof import_pg_core.PgDateString) {
+        return isInput ? { type: import_graphql2.GraphQLString, description: "Date" } : { type: import_graphql_scalars.GraphQLDate, description: "Date" };
+      }
+      return { type: import_graphql2.GraphQLString, description: "String" };
+    case "bigint":
+      return { type: GraphQLBigIntString, description: "BigInt" };
+    case "number": {
+      return (0, import_drizzle_orm.is)(column, import_pg_core.PgInteger) || (0, import_drizzle_orm.is)(column, import_pg_core.PgSerial) || (0, import_drizzle_orm.is)(column, import_mysql_core.MySqlInt) || (0, import_drizzle_orm.is)(column, import_mysql_core.MySqlSerial) || (0, import_drizzle_orm.is)(column, import_sqlite_core.SQLiteInteger) ? { type: import_graphql2.GraphQLInt, description: "Integer" } : { type: import_graphql2.GraphQLFloat, description: "Float" };
+    }
+    case "array": {
+      if (column.columnType === "PgVector") {
+        return {
+          type: new import_graphql2.GraphQLList(new import_graphql2.GraphQLNonNull(import_graphql2.GraphQLFloat)),
+          description: "Array<Float>"
+        };
+      }
+      if (column.columnType === "PgGeometry") {
+        return {
+          type: new import_graphql2.GraphQLList(new import_graphql2.GraphQLNonNull(import_graphql2.GraphQLFloat)),
+          description: "Tuple<[Float, Float]>"
+        };
+      }
+      const innerType = columnToGraphQLCore(
+        column.baseColumn,
+        columnName,
+        tableName,
+        isInput
+      );
+      return {
+        type: new import_graphql2.GraphQLList(new import_graphql2.GraphQLNonNull(innerType.type)),
+        description: `Array<${innerType.description}>`
+      };
+    }
+    default:
+      throw new Error(`Drizzle-GraphQL Error: Type ${column.dataType} is not implemented!`);
+  }
+};
+var columnScalarOverrides = /* @__PURE__ */ new WeakMap();
+var getColumnScalarOverride = (column, isInput) => {
+  const override = columnScalarOverrides.get(column);
+  return override ? isInput ? override.input : override.output : void 0;
+};
+var normalizeScalarOverride = (override, tableName, columnName) => {
+  const pair = override instanceof import_graphql2.GraphQLScalarType ? { output: override, input: override } : { output: override.output, input: override.input };
+  for (const scalar of [pair.output, pair.input]) {
+    if (scalar !== void 0 && !(scalar instanceof import_graphql2.GraphQLScalarType)) {
+      throw new Error(
+        `Drizzle-GraphQL Error: Scalar override for column '${tableName}.${columnName}' must be a GraphQLScalarType!`
+      );
+    }
+  }
+  return pair;
+};
+var registerScalarOverrides = (tables, config) => {
+  for (const [tableName, table] of Object.entries(tables)) {
+    for (const [columnName, column] of Object.entries((0, import_drizzle_orm.getTableColumns)(table))) {
+      const declared = config.scalars?.[tableName]?.[columnName];
+      let resolved;
+      if (declared !== void 0) {
+        resolved = normalizeScalarOverride(declared, tableName, columnName);
+      } else if (config.mapColumnType) {
+        let defaultType;
+        let defaultInputType;
+        try {
+          defaultType = columnToGraphQLCore(column, columnName, tableName, false).type;
+        } catch {
+        }
+        try {
+          defaultInputType = columnToGraphQLCore(column, columnName, tableName, true).type;
+        } catch {
+        }
+        const mapped = config.mapColumnType(column, { tableName, columnName, defaultType, defaultInputType });
+        if (mapped !== void 0) {
+          resolved = normalizeScalarOverride(mapped, tableName, columnName);
+        }
+      }
+      if (resolved && (resolved.output !== void 0 || resolved.input !== void 0)) {
+        columnScalarOverrides.set(column, resolved);
+      } else {
+        columnScalarOverrides.delete(column);
+      }
+    }
+  }
+};
+var drizzleColumnToGraphQLType = (column, columnName, tableName, forceNullable = false, defaultIsNullable = false, isInput = false) => {
+  const override = getColumnScalarOverride(column, isInput);
+  let typeDesc;
+  if (override) {
+    typeDesc = { type: override, description: override.name };
+  } else {
+    typeDesc = columnToGraphQLCore(column, columnName, tableName, isInput);
+    const noDesc = ["string", "boolean", "number"];
+    const { type: baseType } = (0, import_drizzle_orm.extractExtendedColumnType)(column);
+    if (noDesc.find((e) => e === baseType)) {
+      delete typeDesc.description;
+    }
+  }
+  if (forceNullable) {
+    return typeDesc;
+  }
+  if (column.notNull && !(defaultIsNullable && (column.hasDefault || column.defaultFn))) {
+    return {
+      type: new import_graphql2.GraphQLNonNull(typeDesc.type),
+      description: typeDesc.description
+    };
+  }
+  return typeDesc;
+};
+
+// src/util/data-mappers/index.ts
 var isJsonColumn = (column) => (column.dataType ?? "").includes("json") && column.columnType !== "PgGeometryObject";
 var remapToGraphQLCore = (key, value, tableName, column, relationMap) => {
   if (Array.isArray(value)) {
@@ -139,6 +407,9 @@ var remapToGraphQLCore = (key, value, tableName, column, relationMap) => {
   if (!column) {
     return value;
   }
+  if (getColumnScalarOverride(column, false)) {
+    return value;
+  }
   if (isJsonColumn(column)) {
     return value;
   }
@@ -169,7 +440,7 @@ var remapToGraphQLSingleOutput = (queryOutput, tableName, table, relationMap) =>
   for (const [key, value] of Object.entries(queryOutput)) {
     if (value === void 0 || value === null) {
       const relEntry = value === null ? relationMap?.[tableName]?.[key] : void 0;
-      if (relEntry && (0, import_drizzle_orm.is)(relEntry.relation, import_drizzle_orm.One)) {
+      if (relEntry && (0, import_drizzle_orm2.is)(relEntry.relation, import_drizzle_orm2.One)) {
         queryOutput[key] = null;
         continue;
       }
@@ -192,13 +463,19 @@ var remapToGraphQLArrayOutput = (queryOutput, tableName, table, relationMap) =>
   return queryOutput;
 };
 var remapFromGraphQLCore = (value, column, columnName) => {
+  if (getColumnScalarOverride(column, true)) {
+    if (typeof value === "object" && value !== null && Object.getPrototypeOf(value) === null) {
+      return Object.assign({}, value);
+    }
+    return value;
+  }
   const dataType = column.dataType ?? "";
   const columnType = column.columnType ?? "";
   const isTimestampColumn = columnType === "SQLiteTimestamp" || columnType === "SQLiteTimestampMs" || columnType === "MySqlTimestamp" || columnType === "MySqlDateTime" || columnType === "PgTimestamp" || columnType === "PgTimestampString";
   if (isTimestampColumn) {
     const formatted = new Date(value);
     if (Number.isNaN(formatted.getTime())) {
-      throw new import_graphql.GraphQLError(`Field '${columnName}' is not a valid date!`);
+      throw new import_graphql3.GraphQLError(`Field '${columnName}' is not a valid date!`);
     }
     return formatted;
   }
@@ -207,7 +484,7 @@ var remapFromGraphQLCore = (value, column, columnName) => {
     const dateOnly = value.includes("T") ? value.split("T")[0] : value;
     const check = new Date(dateOnly);
     if (Number.isNaN(check.getTime())) {
-      throw new import_graphql.GraphQLError(`Field '${columnName}' is not a valid date!`);
+      throw new import_graphql3.GraphQLError(`Field '${columnName}' is not a valid date!`);
     }
     return dateOnly;
   }
@@ -215,7 +492,7 @@ var remapFromGraphQLCore = (value, column, columnName) => {
     try {
       return BigInt(value);
     } catch {
-      throw new import_graphql.GraphQLError(`Field '${columnName}' is not a BigInt!`);
+      throw new import_graphql3.GraphQLError(`Field '${columnName}' is not a BigInt!`);
     }
   }
   if (dataType.includes("json") && column.columnType !== "PgGeometryObject") {
@@ -225,13 +502,13 @@ var remapFromGraphQLCore = (value, column, columnName) => {
     case "date": {
       const formatted = new Date(value);
       if (Number.isNaN(formatted.getTime())) {
-        throw new import_graphql.GraphQLError(`Field '${columnName}' is not a valid date!`);
+        throw new import_graphql3.GraphQLError(`Field '${columnName}' is not a valid date!`);
       }
       return formatted;
     }
     case "buffer": {
       if (!Array.isArray(value)) {
-        throw new import_graphql.GraphQLError(`Field '${columnName}' is not an array!`);
+        throw new import_graphql3.GraphQLError(`Field '${columnName}' is not an array!`);
       }
       return Buffer.from(value);
     }
@@ -242,7 +519,7 @@ var remapFromGraphQLCore = (value, column, columnName) => {
       try {
         return JSON.parse(value);
       } catch (e) {
-        throw new import_graphql.GraphQLError(
+        throw new import_graphql3.GraphQLError(
           `Invalid JSON in field '${columnName}':
 ${e instanceof Error ? e.message : "Unknown error"}`
         );
@@ -250,10 +527,10 @@ ${e instanceof Error ? e.message : "Unknown error"}`
     }
     case "array": {
       if (!Array.isArray(value)) {
-        throw new import_graphql.GraphQLError(`Field '${columnName}' is not an array!`);
+        throw new import_graphql3.GraphQLError(`Field '${columnName}' is not an array!`);
       }
       if (column.columnType === "PgGeometry" && value.length !== 2) {
-        throw new import_graphql.GraphQLError(
+        throw new import_graphql3.GraphQLError(
           `Invalid float tuple in field '${columnName}': expected array with length of 2, received ${value.length}`
         );
       }
@@ -263,7 +540,7 @@ ${e instanceof Error ? e.message : "Unknown error"}`
       try {
         return BigInt(value);
       } catch (_error) {
-        throw new import_graphql.GraphQLError(`Field '${columnName}' is not a BigInt!`);
+        throw new import_graphql3.GraphQLError(`Field '${columnName}' is not a BigInt!`);
       }
     }
     default: {
@@ -279,235 +556,24 @@ var remapFromGraphQLSingleInput = (queryInput, table) => {
     if (value === void 0) {
       delete queryInput[key];
     } else {
-      const column = (0, import_drizzle_orm.getTableColumns)(table)[key];
+      const column = (0, import_drizzle_orm2.getTableColumns)(table)[key];
       if (!column) {
-        throw new import_graphql.GraphQLError(`Unknown column: ${key}`);
-      }
-      if (value === null && column.notNull) {
-        delete queryInput[key];
-        continue;
-      }
-      queryInput[key] = remapFromGraphQLCore(value, column, key);
-    }
-  }
-  return queryInput;
-};
-var remapFromGraphQLArrayInput = (queryInput, table) => {
-  for (const entry of queryInput) {
-    remapFromGraphQLSingleInput(entry, table);
-  }
-  return queryInput;
-};
-
-// src/util/scalars/index.ts
-var import_graphql2 = require("graphql");
-var import_graphql_scalars = require("graphql-scalars");
-var asDecimalString = (value) => {
-  if (typeof value === "bigint") {
-    return value.toString();
-  }
-  if (typeof value === "number") {
-    if (!Number.isInteger(value)) {
-      throw new import_graphql2.GraphQLError(`BigInt cannot represent non-integer value: ${value}`);
-    }
-    if (!Number.isSafeInteger(value)) {
-      throw new import_graphql2.GraphQLError(
-        `BigInt cannot represent the number ${value} without precision loss \u2014 pass it as a string instead`
-      );
-    }
-    return String(value);
-  }
-  if (typeof value === "string") {
-    if (!/^-?\d+$/.test(value)) {
-      throw new import_graphql2.GraphQLError(`BigInt cannot represent non-integer value: "${value}"`);
-    }
-    return value;
-  }
-  throw new import_graphql2.GraphQLError(`BigInt cannot represent value: ${JSON.stringify(value)}`);
-};
-var GraphQLBigIntString = new import_graphql2.GraphQLScalarType({
-  name: "BigInt",
-  description: "A 64-bit integer, transported as a decimal string so that values beyond JavaScript's safe integer range survive the round-trip intact.",
-  serialize: asDecimalString,
-  parseValue: asDecimalString,
-  parseLiteral: (ast) => {
-    if (ast.kind !== import_graphql2.Kind.STRING && ast.kind !== import_graphql2.Kind.INT) {
-      throw new import_graphql2.GraphQLError(`BigInt cannot represent a ${ast.kind}`, { nodes: ast });
-    }
-    return asDecimalString(ast.value);
-  }
-});
-var numericStringPattern = /^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/;
-var asNumericString = (value) => {
-  if (typeof value === "bigint") {
-    return value.toString();
-  }
-  if (typeof value === "number") {
-    if (!Number.isFinite(value)) {
-      throw new import_graphql2.GraphQLError(`Decimal cannot represent non-finite value: ${value}`);
-    }
-    return String(value);
-  }
-  if (typeof value === "string") {
-    if (!numericStringPattern.test(value)) {
-      throw new import_graphql2.GraphQLError(`Decimal cannot represent non-numeric value: "${value}"`);
-    }
-    return value;
-  }
-  throw new import_graphql2.GraphQLError(`Decimal cannot represent value: ${JSON.stringify(value)}`);
-};
-var GraphQLDecimalString = new import_graphql2.GraphQLScalarType({
-  name: "Decimal",
-  description: "An arbitrary-precision decimal, transported as a numeric string so that values beyond JavaScript's double-precision range survive the round-trip intact.",
-  serialize: asNumericString,
-  parseValue: asNumericString,
-  parseLiteral: (ast) => {
-    if (ast.kind !== import_graphql2.Kind.STRING && ast.kind !== import_graphql2.Kind.INT && ast.kind !== import_graphql2.Kind.FLOAT) {
-      throw new import_graphql2.GraphQLError(`Decimal cannot represent a ${ast.kind}`, { nodes: ast });
-    }
-    return asNumericString(ast.value);
-  }
-});
-
-// src/util/type-converter/index.ts
-var import_drizzle_orm2 = require("drizzle-orm");
-var import_mysql_core = require("drizzle-orm/mysql-core");
-var import_pg_core = require("drizzle-orm/pg-core");
-var import_sqlite_core = require("drizzle-orm/sqlite-core");
-var import_graphql3 = require("graphql");
-var allowedNameChars = /^[a-zA-Z0-9_]+$/;
-var enumMap = /* @__PURE__ */ new WeakMap();
-var generateEnumCached = (column, columnName, tableName) => {
-  if (enumMap.has(column)) {
-    return enumMap.get(column);
-  }
-  const gqlEnum = new import_graphql3.GraphQLEnumType({
-    name: `${capitalize(tableName)}${capitalize(columnName)}Enum`,
-    values: Object.fromEntries(
-      column.enumValues.map((e, index) => [
-        allowedNameChars.test(e) ? e : `Option${index}`,
-        {
-          value: e,
-          description: `Value: ${e}`
-        }
-      ])
-    )
-  });
-  enumMap.set(column, gqlEnum);
-  return gqlEnum;
-};
-var geoXyType = new import_graphql3.GraphQLObjectType({
-  name: "PgGeometryObject",
-  fields: {
-    x: { type: import_graphql3.GraphQLFloat },
-    y: { type: import_graphql3.GraphQLFloat }
-  }
-});
-var geoXyInputType = new import_graphql3.GraphQLInputObjectType({
-  name: "PgGeometryObjectInput",
-  fields: {
-    x: { type: import_graphql3.GraphQLFloat },
-    y: { type: import_graphql3.GraphQLFloat }
-  }
-});
-var columnToGraphQLCore = (column, columnName, tableName, isInput) => {
-  const dimensions = column.dimensions;
-  if (dimensions !== void 0 && dimensions > 0) {
-    const inner = columnBaseToGraphQLCore(column, columnName, tableName, isInput);
-    const innerDesc = inner.description ?? inner.type.name;
-    let type = inner.type;
-    let description = innerDesc;
-    for (let i = 0; i < dimensions; i++) {
-      type = new import_graphql3.GraphQLList(new import_graphql3.GraphQLNonNull(type));
-      description = `Array<${description}>`;
-    }
-    return { type, description };
-  }
-  return columnBaseToGraphQLCore(column, columnName, tableName, isInput);
-};
-var columnBaseToGraphQLCore = (column, columnName, tableName, isInput) => {
-  const { type: baseType, constraint } = (0, import_drizzle_orm2.extractExtendedColumnType)(column);
-  switch (baseType) {
-    case "boolean":
-      return { type: import_graphql3.GraphQLBoolean, description: "Boolean" };
-    case "object":
-      if (column instanceof import_pg_core.PgTimestamp || column instanceof import_pg_core.PgDate) {
-        return { type: import_graphql_scalars.GraphQLDateTime, description: "DateTime" };
-      }
-      return column.columnType === "PgGeometryObject" ? {
-        type: isInput ? geoXyInputType : geoXyType,
-        description: "Geometry points XY"
-      } : column.columnType === "PgBytea" ? {
-        type: new import_graphql3.GraphQLList(new import_graphql3.GraphQLNonNull(import_graphql3.GraphQLInt)),
-        description: "Buffer"
-      } : { type: import_graphql_scalars.GraphQLJSON, description: "JSON" };
-    case "string":
-      if (column.enumValues?.length) {
-        return { type: generateEnumCached(column, columnName, tableName) };
-      }
-      if (constraint === "numeric" && !column.dimensions) {
-        return { type: GraphQLDecimalString, description: "Decimal" };
-      }
-      if (column instanceof import_pg_core.PgTimestamp || column instanceof import_pg_core.PgTimestampString) {
-        return { type: import_graphql_scalars.GraphQLDateTime, description: "DateTime" };
-      }
-      if (column instanceof import_pg_core.PgUUID) {
-        return { type: import_graphql_scalars.GraphQLUUID, description: "UUID" };
-      }
-      if (column instanceof import_pg_core.PgDateString) {
-        return isInput ? { type: import_graphql3.GraphQLString, description: "Date" } : { type: import_graphql_scalars.GraphQLDate, description: "Date" };
-      }
-      return { type: import_graphql3.GraphQLString, description: "String" };
-    case "bigint":
-      return { type: GraphQLBigIntString, description: "BigInt" };
-    case "number": {
-      return (0, import_drizzle_orm2.is)(column, import_pg_core.PgInteger) || (0, import_drizzle_orm2.is)(column, import_pg_core.PgSerial) || (0, import_drizzle_orm2.is)(column, import_mysql_core.MySqlInt) || (0, import_drizzle_orm2.is)(column, import_mysql_core.MySqlSerial) || (0, import_drizzle_orm2.is)(column, import_sqlite_core.SQLiteInteger) ? { type: import_graphql3.GraphQLInt, description: "Integer" } : { type: import_graphql3.GraphQLFloat, description: "Float" };
-    }
-    case "array": {
-      if (column.columnType === "PgVector") {
-        return {
-          type: new import_graphql3.GraphQLList(new import_graphql3.GraphQLNonNull(import_graphql3.GraphQLFloat)),
-          description: "Array<Float>"
-        };
+        throw new import_graphql3.GraphQLError(`Unknown column: ${key}`);
       }
-      if (column.columnType === "PgGeometry") {
-        return {
-          type: new import_graphql3.GraphQLList(new import_graphql3.GraphQLNonNull(import_graphql3.GraphQLFloat)),
-          description: "Tuple<[Float, Float]>"
-        };
+      if (value === null && column.notNull) {
+        delete queryInput[key];
+        continue;
       }
-      const innerType = columnToGraphQLCore(
-        column.baseColumn,
-        columnName,
-        tableName,
-        isInput
-      );
-      return {
-        type: new import_graphql3.GraphQLList(new import_graphql3.GraphQLNonNull(innerType.type)),
-        description: `Array<${innerType.description}>`
-      };
+      queryInput[key] = remapFromGraphQLCore(value, column, key);
     }
-    default:
-      throw new Error(`Drizzle-GraphQL Error: Type ${column.dataType} is not implemented!`);
   }
+  return queryInput;
 };
-var drizzleColumnToGraphQLType = (column, columnName, tableName, forceNullable = false, defaultIsNullable = false, isInput = false) => {
-  const typeDesc = columnToGraphQLCore(column, columnName, tableName, isInput);
-  const noDesc = ["string", "boolean", "number"];
-  const { type: baseType } = (0, import_drizzle_orm2.extractExtendedColumnType)(column);
-  if (noDesc.find((e) => e === baseType)) {
-    delete typeDesc.description;
-  }
-  if (forceNullable) {
-    return typeDesc;
-  }
-  if (column.notNull && !(defaultIsNullable && (column.hasDefault || column.defaultFn))) {
-    return {
-      type: new import_graphql3.GraphQLNonNull(typeDesc.type),
-      description: typeDesc.description
-    };
+var remapFromGraphQLArrayInput = (queryInput, table) => {
+  for (const entry of queryInput) {
+    remapFromGraphQLSingleInput(entry, table);
   }
-  return typeDesc;
+  return queryInput;
 };
 
 // src/util/builders/common.ts
@@ -598,6 +664,203 @@ var resolveQueryExecutor = (db, context, tableName, buildTimeQueryBase) => {
     queryBase: buildTimeQueryBase ? executor?.query?.[tableName] ?? buildTimeQueryBase : buildTimeQueryBase
   };
 };
+var createMutationTxCtx = (options) => options ? { timeoutMs: options.timeoutMs, fieldNames: /* @__PURE__ */ new Set(), states: /* @__PURE__ */ new WeakMap() } : void 0;
+var includedByDirectives = (node, variables) => {
+  for (const directive of node.directives ?? []) {
+    const name = directive.name.value;
+    if (name !== "skip" && name !== "include") {
+      continue;
+    }
+    const ifArg = directive.arguments?.find((arg) => arg.name.value === "if");
+    let value;
+    if (ifArg?.value.kind === "BooleanValue") {
+      value = ifArg.value.value;
+    } else if (ifArg?.value.kind === "Variable") {
+      value = variables?.[ifArg.value.name.value];
+    }
+    if (name === "skip" && value === true) {
+      return false;
+    }
+    if (name === "include" && value !== true) {
+      return false;
+    }
+  }
+  return true;
+};
+var collectRootMutationKeys = (selectionSet, fragments, variables, known, keys, visitedFragments) => {
+  for (const selection of selectionSet.selections) {
+    if (!includedByDirectives(selection, variables)) {
+      continue;
+    }
+    if (selection.kind === "Field") {
+      const name = selection.name.value;
+      if (name === "__typename") {
+        continue;
+      }
+      if (!known.has(name)) {
+        return false;
+      }
+      keys.add(selection.alias?.value ?? name);
+    } else if (selection.kind === "InlineFragment") {
+      if (!collectRootMutationKeys(selection.selectionSet, fragments, variables, known, keys, visitedFragments)) {
+        return false;
+      }
+    } else if (selection.kind === "FragmentSpread") {
+      const fragmentName = selection.name.value;
+      if (visitedFragments.has(fragmentName)) {
+        continue;
+      }
+      visitedFragments.add(fragmentName);
+      const fragment = fragments?.[fragmentName];
+      if (!fragment) {
+        return false;
+      }
+      if (!collectRootMutationKeys(fragment.selectionSet, fragments, variables, known, keys, visitedFragments)) {
+        return false;
+      }
+    }
+  }
+  return true;
+};
+var abortedBatchError = () => new import_graphql4.GraphQLError(
+  "Drizzle-GraphQL Error: Mutation was not executed because an earlier mutation in the same request failed and the shared transaction was rolled back."
+);
+var openSharedTx = (db, context, txCtx, stateKey, expected) => {
+  let release;
+  let rejectLatch;
+  const latch = new Promise((resolve, reject) => {
+    release = resolve;
+    rejectLatch = reject;
+  });
+  let readyResolve;
+  let readyReject;
+  const ready = new Promise((resolve, reject) => {
+    readyResolve = resolve;
+    readyReject = reject;
+  });
+  ready.catch(() => {
+  });
+  const canStash = context !== null && typeof context === "object" && !Object.isFrozen(context);
+  const settled = db.transaction(async (tx) => {
+    if (canStash) {
+      context[drizzleExecutorKey] = tx;
+    }
+    readyResolve(tx);
+    await latch;
+  });
+  let timer;
+  const clearTimer = () => {
+    if (timer !== void 0) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+  };
+  const state = {
+    kind: "shared",
+    expected,
+    completed: 0,
+    failure: void 0,
+    aborted: false,
+    done: false,
+    ready,
+    settled,
+    release,
+    abort: (e) => {
+      if (!state.aborted) {
+        state.aborted = true;
+        state.failure = e;
+      }
+      rejectLatch(e);
+    },
+    suspendTimer: clearTimer,
+    bumpTimer: () => {
+      clearTimer();
+      if (state.done) {
+        return;
+      }
+      timer = setTimeout(() => {
+        state.abort(
+          new import_graphql4.GraphQLError(
+            `Drizzle-GraphQL Error: Shared mutation transaction timed out after ${txCtx.timeoutMs}ms waiting for the remaining mutation fields; rolling back.`
+          )
+        );
+      }, txCtx.timeoutMs);
+      timer.unref?.();
+    }
+  };
+  const cleanup = () => {
+    state.done = true;
+    clearTimer();
+    if (canStash) {
+      delete context[drizzleExecutorKey];
+    }
+    if (!state.aborted) {
+      txCtx.states.delete(stateKey);
+    }
+  };
+  settled.then(cleanup, (e) => {
+    cleanup();
+    readyReject(e);
+  });
+  state.bumpTimer();
+  return state;
+};
+var runOnSharedTx = async (state, body) => {
+  if (state.aborted) {
+    await state.settled.catch(() => {
+    });
+    throw abortedBatchError();
+  }
+  state.suspendTimer();
+  const tx = await state.ready;
+  try {
+    if (state.aborted) {
+      throw abortedBatchError();
+    }
+    const result = await body(tx);
+    state.completed += 1;
+    if (state.completed >= state.expected) {
+      state.release();
+      await state.settled;
+    } else {
+      state.bumpTimer();
+    }
+    return result;
+  } catch (e) {
+    state.abort(e);
+    await state.settled.catch(() => {
+    });
+    throw e;
+  }
+};
+var runMutation = async (db, context, info, txCtx, body) => {
+  const contextIsObject = context !== null && (typeof context === "object" || typeof context === "function");
+  const stateKey = contextIsObject ? context : info.operation;
+  let state = txCtx?.states.get(stateKey);
+  if (!state) {
+    if (contextIsObject && context[drizzleExecutorKey]) {
+      return body(context[drizzleExecutorKey]);
+    }
+    if (!txCtx || info.operation.operation !== "mutation") {
+      return body(db);
+    }
+    const keys = /* @__PURE__ */ new Set();
+    const allKnown = collectRootMutationKeys(
+      info.operation.selectionSet,
+      info.fragments,
+      info.variableValues,
+      txCtx.fieldNames,
+      keys,
+      /* @__PURE__ */ new Set()
+    );
+    state = !allKnown || keys.size <= 1 ? { kind: "passthrough" } : openSharedTx(db, context, txCtx, stateKey, keys.size);
+    txCtx.states.set(stateKey, state);
+  }
+  if (state.kind === "passthrough") {
+    return body(resolveExecutor(db, context));
+  }
+  return runOnSharedTx(state, body);
+};
 var batchedPaginatedRelationQuery = async (db, targetTable, foreignCol, whereCondition, orderByArg, limit, offset, pkNames, orderCtx) => {
   const cols = (0, import_drizzle_orm3.getColumns)(targetTable);
   const orderExprs = [
@@ -891,9 +1154,31 @@ var arrayFilterFields = (colType, colArr, colDesc) => {
   };
 };
 var FILTERS_WITHOUT_STRING_OPS = /* @__PURE__ */ new Set(["Id", "Int", "Float", "BigInt", "Decimal"]);
+var BUILTIN_FILTER_SCALARS = /* @__PURE__ */ new Set([
+  import_graphql4.GraphQLString,
+  import_graphql4.GraphQLInt,
+  import_graphql4.GraphQLFloat,
+  import_graphql4.GraphQLBoolean,
+  GraphQLBigIntString,
+  GraphQLDecimalString,
+  import_graphql_scalars.GraphQLUUID,
+  import_graphql_scalars.GraphQLJSON,
+  import_graphql_scalars.GraphQLDate,
+  import_graphql_scalars.GraphQLDateTime
+]);
+var resolveOverrideFilterDescriptor = (scalar) => {
+  if (scalar === import_graphql_scalars.GraphQLJSON) {
+    return { name: "JSON", kind: "json" };
+  }
+  if (scalar === import_graphql_scalars.GraphQLUUID) {
+    return { name: "Id", kind: "scalar" };
+  }
+  return { name: scalar.name, kind: "scalar" };
+};
 var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const columnGraphQLType = drizzleColumnToGraphQLType(column, columnName, tableName, true, false, true);
-  const { name: genericName, kind } = resolveGenericFilterDescriptor(column, columnGraphQLType);
+  const inputOverride = getColumnScalarOverride(column, true);
+  const { name: genericName, kind } = inputOverride ? resolveOverrideFilterDescriptor(inputOverride) : resolveGenericFilterDescriptor(column, columnGraphQLType);
   const cached = cacheCtx.genericFilterCache.get(genericName);
   if (cached) {
     return cached;
@@ -901,7 +1186,9 @@ var generateColumnFilterValues = (column, tableName, columnName, cacheCtx) => {
   const colType = columnGraphQLType.type;
   const colDesc = columnGraphQLType.description;
   const colArr = new import_graphql4.GraphQLList(new import_graphql4.GraphQLNonNull(colType));
-  const omitStringOps = FILTERS_WITHOUT_STRING_OPS.has(genericName);
+  const customOverrideFilter = inputOverride !== void 0 && !BUILTIN_FILTER_SCALARS.has(inputOverride);
+  const underlying = (0, import_drizzle_orm3.extractExtendedColumnType)(column);
+  const omitStringOps = customOverrideFilter ? underlying.type !== "string" || underlying.constraint === "numeric" : FILTERS_WITHOUT_STRING_OPS.has(genericName);
   const baseFields = kind === "json" ? jsonFilterFields(column, colType) : kind === "array" ? arrayFilterFields(colType, colArr, colDesc) : {
     eq: { type: colType, description: colDesc },
     ne: { type: colType, description: colDesc },
@@ -982,10 +1269,9 @@ var generateTableOrderCached = (table) => {
   }
   return remapped;
 };
-var filterMap = /* @__PURE__ */ new WeakMap();
 var generateTableFilterValuesCached = (table, tableName, cacheCtx) => {
-  if (filterMap.has(table)) {
-    return filterMap.get(table);
+  if (cacheCtx.filterFieldCache.has(table)) {
+    return cacheCtx.filterFieldCache.get(table);
   }
   const columns = (0, import_drizzle_orm3.getColumns)(table);
   const columnEntries = Object.entries(columns);
@@ -997,13 +1283,12 @@ var generateTableFilterValuesCached = (table, tableName, cacheCtx) => {
       }
     ])
   );
-  filterMap.set(table, remapped);
+  cacheCtx.filterFieldCache.set(table, remapped);
   return remapped;
 };
-var fieldMap = /* @__PURE__ */ new WeakMap();
-var generateTableSelectTypeFieldsCached = (table, tableName) => {
-  if (fieldMap.has(table)) {
-    return fieldMap.get(table);
+var generateTableSelectTypeFieldsCached = (table, tableName, cacheCtx) => {
+  if (cacheCtx.selectFieldCache.has(table)) {
+    return cacheCtx.selectFieldCache.get(table);
   }
   const columns = (0, import_drizzle_orm3.getColumns)(table);
   const columnEntries = Object.entries(columns);
@@ -1020,7 +1305,7 @@ var generateTableSelectTypeFieldsCached = (table, tableName) => {
       resolve: rowCursorResolver
     };
   }
-  fieldMap.set(table, remapped);
+  cacheCtx.selectFieldCache.set(table, remapped);
   return remapped;
 };
 var isFilterableRelation = (relation) => !relation.through;
@@ -1170,7 +1455,7 @@ var generateSelectFields = (tables, tableName, relationMap, fromTableName, fromR
   const table = tables[tableName];
   const order = withOrder ? generateTableOrderTypeCached(table, tableName, typeNameMapper, cacheCtx, relationMap, tables) : void 0;
   const filters = generateTableFilterTypeCached(table, tableName, cacheCtx, typeNameMapper, relationMap, tables);
-  const tableFields = generateTableSelectTypeFieldsCached(table, tableName);
+  const tableFields = generateTableSelectTypeFieldsCached(table, tableName, cacheCtx);
   const relationsForTable = relationMap[tableName];
   const relationEntries = relationsForTable ? Object.entries(relationsForTable) : [];
   if (relationsDepthLimit !== void 0 && currentDepth >= relationsDepthLimit) {
@@ -1239,7 +1524,7 @@ var generateSelectFields = (tables, tableName, relationMap, fromTableName, fromR
       let relType = cacheCtx.objectTypeCache.get(targetTableName);
       if (!relType) {
         const targetTable = tables[targetTableName];
-        const targetTableFields = generateTableSelectTypeFieldsCached(targetTable, targetTableName);
+        const targetTableFields = generateTableSelectTypeFieldsCached(targetTable, targetTableName, cacheCtx);
         let targetContainer = cacheCtx.relationFieldContainers.get(targetTableName);
         if (!targetContainer) {
           targetContainer = { fields: {} };
@@ -3009,7 +3294,7 @@ var generateSelectSingle = (db, tableName, tables, relationMap, orderArgs, filte
     args: queryArgs
   };
 };
-var generateInsertArray = (db, _tableName, table, baseType, fieldName) => {
+var generateInsertArray = (db, _tableName, table, baseType, fieldName, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql6.GraphQLNonNull(new import_graphql6.GraphQLList(new import_graphql6.GraphQLNonNull(baseType)))
@@ -3017,14 +3302,16 @@ var generateInsertArray = (db, _tableName, table, baseType, fieldName) => {
   };
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql6.GraphQLError("No values were provided!");
-        }
-        await resolveExecutor(db, context).insert(table).values(input);
-        return { isSuccess: true };
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql6.GraphQLError("No values were provided!");
+          }
+          await executor.insert(table).values(input);
+          return { isSuccess: true };
+        });
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3032,7 +3319,7 @@ var generateInsertArray = (db, _tableName, table, baseType, fieldName) => {
     args: queryArgs
   };
 };
-var generateInsertSingle = (db, _tableName, table, baseType, fieldName) => {
+var generateInsertSingle = (db, _tableName, table, baseType, fieldName, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql6.GraphQLNonNull(baseType)
@@ -3040,11 +3327,13 @@ var generateInsertSingle = (db, _tableName, table, baseType, fieldName) => {
   };
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLSingleInput(args.values, table);
-        await resolveExecutor(db, context).insert(table).values(input);
-        return { isSuccess: true };
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLSingleInput(args.values, table);
+          await executor.insert(table).values(input);
+          return { isSuccess: true };
+        });
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3052,7 +3341,7 @@ var generateInsertSingle = (db, _tableName, table, baseType, fieldName) => {
     args: queryArgs
   };
 };
-var generateUpsert = (db, table, baseType, onConflictType, fieldName, single) => {
+var generateUpsert = (db, table, baseType, onConflictType, fieldName, single, txCtx) => {
   const queryArgs = {
     values: {
       type: single ? new import_graphql6.GraphQLNonNull(baseType) : new import_graphql6.GraphQLNonNull(new import_graphql6.GraphQLList(new import_graphql6.GraphQLNonNull(baseType)))
@@ -3065,28 +3354,29 @@ var generateUpsert = (db, table, baseType, onConflictType, fieldName, single) =>
   const pkNames = mysqlPrimaryKeyPropNames(table);
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql6.GraphQLError("No values were provided!");
-        }
-        const plan = resolveConflictPlan({
-          table,
-          values: input,
-          onConflict: args.onConflict,
-          pkNames,
-          uniqueSets: [],
-          excludedRef: mysqlValuesColumnRef,
-          withTarget: false
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql6.GraphQLError("No values were provided!");
+          }
+          const plan = resolveConflictPlan({
+            table,
+            values: input,
+            onConflict: args.onConflict,
+            pkNames,
+            uniqueSets: [],
+            excludedRef: mysqlValuesColumnRef,
+            withTarget: false
+          });
+          if (plan.action === "NOTHING") {
+            await executor.insert(table).ignore().values(input);
+          } else {
+            await executor.insert(table).values(input).onDuplicateKeyUpdate({ set: plan.set });
+          }
+          return { isSuccess: true };
         });
-        const executor = resolveExecutor(db, context);
-        if (plan.action === "NOTHING") {
-          await executor.insert(table).ignore().values(input);
-        } else {
-          await executor.insert(table).values(input).onDuplicateKeyUpdate({ set: plan.set });
-        }
-        return { isSuccess: true };
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3094,7 +3384,7 @@ var generateUpsert = (db, table, baseType, onConflictType, fieldName, single) =>
     args: queryArgs
   };
 };
-var generateUpdate = (db, tableName, table, setArgs, filterArgs, fieldName, single, requireWhere, filterCtx) => {
+var generateUpdate = (db, tableName, table, setArgs, filterArgs, fieldName, single, requireWhere, filterCtx, txCtx) => {
   const queryArgs = {
     set: {
       type: new import_graphql6.GraphQLNonNull(setArgs)
@@ -3105,25 +3395,26 @@ var generateUpdate = (db, tableName, table, setArgs, filterArgs, fieldName, sing
   };
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const { where, set } = args;
-        const input = remapFromGraphQLSingleInput(set, table);
-        if (!Object.keys(input).length) {
-          throw new import_graphql6.GraphQLError("Unable to update with no values specified!");
-        }
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.update(table).set(input);
-        if (filters) {
-          query = query.where(filters);
-        }
-        await query;
-        return { isSuccess: true };
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where, set } = args;
+          const input = remapFromGraphQLSingleInput(set, table);
+          if (!Object.keys(input).length) {
+            throw new import_graphql6.GraphQLError("Unable to update with no values specified!");
+          }
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.update(table).set(input);
+          if (filters) {
+            query = query.where(filters);
+          }
+          await query;
+          return { isSuccess: true };
+        });
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3131,7 +3422,7 @@ var generateUpdate = (db, tableName, table, setArgs, filterArgs, fieldName, sing
     args: queryArgs
   };
 };
-var generateUpdateMany = (db, tableName, table, updateManyInput, fieldName, filterCtx) => {
+var generateUpdateMany = (db, tableName, table, updateManyInput, fieldName, filterCtx, txCtx) => {
   const queryArgs = {
     updates: {
       type: new import_graphql6.GraphQLNonNull(new import_graphql6.GraphQLList(new import_graphql6.GraphQLNonNull(updateManyInput)))
@@ -3139,33 +3430,34 @@ var generateUpdateMany = (db, tableName, table, updateManyInput, fieldName, filt
   };
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const { updates } = args;
-        if (!updates.length) {
-          throw new import_graphql6.GraphQLError("No updates were provided!");
-        }
-        const entries = updates.map(({ where, set }) => {
-          const input = remapFromGraphQLSingleInput(set, table);
-          if (!Object.keys(input).length) {
-            throw new import_graphql6.GraphQLError("Unable to update with no values specified!");
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { updates } = args;
+          if (!updates.length) {
+            throw new import_graphql6.GraphQLError("No updates were provided!");
           }
-          return {
-            set: input,
-            filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
-          };
-        });
-        const executor = resolveExecutor(db, context);
-        await executor.transaction(async (tx) => {
-          for (const entry of entries) {
-            let query = tx.update(table).set(entry.set);
-            if (entry.filters) {
-              query = query.where(entry.filters);
+          const entries = updates.map(({ where, set }) => {
+            const input = remapFromGraphQLSingleInput(set, table);
+            if (!Object.keys(input).length) {
+              throw new import_graphql6.GraphQLError("Unable to update with no values specified!");
             }
-            await query;
-          }
+            return {
+              set: input,
+              filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
+            };
+          });
+          await executor.transaction(async (tx) => {
+            for (const entry of entries) {
+              let query = tx.update(table).set(entry.set);
+              if (entry.filters) {
+                query = query.where(entry.filters);
+              }
+              await query;
+            }
+          });
+          return { isSuccess: true };
         });
-        return { isSuccess: true };
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3173,7 +3465,7 @@ var generateUpdateMany = (db, tableName, table, updateManyInput, fieldName, filt
     args: queryArgs
   };
 };
-var generateDelete = (db, tableName, table, filterArgs, fieldName, single, requireWhere, filterCtx) => {
+var generateDelete = (db, tableName, table, filterArgs, fieldName, single, requireWhere, filterCtx, txCtx) => {
   const queryArgs = {
     where: {
       type: single || requireWhere ? new import_graphql6.GraphQLNonNull(filterArgs) : filterArgs
@@ -3181,21 +3473,22 @@ var generateDelete = (db, tableName, table, filterArgs, fieldName, single, requi
   };
   return {
     name: fieldName,
-    resolver: async (_source, args, context, _info) => {
+    resolver: async (_source, args, context, info) => {
       try {
-        const { where } = args;
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.delete(table);
-        if (filters) {
-          query = query.where(filters);
-        }
-        await query;
-        return { isSuccess: true };
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where } = args;
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.delete(table);
+          if (filters) {
+            query = query.where(filters);
+          }
+          await query;
+          return { isSuccess: true };
+        });
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3215,6 +3508,7 @@ var generateSchemaData = (db, schema, relations, options) => {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, mysqlPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -3226,6 +3520,8 @@ var generateSchemaData = (db, schema, relations, options) => {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -3235,6 +3531,7 @@ var generateSchemaData = (db, schema, relations, options) => {
   const relationAggregateFactory = features.relationAggregates ? createRelationAggregateFactory(db, tables, cacheCtx, typeNameMapper, filterCtx) : void 0;
   const queries = {};
   const mutations = {};
+  const mutationTxCtx = createMutationTxCtx(options.transactions);
   const gqlSchemaTypes = Object.fromEntries(
     Object.entries(tables).map(([tableName, _table]) => [
       tableName,
@@ -3310,8 +3607,22 @@ var generateSchemaData = (db, schema, relations, options) => {
       typeNameMapper,
       filterCtx
     );
-    const insertArrGenerated = features.insert ? generateInsertArray(db, tableName, schema[tableName], insertInput, createArrayFieldName) : void 0;
-    const insertSingleGenerated = features.insert ? generateInsertSingle(db, tableName, schema[tableName], insertInput, createSingleFieldName) : void 0;
+    const insertArrGenerated = features.insert ? generateInsertArray(
+      db,
+      tableName,
+      schema[tableName],
+      insertInput,
+      createArrayFieldName,
+      mutationTxCtx
+    ) : void 0;
+    const insertSingleGenerated = features.insert ? generateInsertSingle(
+      db,
+      tableName,
+      schema[tableName],
+      insertInput,
+      createSingleFieldName,
+      mutationTxCtx
+    ) : void 0;
     const onConflictInput = features.upsert ? generateOnConflictInput({
       table: schema[tableName],
       typeName,
@@ -3319,8 +3630,24 @@ var generateSchemaData = (db, schema, relations, options) => {
       tableFilters,
       withTarget: false
     }) : void 0;
-    const upsertArrGenerated = onConflictInput ? generateUpsert(db, schema[tableName], insertInput, onConflictInput, upsertArrayFieldName, false) : void 0;
-    const upsertSingleGenerated = onConflictInput ? generateUpsert(db, schema[tableName], insertInput, onConflictInput, upsertSingleFieldName, true) : void 0;
+    const upsertArrGenerated = onConflictInput ? generateUpsert(
+      db,
+      schema[tableName],
+      insertInput,
+      onConflictInput,
+      upsertArrayFieldName,
+      false,
+      mutationTxCtx
+    ) : void 0;
+    const upsertSingleGenerated = onConflictInput ? generateUpsert(
+      db,
+      schema[tableName],
+      insertInput,
+      onConflictInput,
+      upsertSingleFieldName,
+      true,
+      mutationTxCtx
+    ) : void 0;
     const updateGenerated = features.update ? generateUpdate(
       db,
       tableName,
@@ -3330,7 +3657,8 @@ var generateSchemaData = (db, schema, relations, options) => {
       updateFieldName,
       false,
       features.requireWhere,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateSingleGenerated = features.update ? generateUpdate(
       db,
@@ -3341,7 +3669,8 @@ var generateSchemaData = (db, schema, relations, options) => {
       updateSingleFieldName,
       true,
       features.requireWhere,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateManyInput = features.update && features.updateMany ? generateUpdateManyInput({ typeName, updatePrefix: prefixes.update, updateInput, tableFilters }) : void 0;
     const updateManyGenerated = updateManyInput ? generateUpdateMany(
@@ -3350,7 +3679,8 @@ var generateSchemaData = (db, schema, relations, options) => {
       schema[tableName],
       updateManyInput,
       updateManyFieldName,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const deleteGenerated = features.delete ? generateDelete(
       db,
@@ -3360,7 +3690,8 @@ var generateSchemaData = (db, schema, relations, options) => {
       deleteFieldName,
       false,
       features.requireWhere,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const deleteSingleGenerated = features.delete ? generateDelete(
       db,
@@ -3370,7 +3701,8 @@ var generateSchemaData = (db, schema, relations, options) => {
       deleteSingleFieldName,
       true,
       features.requireWhere,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const aggregateType = features.aggregates ? generateAggregateTypes(schema[tableName], tableName, typeName, cacheCtx) : void 0;
     const aggregateGenerated = features.aggregates ? generateAggregate(
@@ -3463,6 +3795,11 @@ var generateSchemaData = (db, schema, relations, options) => {
       inputs[havingInput.name] = havingInput;
     }
   }
+  if (mutationTxCtx) {
+    for (const name of Object.keys(mutations)) {
+      mutationTxCtx.fieldNames.add(name);
+    }
+  }
   const fieldResolvers = {};
   for (const [tableName, tableRelations] of Object.entries(namedRelations)) {
     const relResolvers = {};
@@ -3666,7 +4003,7 @@ var generateSelectSingle2 = (db, tableName, tables, relationMap, orderArgs, filt
   };
 };
 var pgPrimaryKeyPropNames = (table) => getPrimaryKeyPropNamesFromConfig(table, import_pg_core2.getTableConfig);
-var generateInsertArray2 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false) => {
+var generateInsertArray2 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql7.GraphQLNonNull(new import_graphql7.GraphQLList(new import_graphql7.GraphQLNonNull(baseType)))
@@ -3677,31 +4014,32 @@ var generateInsertArray2 = (db, tableName, table, tables, relationMap, baseType,
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql7.GraphQLError("No values were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql7.GraphQLError("No values were provided!");
+          }
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          if (conflictDoNothing) {
+            query = query.onConflictDoNothing();
+          }
+          const result = await query;
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        if (conflictDoNothing) {
-          query = query.onConflictDoNothing();
-        }
-        const result = await query;
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3709,7 +4047,7 @@ var generateInsertArray2 = (db, tableName, table, tables, relationMap, baseType,
     args: queryArgs
   };
 };
-var generateInsertSingle2 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false) => {
+var generateInsertSingle2 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql7.GraphQLNonNull(baseType)
@@ -3720,31 +4058,32 @@ var generateInsertSingle2 = (db, tableName, table, tables, relationMap, baseType
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLSingleInput(args.values, table);
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLSingleInput(args.values, table);
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          if (conflictDoNothing) {
+            query = query.onConflictDoNothing();
+          }
+          const result = await query;
+          if (!result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        if (conflictDoNothing) {
-          query = query.onConflictDoNothing();
-        }
-        const result = await query;
-        if (!result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3752,7 +4091,7 @@ var generateInsertSingle2 = (db, tableName, table, tables, relationMap, baseType
     args: queryArgs
   };
 };
-var generateUpsert2 = (db, tableName, table, tables, relationMap, baseType, onConflictType, uniqueSets, fieldName, typeName, single, typeNameMapper, filterCtx) => {
+var generateUpsert2 = (db, tableName, table, tables, relationMap, baseType, onConflictType, uniqueSets, fieldName, typeName, single, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     values: {
       type: single ? new import_graphql7.GraphQLNonNull(baseType) : new import_graphql7.GraphQLNonNull(new import_graphql7.GraphQLList(new import_graphql7.GraphQLNonNull(baseType)))
@@ -3767,40 +4106,41 @@ var generateUpsert2 = (db, tableName, table, tables, relationMap, baseType, onCo
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql7.GraphQLError("No values were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, { deep: true });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
-        });
-        const plan = resolveConflictPlan({
-          table,
-          values: input,
-          onConflict: args.onConflict,
-          pkNames,
-          uniqueSets,
-          excludedRef: excludedColumnRef,
-          withTarget: true,
-          buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName))
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql7.GraphQLError("No values were provided!");
+          }
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, { deep: true });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const plan = resolveConflictPlan({
+            table,
+            values: input,
+            onConflict: args.onConflict,
+            pkNames,
+            uniqueSets,
+            excludedRef: excludedColumnRef,
+            withTarget: true,
+            buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName))
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          query = plan.action === "NOTHING" ? query.onConflictDoNothing(plan.target ? { target: plan.target } : void 0) : query.onConflictDoUpdate({ target: plan.target, set: plan.set, setWhere: plan.setWhere });
+          const result = await query;
+          if (single && !result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        query = plan.action === "NOTHING" ? query.onConflictDoNothing(plan.target ? { target: plan.target } : void 0) : query.onConflictDoUpdate({ target: plan.target, set: plan.set, setWhere: plan.setWhere });
-        const result = await query;
-        if (single && !result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3808,7 +4148,7 @@ var generateUpsert2 = (db, tableName, table, tables, relationMap, baseType, onCo
     args: queryArgs
   };
 };
-var generateUpdate2 = (db, tableName, table, tables, relationMap, setArgs, filterArgs, fieldName, typeName, single, requireWhere, typeNameMapper, filterCtx) => {
+var generateUpdate2 = (db, tableName, table, tables, relationMap, setArgs, filterArgs, fieldName, typeName, single, requireWhere, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     set: {
       type: new import_graphql7.GraphQLNonNull(setArgs)
@@ -3819,47 +4159,48 @@ var generateUpdate2 = (db, tableName, table, tables, relationMap, setArgs, filte
   };
   const pkNames = pgPrimaryKeyPropNames(table);
   return {
-    name: fieldName,
-    resolver: async (_source, args, context, info) => {
-      try {
-        const { where, set } = args;
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+    name: fieldName,
+    resolver: async (_source, args, context, info) => {
+      try {
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where, set } = args;
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const input = remapFromGraphQLSingleInput(set, table);
+          if (!Object.keys(input).length) {
+            throw new import_graphql7.GraphQLError("Unable to update with no values specified!");
+          }
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.update(table).set(input);
+          if (filters) {
+            query = query.where(filters);
+          }
+          query = query.returning(columns);
+          const result = await query;
+          if (single && result.length > 1) {
+            throw new import_graphql7.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
+          }
+          if (single && !result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const input = remapFromGraphQLSingleInput(set, table);
-        if (!Object.keys(input).length) {
-          throw new import_graphql7.GraphQLError("Unable to update with no values specified!");
-        }
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.update(table).set(input);
-        if (filters) {
-          query = query.where(filters);
-        }
-        query = query.returning(columns);
-        const result = await query;
-        if (single && result.length > 1) {
-          throw new import_graphql7.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
-        }
-        if (single && !result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3867,7 +4208,7 @@ var generateUpdate2 = (db, tableName, table, tables, relationMap, setArgs, filte
     args: queryArgs
   };
 };
-var generateUpdateMany2 = (db, tableName, table, tables, relationMap, updateManyInput, fieldName, typeName, typeNameMapper, filterCtx) => {
+var generateUpdateMany2 = (db, tableName, table, tables, relationMap, updateManyInput, fieldName, typeName, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     updates: {
       type: new import_graphql7.GraphQLNonNull(new import_graphql7.GraphQLList(new import_graphql7.GraphQLNonNull(updateManyInput)))
@@ -3878,60 +4219,61 @@ var generateUpdateMany2 = (db, tableName, table, tables, relationMap, updateMany
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const { updates } = args;
-        if (!updates.length) {
-          throw new import_graphql7.GraphQLError("No updates were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
-        });
-        const entries = updates.map(({ where, set }) => {
-          const input = remapFromGraphQLSingleInput(set, table);
-          if (!Object.keys(input).length) {
-            throw new import_graphql7.GraphQLError("Unable to update with no values specified!");
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { updates } = args;
+          if (!updates.length) {
+            throw new import_graphql7.GraphQLError("No updates were provided!");
           }
-          return {
-            set: input,
-            filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
-          };
-        });
-        const executor = resolveExecutor(db, context);
-        const perEntry = await executor.transaction(async (tx) => {
-          const results = [];
-          for (const entry of entries) {
-            let query = tx.update(table).set(entry.set);
-            if (entry.filters) {
-              query = query.where(entry.filters);
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const entries = updates.map(({ where, set }) => {
+            const input = remapFromGraphQLSingleInput(set, table);
+            if (!Object.keys(input).length) {
+              throw new import_graphql7.GraphQLError("Unable to update with no values specified!");
+            }
+            return {
+              set: input,
+              filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
+            };
+          });
+          const perEntry = await executor.transaction(async (tx) => {
+            const results = [];
+            for (const entry of entries) {
+              let query = tx.update(table).set(entry.set);
+              if (entry.filters) {
+                query = query.where(entry.filters);
+              }
+              results.push(await query.returning(columns));
+            }
+            return results;
+          });
+          const flatRows = perEntry.flat();
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, flatRows, pkNames, withParams) : flatRows;
+          const output = [];
+          let offset = 0;
+          for (const rows of perEntry) {
+            if (!rows.length) {
+              output.push(null);
+              continue;
+            }
+            for (let i = 0; i < rows.length; i++) {
+              output.push(remapToGraphQLSingleOutput(enriched[offset + i], tableName, table, relationMap));
             }
-            results.push(await query.returning(columns));
+            offset += rows.length;
           }
-          return results;
+          return output;
         });
-        const flatRows = perEntry.flat();
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, flatRows, pkNames, withParams) : flatRows;
-        const output = [];
-        let offset = 0;
-        for (const rows of perEntry) {
-          if (!rows.length) {
-            output.push(null);
-            continue;
-          }
-          for (let i = 0; i < rows.length; i++) {
-            output.push(remapToGraphQLSingleOutput(enriched[offset + i], tableName, table, relationMap));
-          }
-          offset += rows.length;
-        }
-        return output;
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -3939,7 +4281,7 @@ var generateUpdateMany2 = (db, tableName, table, tables, relationMap, updateMany
     args: queryArgs
   };
 };
-var generateDelete2 = (db, tableName, table, filterArgs, fieldName, typeName, single, requireWhere, filterCtx, selectionCtx) => {
+var generateDelete2 = (db, tableName, table, filterArgs, fieldName, typeName, single, requireWhere, filterCtx, selectionCtx, txCtx) => {
   const queryArgs = {
     where: {
       type: single || requireWhere ? new import_graphql7.GraphQLNonNull(filterArgs) : filterArgs
@@ -3949,34 +4291,35 @@ var generateDelete2 = (db, tableName, table, filterArgs, fieldName, typeName, si
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const { where } = args;
-        const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
-          deep: true
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where } = args;
+          const parsedInfo = (0, import_graphql_parse_resolve_info3.parseResolveInfo)(info, {
+            deep: true
+          });
+          const columns = extractSelectedColumnsFromTreeSQLFormat(
+            parsedInfo.fieldsByTypeName[typeName],
+            table,
+            selectionCtx
+          );
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.delete(table);
+          if (filters) {
+            query = query.where(filters);
+          }
+          query = query.returning(columns);
+          const result = await query;
+          if (single && result.length > 1) {
+            throw new import_graphql7.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
+          }
+          if (single) {
+            return result[0] ? remapToGraphQLSingleOutput(result[0], tableName, table) : void 0;
+          }
+          return remapToGraphQLArrayOutput(result, tableName, table);
         });
-        const columns = extractSelectedColumnsFromTreeSQLFormat(
-          parsedInfo.fieldsByTypeName[typeName],
-          table,
-          selectionCtx
-        );
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.delete(table);
-        if (filters) {
-          query = query.where(filters);
-        }
-        query = query.returning(columns);
-        const result = await query;
-        if (single && result.length > 1) {
-          throw new import_graphql7.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
-        }
-        if (single) {
-          return result[0] ? remapToGraphQLSingleOutput(result[0], tableName, table) : void 0;
-        }
-        return remapToGraphQLArrayOutput(result, tableName, table);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4003,6 +4346,7 @@ function generateSchemaData2(db, schema, relations, options) {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, pgPrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -4014,6 +4358,8 @@ function generateSchemaData2(db, schema, relations, options) {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -4023,6 +4369,7 @@ function generateSchemaData2(db, schema, relations, options) {
   const relationAggregateFactory = features.relationAggregates ? createRelationAggregateFactory(db, tables, cacheCtx, typeNameMapper, filterCtx) : void 0;
   const queries = {};
   const mutations = {};
+  const mutationTxCtx = createMutationTxCtx(options.transactions);
   const gqlSchemaTypes = Object.fromEntries(
     Object.entries(tables).map(([tableName, _table]) => [
       tableName,
@@ -4097,7 +4444,8 @@ function generateSchemaData2(db, schema, relations, options) {
       createArrayFieldName,
       typeName,
       typeNameMapper,
-      conflictDoNothing
+      conflictDoNothing,
+      mutationTxCtx
     ) : void 0;
     const insertSingleGenerated = features.insert ? generateInsertSingle2(
       db,
@@ -4109,7 +4457,8 @@ function generateSchemaData2(db, schema, relations, options) {
       createSingleFieldName,
       typeName,
       typeNameMapper,
-      conflictDoNothing
+      conflictDoNothing,
+      mutationTxCtx
     ) : void 0;
     const uniqueSets = features.upsert ? getUniqueColumnSets(schema[tableName], import_pg_core2.getTableConfig) : [];
     const onConflictInput = features.upsert ? generateOnConflictInput({
@@ -4132,7 +4481,8 @@ function generateSchemaData2(db, schema, relations, options) {
       typeName,
       false,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const upsertSingleGenerated = onConflictInput ? generateUpsert2(
       db,
@@ -4147,7 +4497,8 @@ function generateSchemaData2(db, schema, relations, options) {
       typeName,
       true,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateGenerated = features.update ? generateUpdate2(
       db,
@@ -4162,7 +4513,8 @@ function generateSchemaData2(db, schema, relations, options) {
       false,
       features.requireWhere,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateSingleGenerated = features.update ? generateUpdate2(
       db,
@@ -4177,7 +4529,8 @@ function generateSchemaData2(db, schema, relations, options) {
       true,
       features.requireWhere,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateManyInput = features.update && features.updateMany ? generateUpdateManyInput({ typeName, updatePrefix: prefixes.update, updateInput, tableFilters }) : void 0;
     const updateManyGenerated = updateManyInput ? generateUpdateMany2(
@@ -4190,7 +4543,8 @@ function generateSchemaData2(db, schema, relations, options) {
       updateManyFieldName,
       typeName,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const deleteGenerated = features.delete ? generateDelete2(
       db,
@@ -4202,7 +4556,8 @@ function generateSchemaData2(db, schema, relations, options) {
       false,
       features.requireWhere,
       filterCtx,
-      { tableName, relationMap: namedRelations, tables }
+      { tableName, relationMap: namedRelations, tables },
+      mutationTxCtx
     ) : void 0;
     const deleteSingleGenerated = features.delete ? generateDelete2(
       db,
@@ -4214,7 +4569,8 @@ function generateSchemaData2(db, schema, relations, options) {
       true,
       features.requireWhere,
       filterCtx,
-      { tableName, relationMap: namedRelations, tables }
+      { tableName, relationMap: namedRelations, tables },
+      mutationTxCtx
     ) : void 0;
     const aggregateType = features.aggregates ? generateAggregateTypes(schema[tableName], tableName, typeName, cacheCtx) : void 0;
     const aggregateGenerated = features.aggregates ? generateAggregate(
@@ -4353,6 +4709,11 @@ function generateSchemaData2(db, schema, relations, options) {
       inputs[havingInput.name] = havingInput;
     }
   }
+  if (mutationTxCtx) {
+    for (const name of Object.keys(mutations)) {
+      mutationTxCtx.fieldNames.add(name);
+    }
+  }
   const fieldResolvers = {};
   for (const [tableName, tableRelations] of Object.entries(namedRelations)) {
     const relResolvers = {};
@@ -4458,7 +4819,7 @@ var generateSelectSingle3 = (db, tableName, tables, relationMap, orderArgs, filt
   };
 };
 var sqlitePrimaryKeyPropNames = (table) => getPrimaryKeyPropNamesFromConfig(table, import_sqlite_core2.getTableConfig);
-var generateInsertArray3 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false) => {
+var generateInsertArray3 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql8.GraphQLNonNull(new import_graphql8.GraphQLList(new import_graphql8.GraphQLNonNull(baseType)))
@@ -4469,31 +4830,32 @@ var generateInsertArray3 = (db, tableName, table, tables, relationMap, baseType,
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql8.GraphQLError("No values were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql8.GraphQLError("No values were provided!");
+          }
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          if (conflictDoNothing) {
+            query = query.onConflictDoNothing();
+          }
+          const result = await query;
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        if (conflictDoNothing) {
-          query = query.onConflictDoNothing();
-        }
-        const result = await query;
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4501,7 +4863,7 @@ var generateInsertArray3 = (db, tableName, table, tables, relationMap, baseType,
     args: queryArgs
   };
 };
-var generateInsertSingle3 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false) => {
+var generateInsertSingle3 = (db, tableName, table, tables, relationMap, baseType, fieldName, typeName, typeNameMapper, conflictDoNothing = false, txCtx) => {
   const queryArgs = {
     values: {
       type: new import_graphql8.GraphQLNonNull(baseType)
@@ -4512,31 +4874,32 @@ var generateInsertSingle3 = (db, tableName, table, tables, relationMap, baseType
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = remapFromGraphQLSingleInput(args.values, table);
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = remapFromGraphQLSingleInput(args.values, table);
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          if (conflictDoNothing) {
+            query = query.onConflictDoNothing();
+          }
+          const result = await query;
+          if (!result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        if (conflictDoNothing) {
-          query = query.onConflictDoNothing();
-        }
-        const result = await query;
-        if (!result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4544,7 +4907,7 @@ var generateInsertSingle3 = (db, tableName, table, tables, relationMap, baseType
     args: queryArgs
   };
 };
-var generateUpsert3 = (db, tableName, table, tables, relationMap, baseType, onConflictType, uniqueSets, fieldName, typeName, single, typeNameMapper, filterCtx) => {
+var generateUpsert3 = (db, tableName, table, tables, relationMap, baseType, onConflictType, uniqueSets, fieldName, typeName, single, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     values: {
       type: single ? new import_graphql8.GraphQLNonNull(baseType) : new import_graphql8.GraphQLNonNull(new import_graphql8.GraphQLList(new import_graphql8.GraphQLNonNull(baseType)))
@@ -4559,40 +4922,41 @@ var generateUpsert3 = (db, tableName, table, tables, relationMap, baseType, onCo
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
-        if (!input.length) {
-          throw new import_graphql8.GraphQLError("No values were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, { deep: true });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
-        });
-        const plan = resolveConflictPlan({
-          table,
-          values: input,
-          onConflict: args.onConflict,
-          pkNames,
-          uniqueSets,
-          excludedRef: excludedColumnRef,
-          withTarget: true,
-          buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName))
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const input = single ? [remapFromGraphQLSingleInput(args.values, table)] : remapFromGraphQLArrayInput(args.values, table);
+          if (!input.length) {
+            throw new import_graphql8.GraphQLError("No values were provided!");
+          }
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, { deep: true });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const plan = resolveConflictPlan({
+            table,
+            values: input,
+            onConflict: args.onConflict,
+            pkNames,
+            uniqueSets,
+            excludedRef: excludedColumnRef,
+            withTarget: true,
+            buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName))
+          });
+          let query = executor.insert(table).values(input).returning(columns);
+          query = plan.action === "NOTHING" ? query.onConflictDoNothing(plan.target ? { target: plan.target } : void 0) : query.onConflictDoUpdate({ target: plan.target, set: plan.set, setWhere: plan.setWhere });
+          const result = await query;
+          if (single && !result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const executor = resolveExecutor(db, context);
-        let query = executor.insert(table).values(input).returning(columns);
-        query = plan.action === "NOTHING" ? query.onConflictDoNothing(plan.target ? { target: plan.target } : void 0) : query.onConflictDoUpdate({ target: plan.target, set: plan.set, setWhere: plan.setWhere });
-        const result = await query;
-        if (single && !result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4600,7 +4964,7 @@ var generateUpsert3 = (db, tableName, table, tables, relationMap, baseType, onCo
     args: queryArgs
   };
 };
-var generateUpdate3 = (db, tableName, table, tables, relationMap, setArgs, filterArgs, fieldName, typeName, single, requireWhere, typeNameMapper, filterCtx) => {
+var generateUpdate3 = (db, tableName, table, tables, relationMap, setArgs, filterArgs, fieldName, typeName, single, requireWhere, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     set: {
       type: new import_graphql8.GraphQLNonNull(setArgs)
@@ -4614,44 +4978,45 @@ var generateUpdate3 = (db, tableName, table, tables, relationMap, setArgs, filte
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const { where, set } = args;
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where, set } = args;
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const input = remapFromGraphQLSingleInput(set, table);
+          if (!Object.keys(input).length) {
+            throw new import_graphql8.GraphQLError("Unable to update with no values specified!");
+          }
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.update(table).set(input);
+          if (filters) {
+            query = query.where(filters);
+          }
+          query = query.returning(columns);
+          const result = await query;
+          if (single && result.length > 1) {
+            throw new import_graphql8.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
+          }
+          if (single && !result[0]) {
+            return void 0;
+          }
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
+          return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
         });
-        const input = remapFromGraphQLSingleInput(set, table);
-        if (!Object.keys(input).length) {
-          throw new import_graphql8.GraphQLError("Unable to update with no values specified!");
-        }
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.update(table).set(input);
-        if (filters) {
-          query = query.where(filters);
-        }
-        query = query.returning(columns);
-        const result = await query;
-        if (single && result.length > 1) {
-          throw new import_graphql8.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
-        }
-        if (single && !result[0]) {
-          return void 0;
-        }
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, result, pkNames, withParams) : result;
-        return single ? remapToGraphQLSingleOutput(enriched[0], tableName, table, relationMap) : remapToGraphQLArrayOutput(enriched, tableName, table, relationMap);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4659,7 +5024,7 @@ var generateUpdate3 = (db, tableName, table, tables, relationMap, setArgs, filte
     args: queryArgs
   };
 };
-var generateUpdateMany3 = (db, tableName, table, tables, relationMap, updateManyInput, fieldName, typeName, typeNameMapper, filterCtx) => {
+var generateUpdateMany3 = (db, tableName, table, tables, relationMap, updateManyInput, fieldName, typeName, typeNameMapper, filterCtx, txCtx) => {
   const queryArgs = {
     updates: {
       type: new import_graphql8.GraphQLNonNull(new import_graphql8.GraphQLList(new import_graphql8.GraphQLNonNull(updateManyInput)))
@@ -4670,73 +5035,74 @@ var generateUpdateMany3 = (db, tableName, table, tables, relationMap, updateMany
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const { updates } = args;
-        if (!updates.length) {
-          throw new import_graphql8.GraphQLError("No updates were provided!");
-        }
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
-          deep: true
-        });
-        const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
-          relationMap,
-          tables,
-          tableName,
-          typeName,
-          typeNameMapper,
-          table,
-          pkNames,
-          parsedInfo
-        });
-        const entries = updates.map(({ where, set }) => {
-          const input = remapFromGraphQLSingleInput(set, table);
-          if (!Object.keys(input).length) {
-            throw new import_graphql8.GraphQLError("Unable to update with no values specified!");
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { updates } = args;
+          if (!updates.length) {
+            throw new import_graphql8.GraphQLError("No updates were provided!");
           }
-          return {
-            set: input,
-            filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
+            deep: true
+          });
+          const { columns, hasRelations, withParams } = prepareMutationRelationColumns({
+            relationMap,
+            tables,
+            tableName,
+            typeName,
+            typeNameMapper,
+            table,
+            pkNames,
+            parsedInfo
+          });
+          const entries = updates.map(({ where, set }) => {
+            const input = remapFromGraphQLSingleInput(set, table);
+            if (!Object.keys(input).length) {
+              throw new import_graphql8.GraphQLError("Unable to update with no values specified!");
+            }
+            return {
+              set: input,
+              filters: where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0
+            };
+          });
+          const runEntry = (tx, entry) => {
+            let query = tx.update(table).set(entry.set);
+            if (entry.filters) {
+              query = query.where(entry.filters);
+            }
+            return query.returning(columns).all();
           };
-        });
-        const runEntry = (tx, entry) => {
-          let query = tx.update(table).set(entry.set);
-          if (entry.filters) {
-            query = query.where(entry.filters);
-          }
-          return query.returning(columns).all();
-        };
-        const executor = resolveExecutor(db, context);
-        const perEntry = await executor.transaction((tx) => {
-          const first = runEntry(tx, entries[0]);
-          if (typeof first?.then === "function") {
-            return (async () => {
-              const results2 = [await first];
-              for (let i = 1; i < entries.length; i++) {
-                results2.push(await runEntry(tx, entries[i]));
-              }
-              return results2;
-            })();
-          }
-          const results = [first];
-          for (let i = 1; i < entries.length; i++) {
-            results.push(runEntry(tx, entries[i]));
+          const perEntry = await executor.transaction((tx) => {
+            const first = runEntry(tx, entries[0]);
+            if (typeof first?.then === "function") {
+              return (async () => {
+                const results2 = [await first];
+                for (let i = 1; i < entries.length; i++) {
+                  results2.push(await runEntry(tx, entries[i]));
+                }
+                return results2;
+              })();
+            }
+            const results = [first];
+            for (let i = 1; i < entries.length; i++) {
+              results.push(runEntry(tx, entries[i]));
+            }
+            return results;
+          });
+          const flatRows = perEntry.flat();
+          const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, flatRows, pkNames, withParams) : flatRows;
+          const output = [];
+          let offset = 0;
+          for (const rows of perEntry) {
+            if (!rows.length) {
+              output.push(null);
+              continue;
+            }
+            for (let i = 0; i < rows.length; i++) {
+              output.push(remapToGraphQLSingleOutput(enriched[offset + i], tableName, table, relationMap));
+            }
+            offset += rows.length;
           }
-          return results;
+          return output;
         });
-        const flatRows = perEntry.flat();
-        const enriched = hasRelations ? await eagerLoadMutationRelations(executor, tableName, flatRows, pkNames, withParams) : flatRows;
-        const output = [];
-        let offset = 0;
-        for (const rows of perEntry) {
-          if (!rows.length) {
-            output.push(null);
-            continue;
-          }
-          for (let i = 0; i < rows.length; i++) {
-            output.push(remapToGraphQLSingleOutput(enriched[offset + i], tableName, table, relationMap));
-          }
-          offset += rows.length;
-        }
-        return output;
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4744,7 +5110,7 @@ var generateUpdateMany3 = (db, tableName, table, tables, relationMap, updateMany
     args: queryArgs
   };
 };
-var generateDelete3 = (db, tableName, table, filterArgs, fieldName, typeName, single, requireWhere, filterCtx, selectionCtx) => {
+var generateDelete3 = (db, tableName, table, filterArgs, fieldName, typeName, single, requireWhere, filterCtx, selectionCtx, txCtx) => {
   const queryArgs = {
     where: {
       type: single || requireWhere ? new import_graphql8.GraphQLNonNull(filterArgs) : filterArgs
@@ -4754,34 +5120,35 @@ var generateDelete3 = (db, tableName, table, filterArgs, fieldName, typeName, si
     name: fieldName,
     resolver: async (_source, args, context, info) => {
       try {
-        const { where } = args;
-        const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
-          deep: true
+        return await runMutation(db, context, info, txCtx, async (executor) => {
+          const { where } = args;
+          const parsedInfo = (0, import_graphql_parse_resolve_info4.parseResolveInfo)(info, {
+            deep: true
+          });
+          const columns = extractSelectedColumnsFromTreeSQLFormat(
+            parsedInfo.fieldsByTypeName[typeName],
+            table,
+            selectionCtx
+          );
+          const relationCtx = relationFilterCtx(filterCtx, tableName);
+          const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
+          if (single) {
+            await assertSingleMatch(executor, table, filters, fieldName);
+          }
+          let query = executor.delete(table);
+          if (filters) {
+            query = query.where(filters);
+          }
+          query = query.returning(columns);
+          const result = await query;
+          if (single && result.length > 1) {
+            throw new import_graphql8.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
+          }
+          if (single) {
+            return result[0] ? remapToGraphQLSingleOutput(result[0], tableName, table) : void 0;
+          }
+          return remapToGraphQLArrayOutput(result, tableName, table);
         });
-        const columns = extractSelectedColumnsFromTreeSQLFormat(
-          parsedInfo.fieldsByTypeName[typeName],
-          table,
-          selectionCtx
-        );
-        const relationCtx = relationFilterCtx(filterCtx, tableName);
-        const filters = single || requireWhere ? extractRequiredFilters(table, tableName, where, fieldName, relationCtx) : where ? extractFilters(table, tableName, where, relationCtx) : void 0;
-        const executor = resolveExecutor(db, context);
-        if (single) {
-          await assertSingleMatch(executor, table, filters, fieldName);
-        }
-        let query = executor.delete(table);
-        if (filters) {
-          query = query.where(filters);
-        }
-        query = query.returning(columns);
-        const result = await query;
-        if (single && result.length > 1) {
-          throw new import_graphql8.GraphQLError(`${fieldName}: 'where' matched more than one row!`);
-        }
-        if (single) {
-          return result[0] ? remapToGraphQLSingleOutput(result[0], tableName, table) : void 0;
-        }
-        return remapToGraphQLArrayOutput(result, tableName, table);
       } catch (e) {
         throw toGraphQLError(e);
       }
@@ -4809,6 +5176,7 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       "Drizzle-GraphQL Error: No tables detected in Drizzle-ORM's database instance. Did you forget to pass schema to drizzle constructor?"
     );
   }
+  registerScalarOverrides(tables, options);
   const namedRelations = buildNamedRelations(relations ?? {}, tableEntries);
   attachTargetPrimaryKeys(namedRelations, tables, sqlitePrimaryKeyPropNames);
   const eagerRelations = pruneNonEagerRelations(namedRelations, shouldEagerLoad);
@@ -4820,6 +5188,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
     relationFieldContainers: /* @__PURE__ */ new Map(),
     fullyBuiltTables: /* @__PURE__ */ new Set(),
     relationTypeCache: /* @__PURE__ */ new Map(),
+    selectFieldCache: /* @__PURE__ */ new WeakMap(),
+    filterFieldCache: /* @__PURE__ */ new WeakMap(),
     orderTypeCache: /* @__PURE__ */ new WeakMap(),
     filterTypeCache: /* @__PURE__ */ new WeakMap(),
     listRelationFilterCache: /* @__PURE__ */ new Map(),
@@ -4829,6 +5199,12 @@ var generateSchemaData3 = (db, schema, relations, options) => {
   const relationAggregateFactory = features.relationAggregates ? createRelationAggregateFactory(db, tables, cacheCtx, typeNameMapper, filterCtx) : void 0;
   const queries = {};
   const mutations = {};
+  if (options.transactions && db.resultKind === "sync") {
+    throw new Error(
+      "Drizzle-GraphQL Error: transactions: 'auto' requires an asynchronous SQLite driver (e.g. libsql). Synchronous drivers cannot hold a transaction open across resolvers."
+    );
+  }
+  const mutationTxCtx = createMutationTxCtx(options.transactions);
   const gqlSchemaTypes = Object.fromEntries(
     Object.entries(tables).map(([tableName, _table]) => [
       tableName,
@@ -4903,7 +5279,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       createArrayFieldName,
       typeName,
       typeNameMapper,
-      conflictDoNothing
+      conflictDoNothing,
+      mutationTxCtx
     ) : void 0;
     const insertSingleGenerated = features.insert ? generateInsertSingle3(
       db,
@@ -4915,7 +5292,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       createSingleFieldName,
       typeName,
       typeNameMapper,
-      conflictDoNothing
+      conflictDoNothing,
+      mutationTxCtx
     ) : void 0;
     const uniqueSets = features.upsert ? getUniqueColumnSets(schema[tableName], import_sqlite_core2.getTableConfig) : [];
     const onConflictInput = features.upsert ? generateOnConflictInput({
@@ -4938,7 +5316,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       typeName,
       false,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const upsertSingleGenerated = onConflictInput ? generateUpsert3(
       db,
@@ -4953,7 +5332,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       typeName,
       true,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateGenerated = features.update ? generateUpdate3(
       db,
@@ -4968,7 +5348,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       false,
       features.requireWhere,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateSingleGenerated = features.update ? generateUpdate3(
       db,
@@ -4983,7 +5364,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       true,
       features.requireWhere,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const updateManyInput = features.update && features.updateMany ? generateUpdateManyInput({ typeName, updatePrefix: prefixes.update, updateInput, tableFilters }) : void 0;
     const updateManyGenerated = updateManyInput ? generateUpdateMany3(
@@ -4996,7 +5378,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       updateManyFieldName,
       typeName,
       typeNameMapper,
-      filterCtx
+      filterCtx,
+      mutationTxCtx
     ) : void 0;
     const deleteGenerated = features.delete ? generateDelete3(
       db,
@@ -5008,7 +5391,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       false,
       features.requireWhere,
       filterCtx,
-      { tableName, relationMap: namedRelations, tables }
+      { tableName, relationMap: namedRelations, tables },
+      mutationTxCtx
     ) : void 0;
     const deleteSingleGenerated = features.delete ? generateDelete3(
       db,
@@ -5020,7 +5404,8 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       true,
       features.requireWhere,
       filterCtx,
-      { tableName, relationMap: namedRelations, tables }
+      { tableName, relationMap: namedRelations, tables },
+      mutationTxCtx
     ) : void 0;
     const aggregateType = features.aggregates ? generateAggregateTypes(schema[tableName], tableName, typeName, cacheCtx) : void 0;
     const aggregateGenerated = features.aggregates ? generateAggregate(
@@ -5159,6 +5544,11 @@ var generateSchemaData3 = (db, schema, relations, options) => {
       inputs[havingInput.name] = havingInput;
     }
   }
+  if (mutationTxCtx) {
+    for (const name of Object.keys(mutations)) {
+      mutationTxCtx.fieldNames.add(name);
+    }
+  }
   const fieldResolvers = {};
   for (const [tableName, tableRelations] of Object.entries(namedRelations)) {
     const relResolvers = {};
@@ -5215,6 +5605,8 @@ var buildSchema = (db, config) => {
     defaultListSize: (complexityConfig === true ? void 0 : complexityConfig.defaultListSize) ?? 10,
     aggregateCost: (complexityConfig === true ? void 0 : complexityConfig.aggregateCost) ?? 10
   };
+  const transactionsOpt = config?.transactions;
+  const transactions = transactionsOpt === void 0 || transactionsOpt === "none" ? void 0 : { timeoutMs: (transactionsOpt === "auto" ? void 0 : transactionsOpt.timeoutMs) ?? 3e4 };
   const eagerOpt = config?.eagerLoadRelations;
   const shouldEagerLoad = eagerOpt === void 0 || eagerOpt === true ? () => true : eagerOpt === false ? () => false : eagerOpt;
   if (!typeNameMapper && suffixes.list === suffixes.single) {
@@ -5242,7 +5634,10 @@ var buildSchema = (db, config) => {
     typeNameMapper,
     shouldEagerLoad,
     features,
-    complexity
+    complexity,
+    scalars: config?.scalars,
+    mapColumnType: config?.mapColumnType,
+    transactions
   };
   let generatorOutput;
   if ((0, import_drizzle_orm8.is)(db, import_mysql_core3.MySqlDatabase)) {