drizzle-orm 0.38.3-e6823b4 → 0.38.4-9927cf1

package/relations.cjs

@@ -18,542 +18,311 @@ var __copyProps = (to, from, except, desc2) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var relations_exports = {};
 __export(relations_exports, {
-  AggregatedField: () => AggregatedField,
-  Count: () => Count,
   Many: () => Many,
   One: () => One,
   Relation: () => Relation,
   Relations: () => Relations,
-  RelationsBuilderColumn: () => RelationsBuilderColumn,
-  RelationsBuilderTable: () => RelationsBuilderTable,
-  RelationsHelperStatic: () => RelationsHelperStatic,
-  createRelationsHelper: () => createRelationsHelper,
-  defineRelations: () => defineRelations,
+  createMany: () => createMany,
+  createOne: () => createOne,
+  createTableRelationsHelpers: () => createTableRelationsHelpers,
+  extractTablesRelationalConfig: () => extractTablesRelationalConfig,
+  getOperators: () => getOperators,
   getOrderByOperators: () => getOrderByOperators,
   mapRelationalRow: () => mapRelationalRow,
-  operators: () => operators,
-  orderByOperators: () => orderByOperators,
-  relationExtrasToSQL: () => relationExtrasToSQL,
-  relationToSQL: () => relationToSQL,
-  relationsFilterToSQL: () => relationsFilterToSQL,
-  relationsOrderToSQL: () => relationsOrderToSQL
+  normalizeRelation: () => normalizeRelation,
+  relations: () => relations
 });
 module.exports = __toCommonJS(relations_exports);
 var import_table = require("./table.cjs");
-var import_table2 = require("./table.cjs");
 var import_column = require("./column.cjs");
 var import_entity = require("./entity.cjs");
 var import_primary_keys = require("./pg-core/primary-keys.cjs");
 var import_expressions = require("./sql/expressions/index.cjs");
 var import_sql = require("./sql/sql.cjs");
