drizzle-orm 0.39.0-19ccabb → 0.39.0-2c67783

package/mysql-core/dialect.js

@@ -1,4 +1,3 @@
-import * as V1 from "../_relations.js";
 import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from "../alias.js";
 import { CasingCache } from "../casing.js";
 import { Column } from "../column.js";
@@ -6,16 +5,15 @@ import { entityKind, is } from "../entity.js";
 import { DrizzleError } from "../errors.js";
 import { and, eq } from "../expressions.js";
 import {
-  AggregatedField,
-  One,
-  relationExtrasToSQL,
-  relationsFilterToSQL,
-  relationsOrderToSQL,
-  relationToSQL
+  getOperators,
+  getOrderByOperators,
+  Many,
+  normalizeRelation,
+  One
 } from "../relations.js";
 import { Param, SQL, sql, View } from "../sql/sql.js";
 import { Subquery } from "../subquery.js";
-import { Columns, getTableName, getTableUniqueName, IsAlias, OriginalName, Schema, Table } from "../table.js";
+import { getTableName, getTableUniqueName, Table } from "../table.js";
 import { orderSelectedFields } from "../utils.js";
 import { ViewBaseConfig } from "../view-common.js";
 import { MySqlColumn } from "./columns/common.js";
@@ -386,8 +384,7 @@ class MySqlDialect {
       invokeSource
     });
   }
-  /** @deprecated */
-  _buildRelationalQuery({
+  buildRelationalQuery({
     fullSchema,
     schema,
     tableNamesMap,
@@ -416,7 +413,7 @@ class MySqlDialect {
         Object.entries(tableConfig.columns).map(([key, value]) => [key, aliasedTableColumn(value, tableAlias)])
       );
       if (config.where) {
-        const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, V1.getOperators()) : config.where;
+        const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, getOperators()) : config.where;
         where = whereSql && mapColumnsInSQLToAlias(whereSql, tableAlias);
       }
       const fieldsSelection = [];
@@ -468,7 +465,7 @@ class MySqlDialect {
           selection: []
         });
       }
-      let orderByOrig = typeof config.orderBy === "function" ? config.orderBy(aliasedColumns, V1.getOrderByOperators()) : config.orderBy ?? [];
+      let orderByOrig = typeof config.orderBy === "function" ? config.orderBy(aliasedColumns, getOrderByOperators()) : config.orderBy ?? [];
       if (!Array.isArray(orderByOrig)) {
         orderByOrig = [orderByOrig];
       }
@@ -485,7 +482,7 @@ class MySqlDialect {
         queryConfig: selectedRelationConfigValue,
         relation
       } of selectedRelations) {
-        const normalizedRelation = V1.normalizeRelation(schema, tableNamesMap, relation);
+        const normalizedRelation = normalizeRelation(schema, tableNamesMap, relation);
         const relationTableName = getTableUniqueName(relation.referencedTable);
         const relationTableTsName = tableNamesMap[relationTableName];
         const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
@@ -497,13 +494,13 @@ class MySqlDialect {
             )
           )
         );
