drizzle-orm 0.36.4-3c69a1f → 0.36.4-3efe329

package/mysql-core/dialect.d.cts

@@ -1,7 +1,6 @@
-import * as V1 from "../_relations.cjs";
 import { entityKind } from "../entity.cjs";
 import type { MigrationConfig, MigrationMeta } from "../migrator.cjs";
-import type { BuildRelationalQueryResult, DBQueryConfig, TableRelationalConfig, TablesRelationalConfig } from "../relations.cjs";
+import { type BuildRelationalQueryResult, type DBQueryConfig, type Relation, type TableRelationalConfig, type TablesRelationalConfig } from "../relations.cjs";
 import { SQL } from "../sql/sql.cjs";
 import type { QueryWithTypings } from "../sql/sql.cjs";
 import { type Casing, type UpdateSet } from "../utils.cjs";
@@ -51,41 +50,26 @@ export declare class MySqlDialect {
         generatedIds: Record<string, unknown>[];
     };
     sqlToQuery(sql: SQL, invokeSource?: 'indexes' | undefined): QueryWithTypings;
-    /** @deprecated */
-    _buildRelationalQuery({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
+    buildRelationalQuery({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
         fullSchema: Record<string, unknown>;
-        schema: V1.TablesRelationalConfig;
+        schema: TablesRelationalConfig;
         tableNamesMap: Record<string, string>;
         table: MySqlTable;
-        tableConfig: V1.TableRelationalConfig;
-        queryConfig: true | V1.DBQueryConfig<'many', true>;
+        tableConfig: TableRelationalConfig;
+        queryConfig: true | DBQueryConfig<'many', true>;
         tableAlias: string;
-        nestedQueryRelation?: V1.Relation;
+        nestedQueryRelation?: Relation;
         joinOn?: SQL;
-    }): V1.BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
-    /** @deprecated */
-    _buildRelationalQueryWithoutLateralSubqueries({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
+    }): BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
+    buildRelationalQueryWithoutLateralSubqueries({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
         fullSchema: Record<string, unknown>;
-        schema: V1.TablesRelationalConfig;
-        tableNamesMap: Record<string, string>;
-        table: MySqlTable;
-        tableConfig: V1.TableRelationalConfig;
-        queryConfig: true | V1.DBQueryConfig<'many', true>;
-        tableAlias: string;
-        nestedQueryRelation?: V1.Relation;
-        joinOn?: SQL;
-    }): V1.BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
-    private unwrapAllColumns;
-    private getSelectedTableColumns;
-    private buildColumns;
-    buildRelationalQuery({ tables, schema, tableNamesMap, table, tableConfig, queryConfig: config, relationWhere, mode, }: {
-        tables: Record<string, MySqlTable>;
         schema: TablesRelationalConfig;
         tableNamesMap: Record<string, string>;
         table: MySqlTable;
         tableConfig: TableRelationalConfig;
-        queryConfig?: DBQueryConfig<'many'> | true;
-        relationWhere?: SQL;
-        mode: 'first' | 'many';
-    }): BuildRelationalQueryResult;
+        queryConfig: true | DBQueryConfig<'many', true>;
+        tableAlias: string;
+        nestedQueryRelation?: Relation;
+        joinOn?: SQL;
+    }): BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
 }

package/mysql-core/dialect.d.ts

@@ -1,7 +1,6 @@
-import * as V1 from "../_relations.js";
 import { entityKind } from "../entity.js";
 import type { MigrationConfig, MigrationMeta } from "../migrator.js";
-import type { BuildRelationalQueryResult, DBQueryConfig, TableRelationalConfig, TablesRelationalConfig } from "../relations.js";
+import { type BuildRelationalQueryResult, type DBQueryConfig, type Relation, type TableRelationalConfig, type TablesRelationalConfig } from "../relations.js";
 import { SQL } from "../sql/sql.js";
 import type { QueryWithTypings } from "../sql/sql.js";
 import { type Casing, type UpdateSet } from "../utils.js";
@@ -51,41 +50,26 @@ export declare class MySqlDialect {
         generatedIds: Record<string, unknown>[];
     };
     sqlToQuery(sql: SQL, invokeSource?: 'indexes' | undefined): QueryWithTypings;
-    /** @deprecated */
-    _buildRelationalQuery({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
+    buildRelationalQuery({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
         fullSchema: Record<string, unknown>;
-        schema: V1.TablesRelationalConfig;
+        schema: TablesRelationalConfig;
         tableNamesMap: Record<string, string>;
         table: MySqlTable;
-        tableConfig: V1.TableRelationalConfig;
-        queryConfig: true | V1.DBQueryConfig<'many', true>;
+        tableConfig: TableRelationalConfig;
+        queryConfig: true | DBQueryConfig<'many', true>;
         tableAlias: string;
-        nestedQueryRelation?: V1.Relation;
+        nestedQueryRelation?: Relation;
         joinOn?: SQL;
-    }): V1.BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
-    /** @deprecated */
-    _buildRelationalQueryWithoutLateralSubqueries({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
+    }): BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
+    buildRelationalQueryWithoutLateralSubqueries({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn, }: {
         fullSchema: Record<string, unknown>;
-        schema: V1.TablesRelationalConfig;
-        tableNamesMap: Record<string, string>;
-        table: MySqlTable;
-        tableConfig: V1.TableRelationalConfig;
-        queryConfig: true | V1.DBQueryConfig<'many', true>;
-        tableAlias: string;
-        nestedQueryRelation?: V1.Relation;
-        joinOn?: SQL;
-    }): V1.BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
-    private unwrapAllColumns;
-    private getSelectedTableColumns;
-    private buildColumns;
-    buildRelationalQuery({ tables, schema, tableNamesMap, table, tableConfig, queryConfig: config, relationWhere, mode, }: {
-        tables: Record<string, MySqlTable>;
         schema: TablesRelationalConfig;
         tableNamesMap: Record<string, string>;
         table: MySqlTable;
         tableConfig: TableRelationalConfig;
-        queryConfig?: DBQueryConfig<'many'> | true;
-        relationWhere?: SQL;
-        mode: 'first' | 'many';
-    }): BuildRelationalQueryResult;
+        queryConfig: true | DBQueryConfig<'many', true>;
+        tableAlias: string;
+        nestedQueryRelation?: Relation;
+        joinOn?: SQL;
+    }): BuildRelationalQueryResult<MySqlTable, MySqlColumn>;
 }

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,
-  relationFilterToSQL,
-  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, 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";
@@ -371,8 +369,7 @@ class MySqlDialect {
       invokeSource
     });
   }