-var import_utils = require("./utils.cjs");
+class Relation {
+  constructor(sourceTable, referencedTable, relationName) {
+    this.sourceTable = sourceTable;
+    this.referencedTable = referencedTable;
+    this.relationName = relationName;
+    this.referencedTableName = referencedTable[import_table.Table.Symbol.Name];
+  }
+  static [import_entity.entityKind] = "Relation";
+  referencedTableName;
+  fieldName;
+}
 class Relations {
-  constructor(schema, tables, config) {
-    this.schema = schema;
-    this.tables = tables;
+  constructor(table, config) {
+    this.table = table;
+    this.config = config;
+  }
+  static [import_entity.entityKind] = "Relations";
+}
+class One extends Relation {
+  constructor(sourceTable, referencedTable, config, isNullable) {
+    super(sourceTable, referencedTable, config?.relationName);
+    this.config = config;
+    this.isNullable = isNullable;
+  }
+  static [import_entity.entityKind] = "One";
+  withFieldName(fieldName) {
+    const relation = new One(
+      this.sourceTable,
+      this.referencedTable,
+      this.config,
+      this.isNullable
+    );
+    relation.fieldName = fieldName;
+    return relation;
+  }
+}
+class Many extends Relation {
+  constructor(sourceTable, referencedTable, config) {
+    super(sourceTable, referencedTable, config?.relationName);
     this.config = config;
-    for (const [tsName, table] of Object.entries(tables)) {
-      if (!(0, import_entity.is)(table, import_table.Table))
-        continue;
-      this.tableNamesMap[(0, import_table.getTableUniqueName)(table)] = tsName;
-      const tableConfig = this.tablesConfig[tsName] = {
-        table,
-        tsName,
-        dbName: table[import_table.Table.Symbol.Name],
-        schema: table[import_table.Table.Symbol.Schema],
-        columns: table[import_table.Table.Symbol.Columns],
-        relations: config[tsName] || {},
-        primaryKey: []
+  }
+  static [import_entity.entityKind] = "Many";
+  withFieldName(fieldName) {
+    const relation = new Many(
+      this.sourceTable,
+      this.referencedTable,
+      this.config
+    );
+    relation.fieldName = fieldName;
+    return relation;
+  }
+}
+function getOperators() {
+  return {
+    and: import_expressions.and,
+    between: import_expressions.between,
+    eq: import_expressions.eq,
+    exists: import_expressions.exists,
+    gt: import_expressions.gt,
+    gte: import_expressions.gte,
+    ilike: import_expressions.ilike,
+    inArray: import_expressions.inArray,
+    isNull: import_expressions.isNull,
+    isNotNull: import_expressions.isNotNull,
+    like: import_expressions.like,
+    lt: import_expressions.lt,
+    lte: import_expressions.lte,
+    ne: import_expressions.ne,
+    not: import_expressions.not,
+    notBetween: import_expressions.notBetween,
+    notExists: import_expressions.notExists,
+    notLike: import_expressions.notLike,
+    notIlike: import_expressions.notIlike,
+    notInArray: import_expressions.notInArray,
+    or: import_expressions.or,
+    sql: import_sql.sql
+  };
+}
+function getOrderByOperators() {
+  return {
+    sql: import_sql.sql,
+    asc: import_expressions.asc,
+    desc: import_expressions.desc
+  };
+}
+function extractTablesRelationalConfig(schema, configHelpers) {
+  if (Object.keys(schema).length === 1 && "default" in schema && !(0, import_entity.is)(schema["default"], import_table.Table)) {
+    schema = schema["default"];
+  }
+  const tableNamesMap = {};
+  const relationsBuffer = {};
+  const tablesConfig = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if ((0, import_entity.is)(value, import_table.Table)) {
+      const dbName = (0, import_table.getTableUniqueName)(value);
+      const bufferedRelations = relationsBuffer[dbName];
+      tableNamesMap[dbName] = key;
+      tablesConfig[key] = {
+        tsName: key,
+        dbName: value[import_table.Table.Symbol.Name],
+        schema: value[import_table.Table.Symbol.Schema],
+        columns: value[import_table.Table.Symbol.Columns],
+        relations: bufferedRelations?.relations ?? {},
+        primaryKey: bufferedRelations?.primaryKey ?? []
       };
-      for (const column of Object.values(table[import_table.Table.Symbol.Columns])) {
+      for (const column of Object.values(
+        value[import_table.Table.Symbol.Columns]
+      )) {
         if (column.primary) {
-          tableConfig.primaryKey.push(column);
+          tablesConfig[key].primaryKey.push(column);
         }
       }
-      const extraConfig = table[import_table.Table.Symbol.ExtraConfigBuilder]?.(table);
+      const extraConfig = value[import_table.Table.Symbol.ExtraConfigBuilder]?.(value[import_table.Table.Symbol.ExtraConfigColumns]);
       if (extraConfig) {
         for (const configEntry of Object.values(extraConfig)) {
           if ((0, import_entity.is)(configEntry, import_primary_keys.PrimaryKeyBuilder)) {
-            tableConfig.primaryKey.push(...configEntry.columns);
+            tablesConfig[key].primaryKey.push(...configEntry.columns);
           }
         }
       }
-    }
-    for (const tableConfig of Object.values(this.tablesConfig)) {
-      for (const [relationFieldName, relation] of Object.entries(tableConfig.relations)) {
-        if (!(0, import_entity.is)(relation, Relation)) {
-          continue;
-        }
-        relation.sourceTable = tableConfig.table;
-        relation.fieldName = relationFieldName;
-      }
-    }
-    for (const tableConfig of Object.values(this.tablesConfig)) {
-      for (const [relationFieldName, relation] of Object.entries(tableConfig.relations)) {
-        const relationPrintName = `relations -> ${tableConfig.tsName}.${relationFieldName}`;
-        if (!(0, import_entity.is)(relation, Relation)) {
-          continue;
-        }
-        if (typeof relation.alias === "string" && !relation.alias) {
-          throw new Error(`${relationPrintName}: "alias" cannot be an empty string - omit it if you don't need it`);
-        }
-        if (relation.sourceColumns?.length === 0) {
-          throw new Error(`${relationPrintName}: "from" cannot be an empty array`);
-        }
-        if (relation.targetColumns?.length === 0) {
-          throw new Error(`${relationPrintName}: "to" cannot be an empty array`);
-        }
-        if (relation.sourceColumns && relation.targetColumns) {
-          if (relation.sourceColumns.length !== relation.targetColumns.length) {
-            throw new Error(
-              `${relationPrintName}: "from" and "to" arrays must have the same length`
-            );
-          }
-          continue;
-        }
-        if (relation.sourceColumns || relation.targetColumns) {
-          throw new Error(
-            `${relationPrintName}: relation must have either both "from" and "to" defined, or none of them`
-          );
-        }
-        let reverseRelation;
-        const targetTableTsName = this.tableNamesMap[(0, import_table.getTableUniqueName)(relation.targetTable)];
-        if (!targetTableTsName) {
-          throw new Error(
-            `Table "${(0, import_table.getTableUniqueName)(relation.targetTable)}" not found in provided TS schema`
-          );
-        }
-        const reverseTableConfig = this.tablesConfig[targetTableTsName];
-        if (!reverseTableConfig) {
-          throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relations of table "${targetTableTsName}" were found"`
-          );
-        }
-        if (relation.alias) {
-          const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-            (it) => (0, import_entity.is)(it, Relation) && it.alias === relation.alias
-          );
-          if (reverseRelations.length > 1) {
-            throw new Error(
-              `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations with alias "${relation.alias}" found in table "${targetTableTsName}": ${reverseRelations.map((it) => `"${it.fieldName}"`).join(", ")}`
-            );
-          }
-          reverseRelation = reverseRelations[0];
-          if (!reverseRelation) {
-            throw new Error(
-              `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and there is no reverse relation of table "${targetTableTsName}" with alias "${relation.alias}"`
-            );
+    } else if ((0, import_entity.is)(value, Relations)) {
+      const dbName = (0, import_table.getTableUniqueName)(value.table);
+      const tableName = tableNamesMap[dbName];
+      const relations2 = value.config(
+        configHelpers(value.table)
+      );
+      let primaryKey;
+      for (const [relationName, relation] of Object.entries(relations2)) {
+        if (tableName) {
+          const tableConfig = tablesConfig[tableName];
+          tableConfig.relations[relationName] = relation;
+          if (primaryKey) {
+            tableConfig.primaryKey.push(...primaryKey);
           }
         } else {
-          const reverseRelations = Object.values(reverseTableConfig.relations).filter(
-            (it) => (0, import_entity.is)(it, Relation) && it.targetTable === relation.sourceTable && !it.alias
-          );
-          if (reverseRelations.length > 1) {
-            throw new Error(
-              `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and multiple relations between "${targetTableTsName}" and "${(0, import_table.getTableUniqueName)(relation.sourceTable)}" were found.
-Hint: you can specify "alias" on both sides of the relation with the same value`
-            );
-          }
-          reverseRelation = reverseRelations[0];
-          if (!reverseRelation) {
-            throw new Error(
-              `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and no reverse relation of table "${targetTableTsName}" with target table "${(0, import_table.getTableUniqueName)(relation.sourceTable)}" was found`
-            );
+          if (!(dbName in relationsBuffer)) {
+            relationsBuffer[dbName] = {
+              relations: {},
+              primaryKey
+            };
           }
+          relationsBuffer[dbName].relations[relationName] = relation;
         }
-        if (!reverseRelation.sourceColumns || !reverseRelation.targetColumns) {
-          throw new Error(
-            `${relationPrintName}: not enough data provided to build the relation - "from"/"to" are not defined, and reverse relation "${targetTableTsName}.${reverseRelation.fieldName}" does not have "from"/"to" defined`
-          );
-        }
-        relation.sourceColumns = reverseRelation.targetColumns;
-        relation.targetColumns = reverseRelation.sourceColumns;
-        relation.where = reverseRelation.where;
       }
     }
   }
-  static [import_entity.entityKind] = "RelationsV2";
-  /** table DB name -> schema table key */
-  tableNamesMap = {};
-  tablesConfig = {};
-}
-class Relation {
-  constructor(targetTable) {
-    this.targetTable = targetTable;
-  }
-  static [import_entity.entityKind] = "RelationV2";
-  fieldName;
-  sourceColumns;
-  targetColumns;
-  alias;
-  where;
-  sourceTable;
-}
-class One extends Relation {
-  static [import_entity.entityKind] = "OneV2";
-  optional;
-  constructor(targetTable, config) {
-    super(targetTable);
-    this.alias = config?.alias;
-    this.where = config?.where;
-    if (config?.from) {
-      this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
-    }
-    if (config?.to) {
-      this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
-    }
-    this.optional = config?.optional ?? false;
-  }
-}
-class Many extends Relation {
-  constructor(targetTable, config) {
-    super(targetTable);
-    this.config = config;
-    this.alias = config?.alias;
-    this.where = config?.where;
-    if (config?.from) {
-      this.sourceColumns = Array.isArray(config.from) ? config.from.map((it) => it._.column) : [config.from._.column];
-    }
-    if (config?.to) {
-      this.targetColumns = Array.isArray(config.to) ? config.to.map((it) => it._.column) : [config.to._.column];
-    }
-  }
-  static [import_entity.entityKind] = "ManyV2";
+  return { tables: tablesConfig, tableNamesMap };
 }
-class AggregatedField {
-  static [import_entity.entityKind] = "AggregatedField";
-  table;
-  onTable(table) {
-    this.table = table;
-    return this;
-  }
-}
-class Count extends AggregatedField {
-  static [import_entity.entityKind] = "AggregatedFieldCount";
-  query;
-  getSQL() {
-    if (!this.query) {
-      if (!this.table)
-        throw new Error("Table must be set before building aggregate field");
-      this.query = import_sql.sql`select count(*) as ${import_sql.sql.identifier("r")} from ${this.table}`.mapWith(Number);
-    }
-    return this.query;
-  }
+function relations(table, relations2) {
+  return new Relations(
+    table,
+    (helpers) => Object.fromEntries(
+      Object.entries(relations2(helpers)).map(([key, value]) => [
+        key,
+        value.withFieldName(key)
+      ])
+    )
+  );
 }
-const operators = {
-  and: import_expressions.and,
-  between: import_expressions.between,
-  eq: import_expressions.eq,
-  exists: import_expressions.exists,
-  gt: import_expressions.gt,
-  gte: import_expressions.gte,
-  ilike: import_expressions.ilike,
-  inArray: import_expressions.inArray,
-  isNull: import_expressions.isNull,
-  isNotNull: import_expressions.isNotNull,
-  like: import_expressions.like,
-  lt: import_expressions.lt,
-  lte: import_expressions.lte,
-  ne: import_expressions.ne,
-  not: import_expressions.not,
-  notBetween: import_expressions.notBetween,
-  notExists: import_expressions.notExists,
-  notLike: import_expressions.notLike,
-  notIlike: import_expressions.notIlike,
-  notInArray: import_expressions.notInArray,
-  or: import_expressions.or,
-  sql: import_sql.sql
-};
-const orderByOperators = {
-  sql: import_sql.sql,
-  asc: import_expressions.asc,
-  desc: import_expressions.desc
-};
-function getOrderByOperators() {
-  return orderByOperators;
+function createOne(sourceTable) {
+  return function one(table, config) {
+    return new One(
+      sourceTable,
+      table,
+      config,
+      config?.fields.reduce((res, f) => res && f.notNull, true) ?? false
+    );
+  };
 }
-function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (value) => value, parseJson = false) {
-  for (const selectionItem of buildQueryResultSelection) {
-    const field = selectionItem.field;
-    if ((0, import_entity.is)(field, import_table.Table)) {
-      if (row[selectionItem.key] === null)
-        continue;
-      if (parseJson)
-        row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
-      if (selectionItem.isArray) {
-        for (const item of row[selectionItem.key]) {
-          mapRelationalRow(item, selectionItem.selection, mapColumnValue);
-        }
-        continue;
-      }
-      mapRelationalRow(
-        row[selectionItem.key],
-        selectionItem.selection,
-        mapColumnValue
-      );
-      continue;
-    }
-    const value = mapColumnValue(row[selectionItem.key]);
-    if (value === null)
-      continue;
-    let decoder;
-    if ((0, import_entity.is)(field, import_column.Column)) {
-      decoder = field;
-    } else if ((0, import_entity.is)(field, import_sql.SQL)) {
-      decoder = field.decoder;
-    } else if ((0, import_entity.is)(field, import_sql.SQL.Aliased)) {
-      decoder = field.sql.decoder;
-    } else {
-      decoder = field.getSQL().decoder;
-    }
-    row[selectionItem.key] = decoder.mapFromDriverValue(value);
-  }
-  return row;
+function createMany(sourceTable) {
+  return function many(referencedTable, config) {
+    return new Many(sourceTable, referencedTable, config);
+  };
 }
-class RelationsBuilderTable {
-  static [import_entity.entityKind] = "RelationsBuilderTable";
-  _;
-  constructor(table) {
-    this._ = {
-      name: (0, import_table2.getTableName)(table),
-      table
+function normalizeRelation(schema, tableNamesMap, relation) {
+  if ((0, import_entity.is)(relation, One) && relation.config) {
+    return {
+      fields: relation.config.fields,
+      references: relation.config.references
     };
   }
-  getSQL() {
-    return this._.table.getSQL();
+  const referencedTableTsName = tableNamesMap[(0, import_table.getTableUniqueName)(relation.referencedTable)];
+  if (!referencedTableTsName) {
+    throw new Error(
+      `Table "${relation.referencedTable[import_table.Table.Symbol.Name]}" not found in schema`
+    );
   }
-}
-class RelationsBuilderColumn {
-  static [import_entity.entityKind] = "RelationsBuilderColumn";
-  _;
-  constructor(column) {
-    this._ = {
-      tableName: (0, import_table2.getTableName)(column.table),
-      data: void 0,
-      column
-    };
+  const referencedTableConfig = schema[referencedTableTsName];
+  if (!referencedTableConfig) {
+    throw new Error(`Table "${referencedTableTsName}" not found in schema`);
+  }
+  const sourceTable = relation.sourceTable;
+  const sourceTableTsName = tableNamesMap[(0, import_table.getTableUniqueName)(sourceTable)];
+  if (!sourceTableTsName) {
+    throw new Error(
+      `Table "${sourceTable[import_table.Table.Symbol.Name]}" not found in schema`
+    );
   }
-  through(column) {
-    this._.through = column;
-    return this;
+  const reverseRelations = [];
+  for (const referencedTableRelation of Object.values(
+    referencedTableConfig.relations
+  )) {
+    if (relation.relationName && relation !== referencedTableRelation && referencedTableRelation.relationName === relation.relationName || !relation.relationName && referencedTableRelation.referencedTable === relation.sourceTable) {
+      reverseRelations.push(referencedTableRelation);
+    }
   }
-  getSQL() {
-    return this._.column.getSQL();
+  if (reverseRelations.length > 1) {
+    throw relation.relationName ? new Error(
+      `There are multiple relations with name "${relation.relationName}" in table "${referencedTableTsName}"`
+    ) : new Error(
+      `There are multiple relations between "${referencedTableTsName}" and "${relation.sourceTable[import_table.Table.Symbol.Name]}". Please specify relation name`
+    );
   }
-}
-class RelationsHelperStatic {
-  static [import_entity.entityKind] = "RelationsHelperStatic";
-  _;
-  constructor(tables) {
-    this._ = {
-      tables
+  if (reverseRelations[0] && (0, import_entity.is)(reverseRelations[0], One) && reverseRelations[0].config) {
+    return {
+      fields: reverseRelations[0].config.references,
+      references: reverseRelations[0].config.fields
     };
-    const one = {};
-    const many = {};
-    for (const [tableName, table] of Object.entries(tables)) {
-      one[tableName] = (config) => {
-        return new One(table, config);
-      };
-      many[tableName] = (config) => {
-        return new Many(table, config);
-      };
-    }
-    this.one = one;
-    this.many = many;
   }
-  one;
-  many;
-  aggs = {
-    count() {
-      return new Count();
-    }
-  };
-}
-function createRelationsHelper(schema) {
-  const schemaTables = Object.fromEntries(
-    Object.entries(schema).filter((e) => (0, import_entity.is)(e[1], import_table.Table))
-  );
-  const helperStatic = new RelationsHelperStatic(schemaTables);
-  const tables = Object.entries(schema).reduce((acc, [key, value]) => {
-    if ((0, import_entity.is)(value, import_table.Table)) {
-      const rTable = new RelationsBuilderTable(value);
-      const columns = Object.entries((0, import_utils.getTableColumns)(value)).reduce(
-        (acc2, [key2, column]) => {
-          const rbColumn = new RelationsBuilderColumn(column);
-          acc2[key2] = rbColumn;
-          return acc2;
-        },
-        {}
-      );
-      acc[key] = Object.assign(rTable, columns);
-    }
-    return acc;
-  }, {});
-  return Object.assign(helperStatic, tables);
-}
-function defineRelations(schema, relations) {
-  return new Relations(
-    schema,
-    schema,
-    relations(createRelationsHelper(schema))
+  throw new Error(
+    `There is not enough information to infer relation "${sourceTableTsName}.${relation.fieldName}"`
   );
 }
-function relationsFieldFilterToSQL(column, filter) {
-  if (typeof filter !== "object" || (0, import_entity.is)(filter, import_sql.Placeholder))
-    return (0, import_expressions.eq)(column, filter);
-  const entries = Object.entries(filter);
-  if (!entries.length)
-    return void 0;
-  const parts = [];
-  for (const [target, value] of entries) {
-    if (value === void 0)
-      continue;
-    switch (target) {
-      case "NOT": {
-        const res = relationsFieldFilterToSQL(column, value);
-        if (!res)
-          continue;
-        parts.push((0, import_expressions.not)(res));
-        continue;
-      }
-      case "OR": {
-        if (!value.length)
-          continue;
-        parts.push(
-          (0, import_expressions.or)(
-            ...value.map((subFilter) => relationsFieldFilterToSQL(column, subFilter))
-          )
-        );
-        continue;
-      }
-      default: {
-        parts.push(
-          operators[target](
-            column,
-            value
-          )
-        );
-        continue;
-      }
-    }
-  }
-  if (!parts.length)
-    return void 0;
-  return (0, import_expressions.and)(...parts);
+function createTableRelationsHelpers(sourceTable) {
+  return {
+    one: createOne(sourceTable),
+    many: createMany(sourceTable)
+  };
 }
-function relationsFilterToSQL(table, filter) {
-  const entries = Object.entries(filter);
-  if (!entries.length)
-    return void 0;
-  const parts = [];
-  for (const [target, value] of entries) {
-    if (value === void 0)
-      continue;
-    switch (target) {
-      case "RAW": {
-        if (value) {
-          parts.push(
-            value(table[import_table2.Columns], operators)
-          );
-        }
-        continue;
-      }
-      case "OR": {
-        if (!value?.length)
-          continue;
-        parts.push(
-          (0, import_expressions.or)(
-            ...value.map(
-              (subFilter) => relationsFilterToSQL(table, subFilter)
-            )
-          )
-        );
-        continue;
-      }
-      case "NOT": {
-        if (value === void 0)
-          continue;
-        const built = relationsFilterToSQL(table, value);
-        if (!built)
-          continue;
-        parts.push((0, import_expressions.not)(built));
-        continue;
-      }
-      default: {
-        const colFilter = relationsFieldFilterToSQL(
-          table[target],
-          value
-        );
-        if (colFilter)
-          parts.push(colFilter);
-        continue;
+function mapRelationalRow(tablesConfig, tableConfig, row, buildQueryResultSelection, mapColumnValue = (value) => value) {
+  const result = {};
+  for (const [
+    selectionItemIndex,
+    selectionItem
+  ] of buildQueryResultSelection.entries()) {
+    if (selectionItem.isJson) {
+      const relation = tableConfig.relations[selectionItem.tsKey];
+      const rawSubRows = row[selectionItemIndex];
+      const subRows = typeof rawSubRows === "string" ? JSON.parse(rawSubRows) : rawSubRows;
+      result[selectionItem.tsKey] = (0, import_entity.is)(relation, One) ? subRows && mapRelationalRow(
+        tablesConfig,
+        tablesConfig[selectionItem.relationTableTsKey],
+        subRows,
+        selectionItem.selection,
+        mapColumnValue
+      ) : subRows.map(
+        (subRow) => mapRelationalRow(
+          tablesConfig,
+          tablesConfig[selectionItem.relationTableTsKey],
+          subRow,
+          selectionItem.selection,
+          mapColumnValue
+        )
+      );
+    } else {
+      const value = mapColumnValue(row[selectionItemIndex]);
+      const field = selectionItem.field;
+      let decoder;
+      if ((0, import_entity.is)(field, import_column.Column)) {
+        decoder = field;
+      } else if ((0, import_entity.is)(field, import_sql.SQL)) {
+        decoder = field.decoder;
+      } else {
+        decoder = field.sql.decoder;
       }
+      result[selectionItem.tsKey] = value === null ? null : decoder.mapFromDriverValue(value);
     }
   }
-  return (0, import_expressions.and)(...parts);
-}
-function relationsOrderToSQL(table, orders) {
-  if (typeof orders === "function") {
-    const data = orders(table, orderByOperators);
-    return (0, import_entity.is)(data, import_sql.SQL) ? data : Array.isArray(data) ? data.length ? import_sql.sql.join(data.map((o) => (0, import_entity.is)(o, import_sql.SQL) ? o : (0, import_expressions.asc)(o)), import_sql.sql`, `) : void 0 : (0, import_entity.is)(data, import_column.Column) ? (0, import_expressions.asc)(data) : void 0;
-  }
-  const entries = Object.entries(orders).filter(([_, value]) => value);
-  if (!entries.length)
-    return void 0;
-  return import_sql.sql.join(entries.map(([column, value]) => (value === "asc" ? import_expressions.asc : import_expressions.desc)(table[import_table2.Columns][column])), import_sql.sql`, `);
-}
-function relationExtrasToSQL(table, extras) {
-  const subqueries = [];
-  const selection = [];
-  for (const [key, extra] of Object.entries(
-    typeof extras === "function" ? extras(table, { sql: operators.sql }) : extras
-  )) {
-    if (!extra)
-      continue;
-    const query = import_sql.sql`(${extra.getSQL()}) as ${import_sql.sql.identifier(key)}`;
-    query.decoder = extra.getSQL().decoder;
-    subqueries.push(query);
-    selection.push({
-      key,
-      field: query
-    });
-  }
-  return {
-    sql: subqueries.length ? import_sql.sql.join(subqueries, import_sql.sql`, `) : void 0,
-    selection
-  };
-}
-function relationToSQL(relation, sourceTable, targetTable) {
-  const columnWhere = relation.sourceColumns.map((s, i) => {
-    const t = relation.targetColumns[i];
-    return (0, import_expressions.eq)(
-      import_sql.sql`${import_sql.sql`${import_sql.sql`${import_sql.sql.identifier(sourceTable[import_table.Schema] ?? "")}.`.if(sourceTable[import_table.Schema] && !sourceTable[import_table.IsAlias])}`}${sourceTable}.${import_sql.sql.identifier(s.name)}`,
-      import_sql.sql`${import_sql.sql`${import_sql.sql`${import_sql.sql.identifier(targetTable[import_table.Schema] ?? "")}.`.if(targetTable[import_table.Schema] && !targetTable[import_table.IsAlias])}`}${targetTable}.${import_sql.sql.identifier(t.name)}`
-    );
-  });
-  const targetWhere = relation.where ? (0, import_expressions.and)(...columnWhere, relationsFilterToSQL(sourceTable, relation.where)) : (0, import_expressions.and)(...columnWhere);
-  return targetWhere;
+  return result;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  AggregatedField,
-  Count,
   Many,
   One,
   Relation,
   Relations,
-  RelationsBuilderColumn,
-  RelationsBuilderTable,
-  RelationsHelperStatic,
-  createRelationsHelper,
-  defineRelations,
+  createMany,
+  createOne,
+  createTableRelationsHelpers,
+  extractTablesRelationalConfig,
+  getOperators,
   getOrderByOperators,
   mapRelationalRow,
-  operators,
-  orderByOperators,
-  relationExtrasToSQL,
-  relationToSQL,
-  relationsFilterToSQL,
-  relationsOrderToSQL
+  normalizeRelation,
+  relations
 });
 //# sourceMappingURL=relations.cjs.map