-        const builtRelation = this._buildRelationalQuery({
+        const builtRelation = this.buildRelationalQuery({
           fullSchema,
           schema,
           tableNamesMap,
           table: fullSchema[relationTableTsName],
           tableConfig: schema[relationTableTsName],
-          queryConfig: is(relation, V1.One) ? selectedRelationConfigValue === true ? { limit: 1 } : { ...selectedRelationConfigValue, limit: 1 } : selectedRelationConfigValue,
+          queryConfig: is(relation, One) ? selectedRelationConfigValue === true ? { limit: 1 } : { ...selectedRelationConfigValue, limit: 1 } : selectedRelationConfigValue,
           tableAlias: relationTableAlias,
           joinOn: joinOn2,
           nestedQueryRelation: relation
@@ -538,7 +535,7 @@ class MySqlDialect {
         ),
         sql`, `
       )})`;
-      if (is(nestedQueryRelation, V1.Many)) {
+      if (is(nestedQueryRelation, Many)) {
         field = sql`coalesce(json_arrayagg(${field}), json_array())`;
       }
       const nestedSelection = [{
@@ -612,8 +609,7 @@ class MySqlDialect {
       selection
     };
   }
-  /** @deprecated */
-  _buildRelationalQueryWithoutLateralSubqueries({
+  buildRelationalQueryWithoutLateralSubqueries({
     fullSchema,
     schema,
     tableNamesMap,
@@ -641,7 +637,7 @@ class MySqlDialect {
         Object.entries(tableConfig.columns).map(([key, value]) => [key, aliasedTableColumn(value, tableAlias)])
       );
       if (config.where) {
-        const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, V1.getOperators()) : config.where;
+        const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, getOperators()) : config.where;
         where = whereSql && mapColumnsInSQLToAlias(whereSql, tableAlias);
       }
       const fieldsSelection = [];
@@ -693,7 +689,7 @@ class MySqlDialect {
           selection: []
         });
       }
-      let orderByOrig = typeof config.orderBy === "function" ? config.orderBy(aliasedColumns, V1.getOrderByOperators()) : config.orderBy ?? [];
+      let orderByOrig = typeof config.orderBy === "function" ? config.orderBy(aliasedColumns, getOrderByOperators()) : config.orderBy ?? [];
       if (!Array.isArray(orderByOrig)) {
         orderByOrig = [orderByOrig];
       }
@@ -710,7 +706,7 @@ class MySqlDialect {
         queryConfig: selectedRelationConfigValue,
         relation
       } of selectedRelations) {
-        const normalizedRelation = V1.normalizeRelation(schema, tableNamesMap, relation);
+        const normalizedRelation = normalizeRelation(schema, tableNamesMap, relation);
         const relationTableName = getTableUniqueName(relation.referencedTable);
         const relationTableTsName = tableNamesMap[relationTableName];
         const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
@@ -722,19 +718,19 @@ class MySqlDialect {
             )
           )
         );
-        const builtRelation = this._buildRelationalQueryWithoutLateralSubqueries({
+        const builtRelation = this.buildRelationalQueryWithoutLateralSubqueries({
           fullSchema,
           schema,
           tableNamesMap,
           table: fullSchema[relationTableTsName],
           tableConfig: schema[relationTableTsName],
-          queryConfig: is(relation, V1.One) ? selectedRelationConfigValue === true ? { limit: 1 } : { ...selectedRelationConfigValue, limit: 1 } : selectedRelationConfigValue,
+          queryConfig: is(relation, One) ? selectedRelationConfigValue === true ? { limit: 1 } : { ...selectedRelationConfigValue, limit: 1 } : selectedRelationConfigValue,
           tableAlias: relationTableAlias,
           joinOn: joinOn2,
           nestedQueryRelation: relation
         });
         let fieldSql = sql`(${builtRelation.sql})`;
-        if (is(relation, V1.Many)) {
+        if (is(relation, Many)) {
           fieldSql = sql`coalesce(${fieldSql}, json_array())`;
         }
         const field = fieldSql.as(selectedRelationTsKey);
@@ -762,7 +758,7 @@ class MySqlDialect {
         ),
         sql`, `
       )})`;
-      if (is(nestedQueryRelation, V1.Many)) {
+      if (is(nestedQueryRelation, Many)) {
         field = sql`json_arrayagg(${field})`;
       }
       const nestedSelection = [{
@@ -834,172 +830,6 @@ class MySqlDialect {
       selection
     };
   }
-  unwrapAllColumns = (table, selection) => {
-    return sql.join(
-      Object.entries(table[Columns]).map(([k, v]) => {
-        selection.push({
-          key: k,
-          field: v
-        });
-        return sql`${v} as ${sql.identifier(k)}`;
-      }),
-      sql`, `
-    );
-  };
-  getSelectedTableColumns = (table, columns) => {
-    const selectedColumns = [];
-    if (!columns) {
-      for (const [k, v] of Object.entries(table[Columns])) {
-        selectedColumns.push({
-          column: v,
-          tsName: k
-        });
-      }
-      return selectedColumns;
-    }
-    const entries = Object.entries(columns);
-    let colSelectionMode;
-    for (const [k, v] of entries) {
-      if (v === void 0)
-        continue;
-      colSelectionMode = colSelectionMode || v;
-      if (v) {
-        selectedColumns.push({
-          column: table[Columns][k],
-          tsName: k
-        });
-      }
-    }
-    if (colSelectionMode === false) {
-      for (const [k, v] of Object.entries(table[Columns])) {
-        if (columns[k] === false)
-          continue;
-        selectedColumns.push({
-          column: v,
-          tsName: k
-        });
-      }
-    }
-    return selectedColumns;
-  };
-  buildColumns = (table, selection, params) => params?.columns ? (() => {
-    const columnIdentifiers = [];
-    const selectedColumns = this.getSelectedTableColumns(table, params?.columns);
-    for (const column of selectedColumns) {
-      columnIdentifiers.push(sql`${column.column} as ${sql.identifier(column.tsName)}`);
-      selection.push({
-        key: column.tsName,
-        field: column.column
-      });
-    }
-    return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : void 0;
-  })() : this.unwrapAllColumns(table, selection);
-  buildRelationalQuery({
-    tables,
-    schema,
-    tableNamesMap,
-    table,
-    tableConfig,
-    queryConfig: config,
-    relationWhere,
-    mode,
-    errorPath,
-    depth,
-    isNested,
-    throughJoin
-  }) {
-    const selection = [];
-    const isSingle = mode === "first";
-    const params = config === true ? void 0 : config;
-    const currentPath = errorPath ?? "";
-    const currentDepth = depth ?? 0;
-    const limit = isSingle ? 1 : params?.limit;
-    const offset = params?.offset;
-    const columns = this.buildColumns(table, selection, params);
-    const where = params?.where && relationWhere ? and(relationsFilterToSQL(table, params.where), relationWhere) : params?.where ? relationsFilterToSQL(table, params.where) : relationWhere;
-    const order = params?.orderBy ? relationsOrderToSQL(table, params.orderBy) : void 0;
-    const extras = params?.extras ? relationExtrasToSQL(table, params.extras) : void 0;
-    if (extras)
-      selection.push(...extras.selection);
-    const selectionArr = columns ? [columns] : [];
-    const joins = params ? (() => {
-      const { with: joins2 } = params;
-      if (!joins2)
-        return;
-      const withEntries = Object.entries(joins2).filter(([_, v]) => v);
-      if (!withEntries.length)
-        return;
-      return sql.join(
-        withEntries.map(([k, join]) => {
-          selectionArr.push(sql`${sql.identifier(k)}.${sql.identifier("r")} as ${sql.identifier(k)}`);
-          if (is(tableConfig.relations[k], AggregatedField)) {
-            const relation2 = tableConfig.relations[k];
-            relation2.onTable(table);
-            const query2 = relation2.getSQL();
-            selection.push({
-              key: k,
-              field: relation2
-            });
-            return sql` left join lateral (${query2}) as ${sql.identifier(k)} on true`;
-          }
-          const relation = tableConfig.relations[k];
-          const isSingle2 = is(relation, One);
-          const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
-          const throughTable = relation.throughTable ? aliasedTable(relation.throughTable, `tr${currentDepth}`) : void 0;
-          const { filter, joinCondition } = relationToSQL(
-            relation,
-            table,
-            targetTable,
-            throughTable
-          );
-          const throughJoin2 = throughTable ? sql` inner join ${sql`${sql.identifier(throughTable[Schema] ?? "")}.`.if(throughTable[Schema])}${sql.identifier(throughTable[OriginalName])} as ${throughTable} on ${joinCondition}` : void 0;
-          const innerQuery = this.buildRelationalQuery({
-            table: targetTable,
-            mode: isSingle2 ? "first" : "many",
-            schema,
-            queryConfig: join,
-            tableConfig: schema[tableNamesMap[getTableUniqueName(relation.targetTable)]],
-            tableNamesMap,
-            tables,
-            relationWhere: filter,
-            errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
-            depth: currentDepth + 1,
-            isNested: true,
-            throughJoin: throughJoin2
-          });
-          selection.push({
-            field: targetTable,
-            key: k,
-            selection: innerQuery.selection,
-            isArray: !isSingle2,
-            isOptional: (relation.optional ?? false) || join !== true && !!join.where
-          });
-          const jsonColumns = sql.join(
-            innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
-            sql`, `
-          );
-          const joinQuery = sql` left join lateral(select ${sql`${isSingle2 ? sql`json_object(${jsonColumns})` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array())`} as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)} on true`;
-          return joinQuery;
-        })
-      );
-    })() : void 0;
-    if (extras?.sql)
-      selectionArr.push(extras.sql);
-    if (!selectionArr.length) {
-      throw new DrizzleError({
-        message: `No fields selected for table "${tableConfig.tsName}"${currentPath ? ` ("${currentPath}")` : ""}`
-      });
-    }
-    if (isNested && order) {
-      selectionArr.push(sql`row_number() over (order by ${order})`);
-    }
-    const selectionSet = sql.join(selectionArr, sql`, `);
-    const query = sql`select ${selectionSet} from ${table[IsAlias] ? sql`${sql`${sql.identifier(table[Schema] ?? "")}.`.if(table[Schema])}${sql.identifier(table[OriginalName])} as ${table}` : table}${throughJoin}${sql`${joins}`.if(joins)}${sql` where ${where}`.if(where)}${sql` order by ${order}`.if(order)}${sql` limit ${limit}`.if(limit !== void 0)}${sql` offset ${offset}`.if(offset !== void 0)}`;
-    return {
-      sql: query,
-      selection
-    };
-  }
 }
 export {
   MySqlDialect