@payloadcms/drizzle 4.0.0-internal.43ccea7 → 4.0.0-internal.44ac9c8

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  Column,\n  ColumnBaseConfig,\n  ColumnDataType,\n  DrizzleConfig,\n  ExtractTablesWithRelations,\n  Relation,\n  Relations,\n  SQL,\n  TableRelationalConfig,\n} from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { NodePgDatabase, NodePgQueryResultHKT } from 'drizzle-orm/node-postgres'\nimport type {\n  PgColumn,\n  PgTable,\n  PgTransaction,\n  Precision,\n  UpdateDeleteAction,\n} from 'drizzle-orm/pg-core'\nimport type { SQLiteColumn, SQLiteTable, SQLiteTransaction } from 'drizzle-orm/sqlite-core'\nimport type { Result } from 'drizzle-orm/sqlite-core/session'\nimport type {\n  BaseDatabaseAdapter,\n  FlattenedField,\n  MigrationData,\n  Payload,\n  PayloadRequest,\n} from 'payload'\n\nimport type { BuildQueryJoinAliases } from './queries/buildQuery.js'\n\nexport { BuildQueryJoinAliases }\n\nimport type { ResultSet } from '@libsql/client'\nimport type { DrizzleSnapshotJSON } from 'drizzle-kit/api'\nimport type { SQLiteRaw } from 'drizzle-orm/sqlite-core/query-builders/raw'\nimport type { QueryResult } from 'pg'\n\nimport type { Operators } from './queries/operatorMap.js'\n\nexport type PostgresDB = NodePgDatabase<Record<string, unknown>>\n\nexport type SQLiteDB = LibSQLDatabase<\n  Record<string, GenericRelation | GenericTable> & Record<string, unknown>\n>\n\nexport type GenericPgColumn = PgColumn<\n  ColumnBaseConfig<ColumnDataType, string>,\n  Record<string, unknown>\n>\n\nexport type GenericColumns<T> = {\n  [x: string]: T\n}\n\ntype GenericPgTable = PgTable<{\n  columns: GenericColumns<GenericPgColumn>\n  dialect: string\n  name: string\n  schema: undefined\n}>\n\ntype GenericSQLiteTable = SQLiteTable<{\n  columns: GenericColumns<SQLiteColumn>\n  dialect: string\n  name: string\n  schema: undefined\n}>\n\nexport type GenericColumn = GenericPgColumn | SQLiteColumn\n\nexport type GenericTable = GenericPgTable | GenericSQLiteTable\n\nexport type GenericRelation = Relations<string, Record<string, Relation<string>>>\n\nexport type TransactionSQLite = SQLiteTransaction<\n  'async',\n  Result<'async', unknown>,\n  Record<string, unknown>,\n  { tsName: TableRelationalConfig }\n>\nexport type TransactionPg = PgTransaction<\n  NodePgQueryResultHKT,\n  Record<string, unknown>,\n  ExtractTablesWithRelations<Record<string, unknown>>\n>\n\nexport type DrizzleTransaction = TransactionPg | TransactionSQLite\n\nexport type CountDistinct = (args: {\n  column?: PgColumn<any> | SQLiteColumn<any>\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  joins: BuildQueryJoinAliases\n  tableName: string\n  where: SQL\n}) => Promise<number>\n\nexport type DeleteWhere = (args: {\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  tableName: string\n  where: SQL\n}) => Promise<void>\n\nexport type DropDatabase = (args: { adapter: DrizzleAdapter }) => Promise<void>\n\nexport type Execute<T> = (args: {\n  db?: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  drizzle?: LibSQLDatabase | PostgresDB\n  raw?: string\n  sql?: SQL<unknown>\n}) =>\n  | Promise<QueryResult<Record<string, T>>>\n  | SQLiteRaw<Promise<{ rows: T[] }>>\n  | SQLiteRaw<ResultSet>\n\nexport type Insert = (args: {\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  onConflictDoUpdate?: unknown\n  tableName: string\n  values: Record<string, unknown> | Record<string, unknown>[]\n}) => Promise<Record<string, unknown>[]>\n\nexport type RequireDrizzleKit = () => {\n  generateDrizzleJson: (\n    args: Record<string, unknown>,\n  ) => DrizzleSnapshotJSON | Promise<DrizzleSnapshotJSON>\n  generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>\n  pushSchema: (\n    schema: Record<string, unknown>,\n    drizzle: DrizzleAdapter['drizzle'],\n    filterSchema?: string[],\n    tablesFilter?: string[],\n    extensionsFilter?: string[],\n  ) => Promise<{ apply; hasDataLoss; warnings }>\n  upSnapshot?: (snapshot: Record<string, unknown>) => DrizzleSnapshotJSON\n}\n\nexport type Migration = {\n  down: ({\n    db,\n    payload,\n    req,\n  }: {\n    db?: DrizzleTransaction | LibSQLDatabase<Record<string, never>> | PostgresDB\n    payload: Payload\n    req: PayloadRequest\n  }) => Promise<void>\n  up: ({\n    db,\n    payload,\n    req,\n  }: {\n    db?: DrizzleTransaction | LibSQLDatabase | PostgresDB\n    payload: Payload\n    req: PayloadRequest\n  }) => Promise<void>\n} & MigrationData\n\nexport type CreateJSONQueryArgs = {\n  column?: Column | string\n  operator: string\n  pathSegments: string[]\n  rawColumn?: SQL<unknown>\n  table?: string\n  treatAsArray?: string[]\n  treatRootAsArray?: boolean\n  value: boolean | number | number[] | string | string[]\n}\n\n/**\n * Abstract relation link\n */\nexport type RawRelation =\n  | {\n      fields: { name: string; table: string }[]\n      references: string[]\n      relationName?: string\n      to: string\n      type: 'one'\n    }\n  | {\n      relationName?: string\n      to: string\n      type: 'many'\n    }\n\n/**\n * Abstract SQL table that later gets converted by database specific implementation to Drizzle\n */\nexport type RawTable = {\n  columns: Record<string, RawColumn>\n  foreignKeys?: Record<string, RawForeignKey>\n  indexes?: Record<string, RawIndex>\n  name: string\n}\n\n/**\n * Abstract SQL foreign key that later gets converted by database specific implementation to Drizzle\n */\nexport type RawForeignKey = {\n  columns: string[]\n  foreignColumns: { name: string; table: string }[]\n  name: string\n  onDelete?: UpdateDeleteAction\n  onUpdate?: UpdateDeleteAction\n}\n\n/**\n * Abstract SQL index that later gets converted by database specific implementation to Drizzle\n */\nexport type RawIndex = {\n  name: string\n  on: string | string[]\n  unique?: boolean\n}\n\n/**\n * Abstract SQL column that later gets converted by database specific implementation to Drizzle\n */\nexport type BaseRawColumn = {\n  default?: any\n  name: string\n  notNull?: boolean\n  primaryKey?: boolean\n  reference?: {\n    name: string\n    onDelete: UpdateDeleteAction\n    table: string\n  }\n}\n\n/**\n * Postgres: native timestamp type\n * SQLite: text column, defaultNow achieved through strftime('%Y-%m-%dT%H:%M:%fZ', 'now'). withTimezone/precision have no any effect.\n */\nexport type TimestampRawColumn = {\n  defaultNow?: boolean\n  mode: 'date' | 'string'\n  precision: Precision\n  type: 'timestamp'\n  withTimezone?: boolean\n} & BaseRawColumn\n\n/**\n * Postgres: native UUID type and db lavel defaultRandom\n * SQLite: text type and defaultRandom in the app level\n */\nexport type UUIDRawColumn = {\n  defaultRandom?: boolean\n  /** App-side UUID v7 default (Postgres & SQLite); mutually exclusive with defaultRandom in practice */\n  defaultV7?: boolean\n  type: 'uuid'\n} & BaseRawColumn\n\n/**\n * Accepts either `locale: true` to have options from locales or `options` string array\n * Postgres: native enums\n * SQLite: text column with checks.\n */\nexport type EnumRawColumn = (\n  | {\n      enumName: string\n      options: string[]\n      type: 'enum'\n    }\n  | {\n      locale: true\n      type: 'enum'\n    }\n) &\n  BaseRawColumn\n\nexport type IntegerRawColumn = {\n  /**\n   * SQLite only.\n   * Enable [AUTOINCREMENT](https://www.sqlite.org/autoinc.html) for primary key to ensure that the same ID cannot be reused from previously deleted rows.\n   */\n  autoIncrement?: boolean\n  type: 'integer'\n} & BaseRawColumn\n\nexport type VectorRawColumn = {\n  dimensions?: number\n  type: 'vector'\n} & BaseRawColumn\n\nexport type HalfVecRawColumn = {\n  dimensions?: number\n  type: 'halfvec'\n} & BaseRawColumn\n\nexport type SparseVecRawColumn = {\n  dimensions?: number\n  type: 'sparsevec'\n} & BaseRawColumn\n\nexport type BinaryVecRawColumn = {\n  dimensions?: number\n  type: 'bit'\n} & BaseRawColumn\n\nexport type RawColumn =\n  | ({\n      type: 'boolean' | 'geometry' | 'jsonb' | 'numeric' | 'serial' | 'text' | 'varchar'\n    } & BaseRawColumn)\n  | BinaryVecRawColumn\n  | EnumRawColumn\n  | HalfVecRawColumn\n  | IntegerRawColumn\n  | SparseVecRawColumn\n  | TimestampRawColumn\n  | UUIDRawColumn\n  | VectorRawColumn\n\nexport type IDType = 'integer' | 'numeric' | 'text' | 'uuid' | 'varchar'\n\nexport type SetColumnID = (args: {\n  adapter: DrizzleAdapter\n  columns: Record<string, RawColumn>\n  fields: FlattenedField[]\n}) => IDType\n\nexport type ColumnToCodeConverter = (args: {\n  adapter: DrizzleAdapter\n  addEnum: (name: string, options: string[]) => void\n  addImport: (from: string, name: string) => void\n  circularEdges?: Set<string>\n  column: RawColumn\n  locales?: string[]\n  tableKey: string\n}) => string\n\nexport type BuildDrizzleTable<T extends DrizzleAdapter = DrizzleAdapter> = (args: {\n  adapter: T\n  locales: string[]\n  rawTable: RawTable\n}) => void\n\nexport type BlocksToJsonBlockToMigrate = {\n  data: Record<string, unknown> | Record<string, unknown>[]\n  fieldAccessor: (number | string)[]\n}\n\nexport interface BaseBlocksToJsonEntityToMigrate {\n  blocks: BlocksToJsonBlockToMigrate[]\n  originalData: Record<string, any>\n}\n\nexport interface CollectionOrVersionBlocksToJsonEntityToMigrate\n  extends BaseBlocksToJsonEntityToMigrate {\n  id: number | string\n  slug: string\n  type: 'collection' | 'collectionVersion' | 'globalVersion'\n}\n\nexport interface GlobalBlocksToJsonEntityToMigrate extends BaseBlocksToJsonEntityToMigrate {\n  slug: string\n  type: 'global'\n}\n\nexport type BlocksToJsonEntityToMigrate =\n  | CollectionOrVersionBlocksToJsonEntityToMigrate\n  | GlobalBlocksToJsonEntityToMigrate\n\nexport interface BlocksToJsonMigrator {\n  collectAndSaveEntitiesToBatches(\n    req: PayloadRequest,\n    options?: {\n      batchSize?: number\n    },\n  ): Promise<void>\n  getMigrationStatements(): Promise<{\n    statements: string\n    writeDrizzleSnapshot(filePath: string): void\n  }>\n  migrateEntitiesFromTempFolder(\n    req: PayloadRequest,\n    options?: {\n      clearBatches?: boolean\n    },\n  ): Promise<void>\n  setTempFolder(tempFolderPath: string): void\n  updatePayloadConfigFile(): Promise<void>\n}\n\nexport interface DrizzleAdapter extends BaseDatabaseAdapter {\n  blocksAsJSON?: boolean\n  blocksToJsonMigrator?: BlocksToJsonMigrator\n  convertPathToJSONTraversal?: (incomingSegments: string[]) => string\n  countDistinct: CountDistinct\n  createJSONQuery: (args: CreateJSONQueryArgs) => string\n  defaultDrizzleSnapshot: Record<string, unknown>\n  deleteWhere: DeleteWhere\n  drizzle: LibSQLDatabase | PostgresDB\n  dropDatabase: DropDatabase\n  enums?: never | Record<string, unknown>\n  execute: Execute<unknown>\n  features: {\n    json?: boolean\n  }\n  /**\n   * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n   * Used for returning properly formed errors from unique fields\n   */\n  fieldConstraints: Record<string, Record<string, string>>\n\n  foreignKeys: Set<string>\n  idType: 'serial' | 'uuid' | 'uuidv7'\n  indexes: Set<string>\n  initializing: Promise<void>\n  insert: Insert\n  /**\n   * Timestamp (ms) of the last write operation. When read replicas are configured,\n   * reads within `readReplicasAfterWriteInterval` ms of this timestamp are routed to the\n   * primary to guarantee read-after-write consistency.\n   */\n  lastWriteTimestamp?: number\n  limitedBoundParameters?: boolean\n  localesSuffix?: string\n  logger: DrizzleConfig['logger']\n  operators: Operators\n  /**\n   * When read replicas are configured, holds the unwrapped primary drizzle instance\n   * (before withReplicas wrapping). Used for reads that are part of write operations\n   * to avoid replication lag.\n   */\n  primaryDrizzle?: PostgresDB\n  push: boolean\n  rawRelations: Record<string, Record<string, RawRelation>>\n  rawTables: Record<string, RawTable>\n  /**\n   * How long (ms) after a write to route reads to the primary instead of a\n   * read replica. Avoids stale reads caused by replication lag.\n   * @default 2000\n   */\n  readReplicasAfterWriteInterval: number\n\n  rejectInitializing: () => void\n  relations: Record<string, GenericRelation>\n  relationshipsSuffix?: string\n  requireDrizzleKit: RequireDrizzleKit\n  resolveInitializing: () => void\n\n  schema: Record<string, unknown>\n\n  schemaName?: string\n  sessions: {\n    [id: string]: {\n      db: DrizzleTransaction\n      reject: () => Promise<void>\n      resolve: () => Promise<void>\n    }\n  }\n  tableNameMap: Map<string, string>\n  tables: Record<string, any>\n  transactionOptions: unknown\n  versionsSuffix?: string\n}\n\nexport type RelationMap = Map<\n  string,\n  {\n    localized: boolean\n    relationName?: string\n    target: string\n    type: 'many' | 'one'\n  }\n>\n"],"names":[],"mappings":"AA4cA,WAQC"}
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type {\n  Column,\n  ColumnBaseConfig,\n  ColumnDataType,\n  DrizzleConfig,\n  ExtractTablesWithRelations,\n  Relation,\n  Relations,\n  SQL,\n  TableRelationalConfig,\n} from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { NodePgDatabase, NodePgQueryResultHKT } from 'drizzle-orm/node-postgres'\nimport type {\n  PgColumn,\n  PgTable,\n  PgTransaction,\n  Precision,\n  UpdateDeleteAction,\n} from 'drizzle-orm/pg-core'\nimport type { SQLiteColumn, SQLiteTable, SQLiteTransaction } from 'drizzle-orm/sqlite-core'\nimport type { Result } from 'drizzle-orm/sqlite-core/session'\nimport type {\n  BaseDatabaseAdapter,\n  FlattenedField,\n  MigrationData,\n  Operator,\n  Payload,\n  PayloadRequest,\n} from 'payload'\n\nimport type { BuildQueryJoinAliases } from './queries/buildQuery.js'\n\nexport { BuildQueryJoinAliases }\n\nimport type { ResultSet } from '@libsql/client'\nimport type { DrizzleSnapshotJSON } from 'drizzle-kit/api'\nimport type { SQLiteRaw } from 'drizzle-orm/sqlite-core/query-builders/raw'\nimport type { QueryResult } from 'pg'\n\nimport type { DrizzleResolvedOperator, Operators } from './queries/operatorMap.js'\n\nexport type PostgresDB = NodePgDatabase<Record<string, unknown>>\n\nexport type SQLiteDB = LibSQLDatabase<\n  Record<string, GenericRelation | GenericTable> & Record<string, unknown>\n>\n\nexport type GenericPgColumn = PgColumn<\n  ColumnBaseConfig<ColumnDataType, string>,\n  Record<string, unknown>\n>\n\nexport type GenericColumns<T> = {\n  [x: string]: T\n}\n\ntype GenericPgTable = PgTable<{\n  columns: GenericColumns<GenericPgColumn>\n  dialect: string\n  name: string\n  schema: undefined\n}>\n\ntype GenericSQLiteTable = SQLiteTable<{\n  columns: GenericColumns<SQLiteColumn>\n  dialect: string\n  name: string\n  schema: undefined\n}>\n\nexport type GenericColumn = GenericPgColumn | SQLiteColumn\n\nexport type GenericTable = GenericPgTable | GenericSQLiteTable\n\nexport type GenericRelation = Relations<string, Record<string, Relation<string>>>\n\nexport type TransactionSQLite = SQLiteTransaction<\n  'async',\n  Result<'async', unknown>,\n  Record<string, unknown>,\n  { tsName: TableRelationalConfig }\n>\nexport type TransactionPg = PgTransaction<\n  NodePgQueryResultHKT,\n  Record<string, unknown>,\n  ExtractTablesWithRelations<Record<string, unknown>>\n>\n\nexport type DrizzleTransaction = TransactionPg | TransactionSQLite\n\nexport type CountDistinct = (args: {\n  column?: PgColumn<any> | SQLiteColumn<any>\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  joins: BuildQueryJoinAliases\n  tableName: string\n  where: SQL\n}) => Promise<number>\n\nexport type DeleteWhere = (args: {\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  tableName: string\n  where: SQL\n}) => Promise<void>\n\nexport type DropDatabase = (args: { adapter: DrizzleAdapter }) => Promise<void>\n\nexport type Execute<T> = (args: {\n  db?: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  drizzle?: LibSQLDatabase | PostgresDB\n  raw?: string\n  sql?: SQL<unknown>\n}) =>\n  | Promise<QueryResult<Record<string, T>>>\n  | SQLiteRaw<Promise<{ rows: T[] }>>\n  | SQLiteRaw<ResultSet>\n\nexport type Insert = (args: {\n  db: DrizzleTransaction | LibSQLDatabase | PostgresDB\n  onConflictDoUpdate?: unknown\n  tableName: string\n  values: Record<string, unknown> | Record<string, unknown>[]\n}) => Promise<Record<string, unknown>[]>\n\nexport type RequireDrizzleKit = () => {\n  generateDrizzleJson: (\n    args: Record<string, unknown>,\n  ) => DrizzleSnapshotJSON | Promise<DrizzleSnapshotJSON>\n  generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>\n  pushSchema: (\n    schema: Record<string, unknown>,\n    drizzle: DrizzleAdapter['drizzle'],\n    filterSchema?: string[],\n    tablesFilter?: string[],\n    extensionsFilter?: string[],\n  ) => Promise<{ apply; hasDataLoss; warnings }>\n  upSnapshot?: (snapshot: Record<string, unknown>) => DrizzleSnapshotJSON\n}\n\nexport type Migration = {\n  down: ({\n    db,\n    payload,\n    req,\n  }: {\n    db?: DrizzleTransaction | LibSQLDatabase<Record<string, never>> | PostgresDB\n    payload: Payload\n    req: PayloadRequest\n  }) => Promise<void>\n  up: ({\n    db,\n    payload,\n    req,\n  }: {\n    db?: DrizzleTransaction | LibSQLDatabase | PostgresDB\n    payload: Payload\n    req: PayloadRequest\n  }) => Promise<void>\n} & MigrationData\n\nexport type CreateJSONQueryArgs = {\n  column?: Column | string\n  operator: string\n  pathSegments: string[]\n  rawColumn?: SQL<unknown>\n  table?: string\n  treatAsArray?: string[]\n  treatRootAsArray?: boolean\n  value: boolean | number | number[] | string | string[]\n}\n\n/**\n * Abstract relation link\n */\nexport type RawRelation =\n  | {\n      fields: { name: string; table: string }[]\n      references: string[]\n      relationName?: string\n      to: string\n      type: 'one'\n    }\n  | {\n      relationName?: string\n      to: string\n      type: 'many'\n    }\n\n/**\n * Abstract SQL table that later gets converted by database specific implementation to Drizzle\n */\nexport type RawTable = {\n  columns: Record<string, RawColumn>\n  foreignKeys?: Record<string, RawForeignKey>\n  indexes?: Record<string, RawIndex>\n  name: string\n}\n\n/**\n * Abstract SQL foreign key that later gets converted by database specific implementation to Drizzle\n */\nexport type RawForeignKey = {\n  columns: string[]\n  foreignColumns: { name: string; table: string }[]\n  name: string\n  onDelete?: UpdateDeleteAction\n  onUpdate?: UpdateDeleteAction\n}\n\n/**\n * Abstract SQL index that later gets converted by database specific implementation to Drizzle\n */\nexport type RawIndex = {\n  name: string\n  on: string | string[]\n  unique?: boolean\n}\n\n/**\n * Abstract SQL column that later gets converted by database specific implementation to Drizzle\n */\nexport type BaseRawColumn = {\n  default?: any\n  name: string\n  notNull?: boolean\n  primaryKey?: boolean\n  reference?: {\n    name: string\n    onDelete: UpdateDeleteAction\n    table: string\n  }\n}\n\n/**\n * Postgres: native timestamp type\n * SQLite: text column, defaultNow achieved through strftime('%Y-%m-%dT%H:%M:%fZ', 'now'). withTimezone/precision have no any effect.\n */\nexport type TimestampRawColumn = {\n  defaultNow?: boolean\n  mode: 'date' | 'string'\n  precision: Precision\n  type: 'timestamp'\n  withTimezone?: boolean\n} & BaseRawColumn\n\n/**\n * Postgres: native UUID type and db lavel defaultRandom\n * SQLite: text type and defaultRandom in the app level\n */\nexport type UUIDRawColumn = {\n  defaultRandom?: boolean\n  /** App-side UUID v7 default (Postgres & SQLite); mutually exclusive with defaultRandom in practice */\n  defaultV7?: boolean\n  type: 'uuid'\n} & BaseRawColumn\n\n/**\n * Accepts either `locale: true` to have options from locales or `options` string array\n * Postgres: native enums\n * SQLite: text column with checks.\n */\nexport type EnumRawColumn = (\n  | {\n      enumName: string\n      options: string[]\n      type: 'enum'\n    }\n  | {\n      locale: true\n      type: 'enum'\n    }\n) &\n  BaseRawColumn\n\nexport type IntegerRawColumn = {\n  /**\n   * SQLite only.\n   * Enable [AUTOINCREMENT](https://www.sqlite.org/autoinc.html) for primary key to ensure that the same ID cannot be reused from previously deleted rows.\n   */\n  autoIncrement?: boolean\n  type: 'integer'\n} & BaseRawColumn\n\nexport type VectorRawColumn = {\n  dimensions?: number\n  type: 'vector'\n} & BaseRawColumn\n\nexport type HalfVecRawColumn = {\n  dimensions?: number\n  type: 'halfvec'\n} & BaseRawColumn\n\nexport type SparseVecRawColumn = {\n  dimensions?: number\n  type: 'sparsevec'\n} & BaseRawColumn\n\nexport type BinaryVecRawColumn = {\n  dimensions?: number\n  type: 'bit'\n} & BaseRawColumn\n\nexport type RawColumn =\n  | ({\n      type: 'boolean' | 'geometry' | 'jsonb' | 'numeric' | 'serial' | 'text' | 'varchar'\n    } & BaseRawColumn)\n  | BinaryVecRawColumn\n  | EnumRawColumn\n  | HalfVecRawColumn\n  | IntegerRawColumn\n  | SparseVecRawColumn\n  | TimestampRawColumn\n  | UUIDRawColumn\n  | VectorRawColumn\n\nexport type IDType = 'integer' | 'numeric' | 'text' | 'uuid' | 'varchar'\n\nexport type SetColumnID = (args: {\n  adapter: DrizzleAdapter\n  columns: Record<string, RawColumn>\n  fields: FlattenedField[]\n}) => IDType\n\nexport type ColumnToCodeConverter = (args: {\n  adapter: DrizzleAdapter\n  addEnum: (name: string, options: string[]) => void\n  addImport: (from: string, name: string) => void\n  circularEdges?: Set<string>\n  column: RawColumn\n  locales?: string[]\n  tableKey: string\n}) => string\n\nexport type BuildDrizzleTable<T extends DrizzleAdapter = DrizzleAdapter> = (args: {\n  adapter: T\n  locales: string[]\n  rawTable: RawTable\n}) => void\n\nexport type BlocksToJsonBlockToMigrate = {\n  data: Record<string, unknown> | Record<string, unknown>[]\n  fieldAccessor: (number | string)[]\n}\n\nexport interface BaseBlocksToJsonEntityToMigrate {\n  blocks: BlocksToJsonBlockToMigrate[]\n  originalData: Record<string, any>\n}\n\nexport interface CollectionOrVersionBlocksToJsonEntityToMigrate\n  extends BaseBlocksToJsonEntityToMigrate {\n  id: number | string\n  slug: string\n  type: 'collection' | 'collectionVersion' | 'globalVersion'\n}\n\nexport interface GlobalBlocksToJsonEntityToMigrate extends BaseBlocksToJsonEntityToMigrate {\n  slug: string\n  type: 'global'\n}\n\nexport type BlocksToJsonEntityToMigrate =\n  | CollectionOrVersionBlocksToJsonEntityToMigrate\n  | GlobalBlocksToJsonEntityToMigrate\n\nexport interface BlocksToJsonMigrator {\n  collectAndSaveEntitiesToBatches(\n    req: PayloadRequest,\n    options?: {\n      batchSize?: number\n    },\n  ): Promise<void>\n  getMigrationStatements(): Promise<{\n    statements: string\n    writeDrizzleSnapshot(filePath: string): void\n  }>\n  migrateEntitiesFromTempFolder(\n    req: PayloadRequest,\n    options?: {\n      clearBatches?: boolean\n    },\n  ): Promise<void>\n  setTempFolder(tempFolderPath: string): void\n  updatePayloadConfigFile(): Promise<void>\n}\n\n/**\n * The information passed to a query-operator handler for one user-facing leaf comparison.\n */\nexport type DrizzleOperatorHandlerContext = {\n  adapter: DrizzleAdapter\n  column: Column | SQL\n  field: FlattenedField\n  locale?: string\n  /** The operator supplied by the Payload query, before any adapter conversions. */\n  originalOperator: Operator\n  path: string\n  /** The operator actually sent to the database after Payload's existing conversions. */\n  resolvedOperator: DrizzleResolvedOperator\n  storage: 'column'\n  value: unknown\n}\n\n/**\n * Transforms the column and/or value of a matching operator before the default (or replacement)\n * comparison runs. Multiple matching transform handlers compose in configuration order.\n */\nexport type DrizzleOperandTransformHandler = {\n  build?: never\n  /** Restricts the handler to these Payload field types. Omit to match every field type. */\n  fieldTypes?: FlattenedField['type'][]\n  name: string\n  operators: DrizzleResolvedOperator[]\n  transformOperands: (context: DrizzleOperatorHandlerContext) => {\n    column: Column | SQL\n    value: unknown\n  }\n}\n\n/**\n * Replaces the default comparison for a matching operator entirely. Runs after every matching\n * `transformOperands` handler has already run.\n */\nexport type DrizzleOperatorReplacementHandler = {\n  build: (context: DrizzleOperatorHandlerContext) => SQL\n  /** Restricts the handler to these Payload field types. Omit to match every field type. */\n  fieldTypes?: FlattenedField['type'][]\n  name: string\n  operators: DrizzleResolvedOperator[]\n  transformOperands?: never\n}\n\nexport type DrizzleOperatorHandler =\n  | DrizzleOperandTransformHandler\n  | DrizzleOperatorReplacementHandler\n\nexport type DrizzleQueryConfig = {\n  operatorHandlers?: DrizzleOperatorHandler[]\n}\n\nexport interface DrizzleAdapter extends BaseDatabaseAdapter {\n  blocksAsJSON?: boolean\n  blocksToJsonMigrator?: BlocksToJsonMigrator\n  convertPathToJSONTraversal?: (incomingSegments: string[]) => string\n  countDistinct: CountDistinct\n  createJSONQuery: (args: CreateJSONQueryArgs) => string\n  defaultDrizzleSnapshot: Record<string, unknown>\n  deleteWhere: DeleteWhere\n  drizzle: LibSQLDatabase | PostgresDB\n  dropDatabase: DropDatabase\n  enums?: never | Record<string, unknown>\n  execute: Execute<unknown>\n  features: {\n    json?: boolean\n  }\n  /**\n   * An object keyed on each table, with a key value pair where the constraint name is the key, followed by the dot-notation field name\n   * Used for returning properly formed errors from unique fields\n   */\n  fieldConstraints: Record<string, Record<string, string>>\n\n  foreignKeys: Set<string>\n  idType: 'serial' | 'uuid' | 'uuidv7'\n  indexes: Set<string>\n  initializing: Promise<void>\n  insert: Insert\n  /**\n   * Timestamp (ms) of the last write operation. When read replicas are configured,\n   * reads within `readReplicasAfterWriteInterval` ms of this timestamp are routed to the\n   * primary to guarantee read-after-write consistency.\n   */\n  lastWriteTimestamp?: number\n  limitedBoundParameters?: boolean\n  localesSuffix?: string\n  logger: DrizzleConfig['logger']\n  operatorHandlers: DrizzleOperatorHandler[]\n  operators: Operators\n  /**\n   * When read replicas are configured, holds the unwrapped primary drizzle instance\n   * (before withReplicas wrapping). Used for reads that are part of write operations\n   * to avoid replication lag.\n   */\n  primaryDrizzle?: PostgresDB\n  push: boolean\n  rawRelations: Record<string, Record<string, RawRelation>>\n  rawTables: Record<string, RawTable>\n  /**\n   * How long (ms) after a write to route reads to the primary instead of a\n   * read replica. Avoids stale reads caused by replication lag.\n   * @default 2000\n   */\n  readReplicasAfterWriteInterval: number\n\n  rejectInitializing: () => void\n  relations: Record<string, GenericRelation>\n  relationshipsSuffix?: string\n  requireDrizzleKit: RequireDrizzleKit\n  resolveInitializing: () => void\n\n  schema: Record<string, unknown>\n\n  schemaName?: string\n  sessions: {\n    [id: string]: {\n      db: DrizzleTransaction\n      reject: () => Promise<void>\n      resolve: () => Promise<void>\n    }\n  }\n  tableNameMap: Map<string, string>\n  tables: Record<string, any>\n  transactionOptions: unknown\n  versionsSuffix?: string\n}\n\nexport type RelationMap = Map<\n  string,\n  {\n    localized: boolean\n    relationName?: string\n    target: string\n    type: 'many' | 'one'\n  }\n>\n"],"names":[],"mappings":"AAogBA,WAQC"}