-  /** @deprecated */
-  _buildRelationalQuery({
+  buildRelationalQuery({
     fullSchema,
     schema,
     tableNamesMap,
@@ -401,7 +398,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 = [];
@@ -453,7 +450,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];
       }
@@ -470,7 +467,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}`;
@@ -482,13 +479,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
@@ -523,7 +520,7 @@ class MySqlDialect {
         ),
         sql`, `
       )})`;
-      if (is(nestedQueryRelation, V1.Many)) {
+      if (is(nestedQueryRelation, Many)) {
         field = sql`coalesce(json_arrayagg(${field}), json_array())`;
       }
       const nestedSelection = [{
@@ -597,8 +594,7 @@ class MySqlDialect {
       selection
     };
   }
-  /** @deprecated */
-  _buildRelationalQueryWithoutLateralSubqueries({
+  buildRelationalQueryWithoutLateralSubqueries({
     fullSchema,
     schema,
     tableNamesMap,
@@ -626,7 +622,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 = [];
@@ -678,7 +674,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];
       }
@@ -695,7 +691,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}`;
@@ -707,19 +703,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);
@@ -747,7 +743,7 @@ class MySqlDialect {
         ),
         sql`, `
       )})`;
-      if (is(nestedQueryRelation, V1.Many)) {
+      if (is(nestedQueryRelation, Many)) {
         field = sql`json_arrayagg(${field})`;
       }
       const nestedSelection = [{
@@ -819,148 +815,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 (colSelectionMode === void 0)
-        colSelectionMode = v;
-      else if (v !== void 0 && colSelectionMode !== v) {
-        throw new Error("Columns cannot be both true and false at the same time");
-      }
-      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`${table[column.tsName]} as ${sql.identifier(column.tsName)}`
-      );
-    }
-    return columnIdentifiers.length ? sql.join(columnIdentifiers, sql`, `) : this.unwrapAllColumns(table, selection);
-  })() : (() => {
-    const columnIdentifiers = [this.unwrapAllColumns(table, selection)];
-    return sql.join(columnIdentifiers, sql`, `);
-  })();
-  buildRelationalQuery({
-    tables,
-    schema,
-    tableNamesMap,
-    table,
-    tableConfig,
-    queryConfig: config,
-    relationWhere,
-    mode
-  }) {
-    const selection = [];
-    const isSingle = mode === "first";
-    const params = config === true ? void 0 : config;
-    const limit = isSingle ? 1 : params?.limit;
-    const offset = params?.offset;
-    const columns = this.buildColumns(table, selection, params);
-    const where = params?.where && relationWhere ? and(relationFilterToSQL(table, params.where), relationWhere) : params?.where ? relationFilterToSQL(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];
-    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`, lateral(${query2}) as ${sql.identifier(k)}`;
-          }
-          const relation = tableConfig.relations[k];
-          const isSingle2 = is(relation, One);
-          const targetTable = relation.targetTable;
-          const relationFilter = relationToSQL(relation);
-          const innerQuery = this.buildRelationalQuery({
-            table: targetTable,
-            mode: isSingle2 ? "first" : "many",
-            schema,
-            queryConfig: join,
-            tableConfig: schema[tableNamesMap[getTableUniqueName(targetTable)]],
-            tableNamesMap,
-            tables,
-            relationWhere: relationFilter
-          });
-          selection.push({
-            field: targetTable,
-            key: k,
-            selection: innerQuery.selection,
-            isArray: !isSingle2
-          });
-          const jsonColumns = sql.join(
-            innerQuery.selection.map((s) => sql`${sql.raw(this.escapeString(s.key))}, ${sql.identifier(s.key)}`),
-            sql`, `
-          );
-          return sql`, lateral(select ${isSingle2 ? sql`json_object(${jsonColumns}) as ${sql.identifier("r")}` : sql`coalesce(json_arrayagg(json_object(${jsonColumns})), json_array()) as ${sql.identifier("r")}`} from (${innerQuery.sql}) as ${sql.identifier("t")}) as ${sql.identifier(k)}`;
-        })
-      );
-    })() : void 0;
-    if (extras?.sql)
-      selectionArr.push(extras.sql);
-    const selectionSet = sql.join(selectionArr, sql`, `);
-    const query = sql`select ${selectionSet} from ${table}${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