package/dist/updateJobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateJobs.d.ts","sourceRoot":"","sources":["../src/updateJobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAS,MAAM,SAAS,CAAA;AAYhD,eAAO,MAAM,UAAU,EAAE,UA2FxB,CAAA"}
+{"version":3,"file":"updateJobs.d.ts","sourceRoot":"","sources":["../src/updateJobs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAS,MAAM,SAAS,CAAA;AAsBhD,eAAO,MAAM,UAAU,EAAE,UAsIxB,CAAA"}

package/dist/updateJobs.js

@@ -1,9 +1,13 @@
+import { and, inArray, isNull, lte, or } from 'drizzle-orm';
 import toSnakeCase from 'to-snake-case';
 import { findMany } from './find/findMany.js';
+import { transformForWrite } from './transform/write/index.js';
 import { upsertRow } from './upsertRow/index.js';
 import { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js';
 import { getPrimaryDb } from './utilities/getPrimaryDb.js';
 import { getTransaction } from './utilities/getTransaction.js';
+import { markWrite } from './utilities/readAfterWrite.js';
+const isInitialJobClaim = (data)=>typeof data.processingToken === 'string' && typeof data.processingUntil === 'string' && Object.keys(data).every((field)=>field === 'processingToken' || field === 'processingUntil' || field === 'updatedAt');
 export const updateJobs = async function updateMany({ id, data, limit: limitArg, req, returning, sort: sortArg, where: whereArg }) {
     if (!data?.log?.length && !(data.log && typeof data.log === 'object' && '$push' in data.log)) {
         delete data.log;
@@ -54,6 +58,39 @@ export const updateJobs = async function updateMany({ id, data, limit: limitArg,
         return [];
     }
     const db = getPrimaryDb(this, await getTransaction(this, req));
+    if (isInitialJobClaim(data)) {
+        // Atomically claim jobs so multiple workers cannot pick up the same job.
+        // We don't need FOR UPDATE SKIP LOCKED here because of the compare-and-swap-style update using processingUntil and processingToken.
+        // The first update makes the where clause fail for other workers, so they cannot claim the same job.
+        const _db = db;
+        const table = this.tables[tableName];
+        const now = new Date().toISOString();
+        const { row } = transformForWrite({
+            adapter: this,
+            data,
+            enableAtomicWrites: true,
+            fields: collection.flattenedFields,
+            tableName
+        });
+        if (typeof row.updatedAt === 'undefined' || row.updatedAt === null) {
+            delete row.updatedAt;
+        }
+        const jobIDs = jobs.docs.map((job)=>job.id);
+        const claimedRows = await _db.update(table).set(row).where(and(inArray(table.id, jobIDs), or(isNull(table.processingUntil), lte(table.processingUntil, now)))).returning({
+            id: table.id
+        });
+        if (claimedRows.length) {
+            markWrite(this);
+        }
+        if (returning === false) {
+            return null;
+        }
+        const claimedIDs = new Set(claimedRows.map(({ id })=>id));
+        return jobs.docs.filter((job)=>claimedIDs.has(job.id)).map((job)=>({
+                ...job,
+                ...data
+            }));
+    }
     const results = [];
     // TODO: We need to batch this to reduce the amount of db calls. This can get very slow if we are updating a lot of rows.
     for (const job of jobs.docs){

package/dist/updateJobs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateJobs.ts"],"sourcesContent":["import type { UpdateJobs, Where } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const updateJobs: UpdateJobs = async function updateMany(\n  this: DrizzleAdapter,\n  { id, data, limit: limitArg, req, returning, sort: sortArg, where: whereArg },\n) {\n  if (\n    !(data?.log as object[])?.length &&\n    !(data.log && typeof data.log === 'object' && '$push' in data.log)\n  ) {\n    delete data.log\n  }\n\n  const whereToUse: Where = id ? { id: { equals: id } } : whereArg\n  const limit = id ? 1 : limitArg\n\n  const collection = this.payload.collections['payload-jobs'].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collection.defaultSort\n\n  const useOptimizedUpsertRow = shouldUseOptimizedUpsertRow({\n    data,\n    fields: collection.flattenedFields,\n  })\n\n  if (useOptimizedUpsertRow && id) {\n    const db = getPrimaryDb(this, await getTransaction(this, req))\n\n    const result = await upsertRow({\n      id,\n      adapter: this,\n      collectionSlug: 'payload-jobs',\n      data,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      operation: 'update',\n      req,\n      tableName,\n    })\n\n    return returning === false ? null : [result]\n  }\n\n  const jobs = await findMany({\n    adapter: this,\n    collectionSlug: 'payload-jobs',\n    fields: collection.flattenedFields,\n    limit: id ? 1 : limit,\n    pagination: false,\n    req,\n    sort,\n    tableName,\n    where: whereToUse,\n  })\n  if (!jobs.docs.length) {\n    return []\n  }\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  const results = []\n\n  // TODO: We need to batch this to reduce the amount of db calls. This can get very slow if we are updating a lot of rows.\n  for (const job of jobs.docs) {\n    const updateData = useOptimizedUpsertRow\n      ? data\n      : {\n          ...job,\n          ...data,\n        }\n\n    const result = await upsertRow({\n      id: job.id,\n      adapter: this,\n      collectionSlug: 'payload-jobs',\n      data: updateData,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      operation: 'update',\n      req,\n      tableName,\n    })\n\n    results.push(result)\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return results\n}\n"],"names":["toSnakeCase","findMany","upsertRow","shouldUseOptimizedUpsertRow","getPrimaryDb","getTransaction","updateJobs","updateMany","id","data","limit","limitArg","req","returning","sort","sortArg","where","whereArg","log","length","whereToUse","equals","collection","payload","collections","config","tableName","tableNameMap","get","slug","undefined","defaultSort","useOptimizedUpsertRow","fields","flattenedFields","db","result","adapter","collectionSlug","ignoreResult","operation","jobs","pagination","docs","results","job","updateData","push"],"mappings":"AAEA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,QAAQ,QAAQ,qBAAoB;AAC7C,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,2BAA2B,QAAQ,6CAA4C;AACxF,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,aAAyB,eAAeC,WAEnD,EAAEC,EAAE,EAAEC,IAAI,EAAEC,OAAOC,QAAQ,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAMC,OAAO,EAAEC,OAAOC,QAAQ,EAAE;IAE7E,IACE,CAAER,MAAMS,KAAkBC,UAC1B,CAAEV,CAAAA,KAAKS,GAAG,IAAI,OAAOT,KAAKS,GAAG,KAAK,YAAY,WAAWT,KAAKS,GAAG,AAAD,GAChE;QACA,OAAOT,KAAKS,GAAG;IACjB;IAEA,MAAME,aAAoBZ,KAAK;QAAEA,IAAI;YAAEa,QAAQb;QAAG;IAAE,IAAIS;IACxD,MAAMP,QAAQF,KAAK,IAAIG;IAEvB,MAAMW,aAAa,IAAI,CAACC,OAAO,CAACC,WAAW,CAAC,eAAe,CAACC,MAAM;IAClE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC5B,YAAYsB,WAAWO,IAAI;IACnE,MAAMf,OAAOC,YAAYe,aAAaf,YAAY,OAAOA,UAAUO,WAAWS,WAAW;IAEzF,MAAMC,wBAAwB7B,4BAA4B;QACxDM;QACAwB,QAAQX,WAAWY,eAAe;IACpC;IAEA,IAAIF,yBAAyBxB,IAAI;QAC/B,MAAM2B,KAAK/B,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEO;QAEzD,MAAMwB,SAAS,MAAMlC,UAAU;YAC7BM;YACA6B,SAAS,IAAI;YACbC,gBAAgB;YAChB7B;YACA0B;YACAF,QAAQX,WAAWY,eAAe;YAClCK,cAAc1B,cAAc;YAC5B2B,WAAW;YACX5B;YACAc;QACF;QAEA,OAAOb,cAAc,QAAQ,OAAO;YAACuB;SAAO;IAC9C;IAEA,MAAMK,OAAO,MAAMxC,SAAS;QAC1BoC,SAAS,IAAI;QACbC,gBAAgB;QAChBL,QAAQX,WAAWY,eAAe;QAClCxB,OAAOF,KAAK,IAAIE;QAChBgC,YAAY;QACZ9B;QACAE;QACAY;QACAV,OAAOI;IACT;IACA,IAAI,CAACqB,KAAKE,IAAI,CAACxB,MAAM,EAAE;QACrB,OAAO,EAAE;IACX;IAEA,MAAMgB,KAAK/B,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEO;IAEzD,MAAMgC,UAAU,EAAE;IAElB,yHAAyH;IACzH,KAAK,MAAMC,OAAOJ,KAAKE,IAAI,CAAE;QAC3B,MAAMG,aAAad,wBACfvB,OACA;YACE,GAAGoC,GAAG;YACN,GAAGpC,IAAI;QACT;QAEJ,MAAM2B,SAAS,MAAMlC,UAAU;YAC7BM,IAAIqC,IAAIrC,EAAE;YACV6B,SAAS,IAAI;YACbC,gBAAgB;YAChB7B,MAAMqC;YACNX;YACAF,QAAQX,WAAWY,eAAe;YAClCK,cAAc1B,cAAc;YAC5B2B,WAAW;YACX5B;YACAc;QACF;QAEAkB,QAAQG,IAAI,CAACX;IACf;IAEA,IAAIvB,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAO+B;AACT,EAAC"}
+{"version":3,"sources":["../src/updateJobs.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateJobs, Where } from 'payload'\n\nimport { and, inArray, isNull, lte, or } from 'drizzle-orm'\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { findMany } from './find/findMany.js'\nimport { transformForWrite } from './transform/write/index.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nconst isInitialJobClaim = (data: Record<string, unknown>): boolean =>\n  typeof data.processingToken === 'string' &&\n  typeof data.processingUntil === 'string' &&\n  Object.keys(data).every(\n    (field) => field === 'processingToken' || field === 'processingUntil' || field === 'updatedAt',\n  )\n\nexport const updateJobs: UpdateJobs = async function updateMany(\n  this: DrizzleAdapter,\n  { id, data, limit: limitArg, req, returning, sort: sortArg, where: whereArg },\n) {\n  if (\n    !(data?.log as object[])?.length &&\n    !(data.log && typeof data.log === 'object' && '$push' in data.log)\n  ) {\n    delete data.log\n  }\n\n  const whereToUse: Where = id ? { id: { equals: id } } : whereArg\n  const limit = id ? 1 : limitArg\n\n  const collection = this.payload.collections['payload-jobs'].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  const sort = sortArg !== undefined && sortArg !== null ? sortArg : collection.defaultSort\n\n  const useOptimizedUpsertRow = shouldUseOptimizedUpsertRow({\n    data,\n    fields: collection.flattenedFields,\n  })\n\n  if (useOptimizedUpsertRow && id) {\n    const db = getPrimaryDb(this, await getTransaction(this, req))\n\n    const result = await upsertRow({\n      id,\n      adapter: this,\n      collectionSlug: 'payload-jobs',\n      data,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      operation: 'update',\n      req,\n      tableName,\n    })\n\n    return returning === false ? null : [result]\n  }\n\n  const jobs = await findMany({\n    adapter: this,\n    collectionSlug: 'payload-jobs',\n    fields: collection.flattenedFields,\n    limit: id ? 1 : limit,\n    pagination: false,\n    req,\n    sort,\n    tableName,\n    where: whereToUse,\n  })\n  if (!jobs.docs.length) {\n    return []\n  }\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  if (isInitialJobClaim(data)) {\n    // Atomically claim jobs so multiple workers cannot pick up the same job.\n    // We don't need FOR UPDATE SKIP LOCKED here because of the compare-and-swap-style update using processingUntil and processingToken.\n    // The first update makes the where clause fail for other workers, so they cannot claim the same job.\n    const _db = db as LibSQLDatabase\n    const table = this.tables[tableName]\n    const now = new Date().toISOString()\n    const { row } = transformForWrite({\n      adapter: this,\n      data,\n      enableAtomicWrites: true,\n      fields: collection.flattenedFields,\n      tableName,\n    })\n\n    if (typeof row.updatedAt === 'undefined' || row.updatedAt === null) {\n      delete row.updatedAt\n    }\n\n    const jobIDs = jobs.docs.map((job) => job.id)\n    const claimedRows = await _db\n      .update(table)\n      .set(row)\n      .where(\n        and(\n          inArray(table.id, jobIDs),\n          or(isNull(table.processingUntil), lte(table.processingUntil, now)),\n        ),\n      )\n      .returning({ id: table.id })\n\n    if (claimedRows.length) {\n      markWrite(this)\n    }\n\n    if (returning === false) {\n      return null\n    }\n\n    const claimedIDs = new Set(claimedRows.map(({ id }) => id))\n    return jobs.docs.filter((job) => claimedIDs.has(job.id)).map((job) => ({ ...job, ...data }))\n  }\n\n  const results = []\n\n  // TODO: We need to batch this to reduce the amount of db calls. This can get very slow if we are updating a lot of rows.\n  for (const job of jobs.docs) {\n    const updateData = useOptimizedUpsertRow\n      ? data\n      : {\n          ...job,\n          ...data,\n        }\n\n    const result = await upsertRow({\n      id: job.id,\n      adapter: this,\n      collectionSlug: 'payload-jobs',\n      data: updateData,\n      db,\n      fields: collection.flattenedFields,\n      ignoreResult: returning === false,\n      operation: 'update',\n      req,\n      tableName,\n    })\n\n    results.push(result)\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  return results\n}\n"],"names":["and","inArray","isNull","lte","or","toSnakeCase","findMany","transformForWrite","upsertRow","shouldUseOptimizedUpsertRow","getPrimaryDb","getTransaction","markWrite","isInitialJobClaim","data","processingToken","processingUntil","Object","keys","every","field","updateJobs","updateMany","id","limit","limitArg","req","returning","sort","sortArg","where","whereArg","log","length","whereToUse","equals","collection","payload","collections","config","tableName","tableNameMap","get","slug","undefined","defaultSort","useOptimizedUpsertRow","fields","flattenedFields","db","result","adapter","collectionSlug","ignoreResult","operation","jobs","pagination","docs","_db","table","tables","now","Date","toISOString","row","enableAtomicWrites","updatedAt","jobIDs","map","job","claimedRows","update","set","claimedIDs","Set","filter","has","results","updateData","push"],"mappings":"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"}

package/dist/updateOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAYxC,eAAO,MAAM,SAAS,EAAE,SAqFvB,CAAA"}
+{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAgBxC,eAAO,MAAM,SAAS,EAAE,SAiIvB,CAAA"}

package/dist/updateOne.js

@@ -1,15 +1,20 @@
 import toSnakeCase from 'to-snake-case';
 import { buildQuery } from './queries/buildQuery.js';
 import { selectDistinct } from './queries/selectDistinct.js';
+import { transform } from './transform/read/index.js';
+import { transformForWrite } from './transform/write/index.js';
 import { upsertRow } from './upsertRow/index.js';
+import { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js';
 import { getPrimaryDb } from './utilities/getPrimaryDb.js';
 import { getTransaction } from './utilities/getTransaction.js';
+import { markWrite } from './utilities/readAfterWrite.js';
 export const updateOne = async function updateOne({ id, collection: collectionSlug, data, joins: joinQuery, locale, options = {
     upsert: false
 }, req, returning, select, where: whereArg }) {
     const collection = this.payload.collections[collectionSlug].config;
     const tableName = this.tableNameMap.get(toSnakeCase(collection.slug));
     let idToUpdate = id;
+    let whereToUpdate;
     const db = getPrimaryDb(this, await getTransaction(this, req));
     if (!idToUpdate) {
         const { joins, selectFields, where } = buildQuery({
@@ -19,6 +24,40 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
             tableName,
             where: whereArg
         });
+        // A `where` that needs joins cannot be applied to the UPDATE statement itself, so those
+        // queries keep resolving a matching id first and then update that row unconditionally
+        whereToUpdate = joins.length === 0 ? where : undefined;
+        if (options.atomic === true) {
+            if (!shouldUseOptimizedUpsertRow({
+                data,
+                fields: collection.flattenedFields
+            })) {
+                throw new Error('Atomic where updates only support fields stored on the main table');
+            }
+            const { arraysToPush, row } = transformForWrite({
+                adapter: this,
+                data,
+                enableAtomicWrites: true,
+                fields: collection.flattenedFields,
+                tableName
+            });
+            if (arraysToPush && Object.keys(arraysToPush).length) {
+                throw new Error('Atomic where updates do not support array operations');
+            }
+            markWrite(this);
+            const docs = await db.update(this.tables[tableName]).set(row).where(where).returning();
+            if (!docs[0]) {
+                return null;
+            }
+            return transform({
+                adapter: this,
+                config: this.payload.config,
+                data: docs[0],
+                fields: collection.flattenedFields,
+                joinQuery: false,
+                tableName
+            });
+        }
         // selectDistinct will only return if there are joins
         const selectDistinctResult = await selectDistinct({
             adapter: this,
@@ -58,7 +97,8 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
         operation: 'update',
         req,
         select,
-        tableName
+        tableName,
+        where: whereToUpdate
     });
     if (returning === false) {
         return null;

package/dist/updateOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateOne } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: DrizzleAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    locale,\n    options = { upsert: false },\n    req,\n    returning,\n    select,\n    where: whereArg,\n  },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  let idToUpdate = id\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  if (!idToUpdate) {\n    const { joins, selectFields, where } = buildQuery({\n      adapter: this,\n      fields: collection.flattenedFields,\n      locale,\n      tableName,\n      where: whereArg,\n    })\n\n    // selectDistinct will only return if there are joins\n    const selectDistinctResult = await selectDistinct({\n      adapter: this,\n      db,\n      joins,\n      query: ({ query }) => query.limit(1),\n      selectFields,\n      tableName,\n      where,\n    })\n\n    if (selectDistinctResult?.[0]?.id) {\n      idToUpdate = selectDistinctResult?.[0]?.id\n      // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n    } else if (whereArg && !joins.length) {\n      const table = this.tables[tableName]\n\n      const docsToUpdate = await (db as LibSQLDatabase)\n        .select({\n          id: table.id,\n        })\n        .from(table)\n        .where(where)\n        .limit(1)\n      idToUpdate = docsToUpdate?.[0]?.id\n    }\n  }\n\n  if (!idToUpdate && !options.upsert) {\n    // TODO: In 4.0, if returning === false, we should differentiate between:\n    // - No document found to update\n    // - Document found, but returning === false\n    return null\n  }\n\n  const result = await upsertRow({\n    id: idToUpdate,\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: collection.flattenedFields,\n    ignoreResult: returning === false,\n    joinQuery,\n    operation: 'update',\n    req,\n    select,\n    tableName,\n  })\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["toSnakeCase","buildQuery","selectDistinct","upsertRow","getPrimaryDb","getTransaction","updateOne","id","collection","collectionSlug","data","joins","joinQuery","locale","options","upsert","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","idToUpdate","db","selectFields","adapter","fields","flattenedFields","selectDistinctResult","query","limit","length","table","tables","docsToUpdate","from","result","ignoreResult","operation"],"mappings":"AAGA,OAAOA,iBAAiB,gBAAe;AAIvC,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,SAAS,QAAQ,uBAAsB;AAChD,SAASC,YAAY,QAAQ,8BAA6B;AAC1D,SAASC,cAAc,QAAQ,gCAA+B;AAE9D,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EACEC,EAAE,EACFC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,OAAOC,SAAS,EAChBC,MAAM,EACNC,UAAU;IAAEC,QAAQ;AAAM,CAAC,EAC3BC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,OAAOC,QAAQ,EAChB;IAED,MAAMZ,aAAa,IAAI,CAACa,OAAO,CAACC,WAAW,CAACb,eAAe,CAACc,MAAM;IAClE,MAAMC,YAAY,IAAI,CAACC,YAAY,CAACC,GAAG,CAAC1B,YAAYQ,WAAWmB,IAAI;IACnE,IAAIC,aAAarB;IAEjB,MAAMsB,KAAKzB,aAAa,IAAI,EAAE,MAAMC,eAAe,IAAI,EAAEW;IAEzD,IAAI,CAACY,YAAY;QACf,MAAM,EAAEjB,KAAK,EAAEmB,YAAY,EAAEX,KAAK,EAAE,GAAGlB,WAAW;YAChD8B,SAAS,IAAI;YACbC,QAAQxB,WAAWyB,eAAe;YAClCpB;YACAW;YACAL,OAAOC;QACT;QAEA,qDAAqD;QACrD,MAAMc,uBAAuB,MAAMhC,eAAe;YAChD6B,SAAS,IAAI;YACbF;YACAlB;YACAwB,OAAO,CAAC,EAAEA,KAAK,EAAE,GAAKA,MAAMC,KAAK,CAAC;YAClCN;YACAN;YACAL;QACF;QAEA,IAAIe,sBAAsB,CAAC,EAAE,EAAE3B,IAAI;YACjCqB,aAAaM,sBAAsB,CAAC,EAAE,EAAE3B;QACxC,gFAAgF;QAClF,OAAO,IAAIa,YAAY,CAACT,MAAM0B,MAAM,EAAE;YACpC,MAAMC,QAAQ,IAAI,CAACC,MAAM,CAACf,UAAU;YAEpC,MAAMgB,eAAe,MAAM,AAACX,GACzBX,MAAM,CAAC;gBACNX,IAAI+B,MAAM/B,EAAE;YACd,GACCkC,IAAI,CAACH,OACLnB,KAAK,CAACA,OACNiB,KAAK,CAAC;YACTR,aAAaY,cAAc,CAAC,EAAE,EAAEjC;QAClC;IACF;IAEA,IAAI,CAACqB,cAAc,CAACd,QAAQC,MAAM,EAAE;QAClC,yEAAyE;QACzE,gCAAgC;QAChC,4CAA4C;QAC5C,OAAO;IACT;IAEA,MAAM2B,SAAS,MAAMvC,UAAU;QAC7BI,IAAIqB;QACJG,SAAS,IAAI;QACbtB;QACAC;QACAmB;QACAG,QAAQxB,WAAWyB,eAAe;QAClCU,cAAc1B,cAAc;QAC5BL;QACAgC,WAAW;QACX5B;QACAE;QACAM;IACF;IAEA,IAAIP,cAAc,OAAO;QACvB,OAAO;IACT;IAEA,OAAOyB;AACT,EAAC"}
+{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { SQL } from 'drizzle-orm'\nimport type { LibSQLDatabase } from 'drizzle-orm/libsql'\nimport type { UpdateOne } from 'payload'\n\nimport toSnakeCase from 'to-snake-case'\n\nimport type { DrizzleAdapter } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { selectDistinct } from './queries/selectDistinct.js'\nimport { transform } from './transform/read/index.js'\nimport { transformForWrite } from './transform/write/index.js'\nimport { upsertRow } from './upsertRow/index.js'\nimport { shouldUseOptimizedUpsertRow } from './upsertRow/shouldUseOptimizedUpsertRow.js'\nimport { getPrimaryDb } from './utilities/getPrimaryDb.js'\nimport { getTransaction } from './utilities/getTransaction.js'\nimport { markWrite } from './utilities/readAfterWrite.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: DrizzleAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    data,\n    joins: joinQuery,\n    locale,\n    options = { upsert: false },\n    req,\n    returning,\n    select,\n    where: whereArg,\n  },\n) {\n  const collection = this.payload.collections[collectionSlug].config\n  const tableName = this.tableNameMap.get(toSnakeCase(collection.slug))\n  let idToUpdate = id\n  let whereToUpdate: SQL<unknown> | undefined\n\n  const db = getPrimaryDb(this, await getTransaction(this, req))\n\n  if (!idToUpdate) {\n    const { joins, selectFields, where } = buildQuery({\n      adapter: this,\n      fields: collection.flattenedFields,\n      locale,\n      tableName,\n      where: whereArg,\n    })\n    // A `where` that needs joins cannot be applied to the UPDATE statement itself, so those\n    // queries keep resolving a matching id first and then update that row unconditionally\n    whereToUpdate = joins.length === 0 ? where : undefined\n\n    if (options.atomic === true) {\n      if (!shouldUseOptimizedUpsertRow({ data, fields: collection.flattenedFields })) {\n        throw new Error('Atomic where updates only support fields stored on the main table')\n      }\n\n      const { arraysToPush, row } = transformForWrite({\n        adapter: this,\n        data,\n        enableAtomicWrites: true,\n        fields: collection.flattenedFields,\n        tableName,\n      })\n\n      if (arraysToPush && Object.keys(arraysToPush).length) {\n        throw new Error('Atomic where updates do not support array operations')\n      }\n\n      markWrite(this)\n\n      const docs = await (db as LibSQLDatabase)\n        .update(this.tables[tableName])\n        .set(row)\n        .where(where)\n        .returning()\n\n      if (!docs[0]) {\n        return null\n      }\n\n      return transform({\n        adapter: this,\n        config: this.payload.config,\n        data: docs[0],\n        fields: collection.flattenedFields,\n        joinQuery: false,\n        tableName,\n      })\n    }\n\n    // selectDistinct will only return if there are joins\n    const selectDistinctResult = await selectDistinct({\n      adapter: this,\n      db,\n      joins,\n      query: ({ query }) => query.limit(1),\n      selectFields,\n      tableName,\n      where,\n    })\n\n    if (selectDistinctResult?.[0]?.id) {\n      idToUpdate = selectDistinctResult?.[0]?.id\n      // If id wasn't passed but `where` without any joins, retrieve it with findFirst\n    } else if (whereArg && !joins.length) {\n      const table = this.tables[tableName]\n\n      const docsToUpdate = await (db as LibSQLDatabase)\n        .select({\n          id: table.id,\n        })\n        .from(table)\n        .where(where)\n        .limit(1)\n      idToUpdate = docsToUpdate?.[0]?.id\n    }\n  }\n\n  if (!idToUpdate && !options.upsert) {\n    // TODO: In 4.0, if returning === false, we should differentiate between:\n    // - No document found to update\n    // - Document found, but returning === false\n    return null\n  }\n\n  const result = await upsertRow({\n    id: idToUpdate,\n    adapter: this,\n    collectionSlug,\n    data,\n    db,\n    fields: collection.flattenedFields,\n    ignoreResult: returning === false,\n    joinQuery,\n    operation: 'update',\n    req,\n    select,\n    tableName,\n    where: whereToUpdate,\n  })\n\n  if (returning === false) {\n    return null\n  }\n\n  return result\n}\n"],"names":["toSnakeCase","buildQuery","selectDistinct","transform","transformForWrite","upsertRow","shouldUseOptimizedUpsertRow","getPrimaryDb","getTransaction","markWrite","updateOne","id","collection","collectionSlug","data","joins","joinQuery","locale","options","upsert","req","returning","select","where","whereArg","payload","collections","config","tableName","tableNameMap","get","slug","idToUpdate","whereToUpdate","db","selectFields","adapter","fields","flattenedFields","length","undefined","atomic","Error","arraysToPush","row","enableAtomicWrites","Object","keys","docs","update","tables","set","selectDistinctResult","query","limit","table","docsToUpdate","from","result","ignoreResult","operation"],"mappings":"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"}

package/dist/upsertRow/deleteExistingArrayRows.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteExistingArrayRows.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingArrayRows.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAU,uCAK3C,IAAI,KAAG,OAAO,CAAC,IAAI,CAUrB,CAAA"}
+{"version":3,"file":"deleteExistingArrayRows.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingArrayRows.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,uBAAuB,0CAKjC,IAAI,KAAG,OAAO,CAAC,IAAI,CAUrB,CAAA"}

package/dist/upsertRow/deleteExistingRowsByPath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteExistingRowsByPath.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAU,iGAS5C,IAAI,KAAG,OAAO,CAAC,IAAI,CA4CrB,CAAA"}
+{"version":3,"file":"deleteExistingRowsByPath.d.ts","sourceRoot":"","sources":["../../src/upsertRow/deleteExistingRowsByPath.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErE,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,cAAc,CAAA;IACvB,EAAE,EAAE,cAAc,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,wBAAwB,oGASlC,IAAI,KAAG,OAAO,CAAC,IAAI,CA4CrB,CAAA"}

package/dist/upsertRow/handleUpsertError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleUpsertError.d.ts","sourceRoot":"","sources":["../../src/upsertRow/handleUpsertError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,kFAQ/B,qBAAqB,KAAG,KAkE1B,CAAA"}
+{"version":3,"file":"handleUpsertError.d.ts","sourceRoot":"","sources":["../../src/upsertRow/handleUpsertError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,cAAc,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,qFAQ3B,qBAAqB,KAAG,KAkE1B,CAAA"}

package/dist/upsertRow/index.d.ts

@@ -7,5 +7,5 @@ import type { Args } from './types.js';
  *
  * adapter function replaces the entire row and does not support partial updates.
  */
-export declare const upsertRow: <T extends Record<string, unknown> | TypeWithID>({ id, adapter, collectionSlug, data, db, fields, globalSlug, ignoreResult, customID, joinQuery: _joinQuery, operation, path, req, select, tableName, upsertTarget, where, }: Args) => Promise<T>;
+export declare const upsertRow: <T extends Record<string, unknown> | TypeWithID>({ id, adapter, collectionSlug, data, db, fields, globalSlug, ignoreResult, customID, joinQuery: _joinQuery, operation, path, req, select, tableName, upsertTarget, where, }: Args) => Promise<null | T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/upsertRow/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upsertRow/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAqBtC;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,6KAqB7E,IAAI,KAAG,OAAO,CAAC,CAAC,CAotBlB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/upsertRow/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAqBtC;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,+KAqB3E,IAAI,KAAG,OAAO,CAAC,IAAI,GAAG,CAAC,CA2uBzB,CAAA"}

package/dist/upsertRow/index.js

@@ -40,6 +40,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
             const { row } = transformedForWrite;
             const { arraysToPush } = transformedForWrite;
             const drizzle = db;
+            const updateWhere = where ? and(eq(adapter.tables[tableName].id, id), where) : eq(adapter.tables[tableName].id, id);
             // First, handle $push arrays
             if (arraysToPush && Object.keys(arraysToPush)?.length) {
                 await insertArrays({
@@ -65,7 +66,7 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 if (hasDataToUpdate) {
                     // Only update row if there is something to update.
                     // Example: if the data only consists of a single $push, calling insertArrays is enough - we don't need to update the row.
-                    await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id));
+                    await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere);
                 }
                 return ignoreResult === 'idOnly' ? {
                     id
@@ -83,8 +84,11 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
             const hasOnlyColumns = Object.keys(findManyArgs.columns || {}).length > 0;
             if (!hasDataToUpdate) {
                 // Nothing to update => just fetch current row and return
-                findManyArgs.where = eq(adapter.tables[tableName].id, insertedRow.id);
+                findManyArgs.where = updateWhere;
                 const doc = await db.query[tableName].findFirst(findManyArgs);
+                if (!doc) {
+                    return null;
+                }
                 return transform({
                     adapter,
                     config: adapter.payload.config,
@@ -105,7 +109,10 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                         }
                     }
                 }
-                const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id)).returning(Object.keys(selectedFields).length ? selectedFields : undefined);
+                const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere).returning(Object.keys(selectedFields).length ? selectedFields : undefined);
+                if (!docs[0]) {
+                    return null;
+                }
                 return transform({
                     adapter,
                     config: adapter.payload.config,
@@ -116,7 +123,13 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                 });
             }
             // DB Update that needs the result, potentially with joins => need to update first, then find. returning() does not work with joins.
-            await drizzle.update(adapter.tables[tableName]).set(row).where(eq(adapter.tables[tableName].id, id));
+            const docs = await drizzle.update(adapter.tables[tableName]).set(row).where(updateWhere).returning({
+                id: adapter.tables[tableName].id
+            });
+            if (!docs[0]) {
+                return null;
+            }
+            insertedRow = docs[0];
             findManyArgs.where = eq(adapter.tables[tableName].id, insertedRow.id);
             const doc = await db.query[tableName].findFirst(findManyArgs);
             return transform({
@@ -168,7 +181,11 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                     rowToInsert.row.id = id;
                     [insertedRow] = await adapter.insert({
                         db,
-                        onConflictDoUpdate: {
+                        onConflictDoUpdate: where ? {
+                            set: rowToInsert.row,
+                            target,
+                            where
+                        } : {
                             set: rowToInsert.row,
                             target
                         },
@@ -188,6 +205,9 @@ customID, joinQuery: _joinQuery, operation, path = '', req, select, tableName, u
                         values: rowToInsert.row
                     });
                 }
+                if (!insertedRow) {
+                    return null;
+                }
             } else {
                 // No main row data to update, just use the existing ID
                 insertedRow = {