drizzle-orm 0.45.1 → 0.45.2

package/mysql-core/dialect.js

@@ -47,14 +47,16 @@ class MySqlDialect {
             await tx.execute(sql.raw(stmt));
           }
           await tx.execute(
-            sql`insert into ${sql.identifier(migrationsTable)} (\`hash\`, \`created_at\`) values(${migration.hash}, ${migration.folderMillis})`
+            sql`insert into ${sql.identifier(
+              migrationsTable
+            )} (\`hash\`, \`created_at\`) values(${migration.hash}, ${migration.folderMillis})`
           );
         }
       }
     });
   }
   escapeName(name) {
-    return `\`${name}\``;
+    return `\`${name.replace(/`/g, "``")}\``;
   }
   escapeParam(_num) {
     return `?`;
@@ -74,7 +76,14 @@ class MySqlDialect {
     withSqlChunks.push(sql` `);
     return sql.join(withSqlChunks);
   }
-  buildDeleteQuery({ table, where, returning, withList, limit, orderBy }) {
+  buildDeleteQuery({
+    table,
+    where,
+    returning,
+    withList,
+    limit,
+    orderBy
+  }) {
     const withSql = this.buildWithCTE(withList);
     const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
     const whereSql = where ? sql` where ${where}` : void 0;
@@ -88,18 +97,28 @@ class MySqlDialect {
       (colName) => set[colName] !== void 0 || tableColumns[colName]?.onUpdateFn !== void 0
     );
     const setSize = columnNames.length;
-    return sql.join(columnNames.flatMap((colName, i) => {
-      const col = tableColumns[colName];
-      const onUpdateFnResult = col.onUpdateFn?.();
-      const value = set[colName] ?? (is(onUpdateFnResult, SQL) ? onUpdateFnResult : sql.param(onUpdateFnResult, col));
-      const res = sql`${sql.identifier(this.casing.getColumnCasing(col))} = ${value}`;
-      if (i < setSize - 1) {
-        return [res, sql.raw(", ")];
-      }
-      return [res];
-    }));
+    return sql.join(
+      columnNames.flatMap((colName, i) => {
+        const col = tableColumns[colName];
+        const onUpdateFnResult = col.onUpdateFn?.();
+        const value = set[colName] ?? (is(onUpdateFnResult, SQL) ? onUpdateFnResult : sql.param(onUpdateFnResult, col));
+        const res = sql`${sql.identifier(this.casing.getColumnCasing(col))} = ${value}`;
+        if (i < setSize - 1) {
+          return [res, sql.raw(", ")];
+        }
+        return [res];
+      })
+    );
   }
-  buildUpdateQuery({ table, set, where, returning, withList, limit, orderBy }) {
+  buildUpdateQuery({
+    table,
+    set,
+    where,
+    returning,
+    withList,
+    limit,
+    orderBy
+  }) {
     const withSql = this.buildWithCTE(withList);
     const setSql = this.buildUpdateSet(table, set);
     const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
@@ -206,7 +225,9 @@ class MySqlDialect {
       ))(f.field.table)) {
         const tableName = getTableName(f.field.table);
         throw new Error(
-          `Your "${f.path.join("->")}" field references a column "${tableName}"."${f.field.name}", but the table "${tableName}" is not part of the query! Did you forget to join it?`
+          `Your "${f.path.join(
+            "->"
+          )}" field references a column "${tableName}"."${f.field.name}", but the table "${tableName}" is not part of the query! Did you forget to join it?`
         );
       }
     }
@@ -216,7 +237,9 @@ class MySqlDialect {
     const selection = this.buildSelection(fieldsList, { isSingleTable });
     const tableSql = (() => {
       if (is(table, Table) && table[Table.Symbol.IsAlias]) {
-        return sql`${sql`${sql.identifier(table[Table.Symbol.Schema] ?? "")}.`.if(table[Table.Symbol.Schema])}${sql.identifier(table[Table.Symbol.OriginalName])} ${sql.identifier(table[Table.Symbol.Name])}`;
+        return sql`${sql`${sql.identifier(table[Table.Symbol.Schema] ?? "")}.`.if(table[Table.Symbol.Schema])}${sql.identifier(
+          table[Table.Symbol.OriginalName]
+        )} ${sql.identifier(table[Table.Symbol.Name])}`;
       }
       return table;
     })();
@@ -234,9 +257,18 @@ class MySqlDialect {
           const tableSchema = table2[MySqlTable.Symbol.Schema];
           const origTableName = table2[MySqlTable.Symbol.OriginalName];
           const alias = tableName === origTableName ? void 0 : joinMeta.alias;
-          const useIndexSql2 = this.buildIndex({ indexes: joinMeta.useIndex, indexFor: "USE" });
-          const forceIndexSql2 = this.buildIndex({ indexes: joinMeta.forceIndex, indexFor: "FORCE" });
-          const ignoreIndexSql2 = this.buildIndex({ indexes: joinMeta.ignoreIndex, indexFor: "IGNORE" });
+          const useIndexSql2 = this.buildIndex({
+            indexes: joinMeta.useIndex,
+            indexFor: "USE"
+          });
+          const forceIndexSql2 = this.buildIndex({
+            indexes: joinMeta.forceIndex,
+            indexFor: "FORCE"
+          });
+          const ignoreIndexSql2 = this.buildIndex({
+            indexes: joinMeta.ignoreIndex,
+            indexFor: "IGNORE"
+          });
           joinsArray.push(
             sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${useIndexSql2}${forceIndexSql2}${ignoreIndexSql2}${alias && sql` ${sql.identifier(alias)}`}${onSql}`
           );
@@ -266,8 +298,14 @@ class MySqlDialect {
     const limitSql = this.buildLimit(limit);
     const offsetSql = offset ? sql` offset ${offset}` : void 0;
     const useIndexSql = this.buildIndex({ indexes: useIndex, indexFor: "USE" });
-    const forceIndexSql = this.buildIndex({ indexes: forceIndex, indexFor: "FORCE" });
-    const ignoreIndexSql = this.buildIndex({ indexes: ignoreIndex, indexFor: "IGNORE" });
+    const forceIndexSql = this.buildIndex({
+      indexes: forceIndex,
+      indexFor: "FORCE"
+    });
+    const ignoreIndexSql = this.buildIndex({
+      indexes: ignoreIndex,
+      indexFor: "IGNORE"
+    });
     let lockingClausesSql;
     if (lockingClause) {
       const { config, strength } = lockingClause;
@@ -308,12 +346,16 @@ class MySqlDialect {
       const orderByValues = [];
       for (const orderByUnit of orderBy) {
         if (is(orderByUnit, MySqlColumn)) {
-          orderByValues.push(sql.identifier(this.casing.getColumnCasing(orderByUnit)));
+          orderByValues.push(
+            sql.identifier(this.casing.getColumnCasing(orderByUnit))
+          );
         } else if (is(orderByUnit, SQL)) {
           for (let i = 0; i < orderByUnit.queryChunks.length; i++) {
             const chunk = orderByUnit.queryChunks[i];
             if (is(chunk, MySqlColumn)) {
-              orderByUnit.queryChunks[i] = sql.identifier(this.casing.getColumnCasing(chunk));
+              orderByUnit.queryChunks[i] = sql.identifier(
+                this.casing.getColumnCasing(chunk)
+              );
             }
           }
           orderByValues.push(sql`${orderByUnit}`);
@@ -328,7 +370,13 @@ class MySqlDialect {
     const offsetSql = offset ? sql` offset ${offset}` : void 0;
     return sql`${leftChunk}${operatorChunk}${rightChunk}${orderBySql}${limitSql}${offsetSql}`;
   }
-  buildInsertQuery({ table, values: valuesOrSelect, ignore, onConflict, select }) {
+  buildInsertQuery({
+    table,
+    values: valuesOrSelect,
+    ignore,
+    onConflict,
+    select
+  }) {
     const valuesSqlList = [];
     const columns = table[Table.Symbol.Columns];
     const colEntries = Object.entries(columns).filter(
@@ -421,7 +469,10 @@ class MySqlDialect {
       }));
     } else {
       const aliasedColumns = Object.fromEntries(
-        Object.entries(tableConfig.columns).map(([key, value]) => [key, aliasedTableColumn(value, tableAlias)])
+        Object.entries(tableConfig.columns).map(([key, value]) => [
+          key,
+          aliasedTableColumn(value, tableAlias)
+        ])
       );
       if (config.where) {
         const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, getOperators()) : config.where;
@@ -443,7 +494,9 @@ class MySqlDialect {
           }
         }
         if (selectedColumns.length > 0) {
-          selectedColumns = isIncludeMode ? selectedColumns.filter((c) => config.columns?.[c] === true) : Object.keys(tableConfig.columns).filter((key) => !selectedColumns.includes(key));
+          selectedColumns = isIncludeMode ? selectedColumns.filter((c) => config.columns?.[c] === true) : Object.keys(tableConfig.columns).filter(
+            (key) => !selectedColumns.includes(key)
+          );
         }
       } else {
         selectedColumns = Object.keys(tableConfig.columns);
@@ -454,7 +507,13 @@ class MySqlDialect {
       }
       let selectedRelations = [];
       if (config.with) {
-        selectedRelations = Object.entries(config.with).filter((entry) => !!entry[1]).map(([tsKey, queryConfig]) => ({ tsKey, queryConfig, relation: tableConfig.relations[tsKey] }));
+        selectedRelations = Object.entries(config.with).filter(
+          (entry) => !!entry[1]
+        ).map(([tsKey, queryConfig]) => ({
+          tsKey,
+          queryConfig,
+          relation: tableConfig.relations[tsKey]
+        }));
       }
       let extras;
       if (config.extras) {
@@ -493,14 +552,21 @@ class MySqlDialect {
         queryConfig: selectedRelationConfigValue,
         relation
       } of selectedRelations) {
-        const normalizedRelation = normalizeRelation(schema, tableNamesMap, relation);
+        const normalizedRelation = normalizeRelation(
+          schema,
+          tableNamesMap,
+          relation
+        );
         const relationTableName = getTableUniqueName(relation.referencedTable);
         const relationTableTsName = tableNamesMap[relationTableName];
         const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
         const joinOn2 = and(
           ...normalizedRelation.fields.map(
             (field2, i) => eq(
-              aliasedTableColumn(normalizedRelation.references[i], relationTableAlias),
+              aliasedTableColumn(
+                normalizedRelation.references[i],
+                relationTableAlias
+              ),
               aliasedTableColumn(field2, tableAlias)
             )
           )
@@ -516,7 +582,9 @@ class MySqlDialect {
           joinOn: joinOn2,
           nestedQueryRelation: relation
         });
-        const field = sql`${sql.identifier(relationTableAlias)}.${sql.identifier("data")}`.as(selectedRelationTsKey);
+        const field = sql`${sql.identifier(relationTableAlias)}.${sql.identifier("data")}`.as(
+          selectedRelationTsKey
+        );
         joins.push({
           on: sql`true`,
           table: new Subquery(builtRelation.sql, {}, relationTableAlias),
@@ -535,7 +603,9 @@ class MySqlDialect {
       }
     }
     if (selection.length === 0) {
-      throw new DrizzleError({ message: `No fields selected for table "${tableConfig.tsName}" ("${tableAlias}")` });
+      throw new DrizzleError({
+        message: `No fields selected for table "${tableConfig.tsName}" ("${tableAlias}")`
+      });
     }
     let result;
     where = and(joinOn, where);
@@ -549,14 +619,16 @@ class MySqlDialect {
       if (is(nestedQueryRelation, Many)) {
         field = sql`coalesce(json_arrayagg(${field}), json_array())`;
       }
-      const nestedSelection = [{
-        dbKey: "data",
-        tsKey: "data",
-        field: field.as("data"),
-        isJson: true,
-        relationTableTsKey: tableConfig.tsName,
-        selection
-      }];
+      const nestedSelection = [
+        {
+          dbKey: "data",
+          tsKey: "data",
+          field: field.as("data"),
+          isJson: true,
+          relationTableTsKey: tableConfig.tsName,
+          selection
+        }
+      ];
       const needsSubquery = limit !== void 0 || offset !== void 0 || (orderBy?.length ?? 0) > 0;
       if (needsSubquery) {
         result = this.buildSelectQuery({
@@ -567,10 +639,12 @@ class MySqlDialect {
               path: [],
               field: sql.raw("*")
             },
-            ...((orderBy?.length ?? 0) > 0 ? [{
-              path: [],
-              field: sql`row_number() over (order by ${sql.join(orderBy, sql`, `)})`
-            }] : [])
+            ...((orderBy?.length ?? 0) > 0 ? [
+              {
+                path: [],
+                field: sql`row_number() over (order by ${sql.join(orderBy, sql`, `)})`
+              }
+            ] : [])
           ],
           where,
           limit,
@@ -645,7 +719,10 @@ class MySqlDialect {
       }));
     } else {
       const aliasedColumns = Object.fromEntries(
-        Object.entries(tableConfig.columns).map(([key, value]) => [key, aliasedTableColumn(value, tableAlias)])
+        Object.entries(tableConfig.columns).map(([key, value]) => [
+          key,
+          aliasedTableColumn(value, tableAlias)
+        ])
       );
       if (config.where) {
         const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, getOperators()) : config.where;
@@ -667,7 +744,9 @@ class MySqlDialect {
           }
         }
         if (selectedColumns.length > 0) {
-          selectedColumns = isIncludeMode ? selectedColumns.filter((c) => config.columns?.[c] === true) : Object.keys(tableConfig.columns).filter((key) => !selectedColumns.includes(key));
+          selectedColumns = isIncludeMode ? selectedColumns.filter((c) => config.columns?.[c] === true) : Object.keys(tableConfig.columns).filter(
+            (key) => !selectedColumns.includes(key)
+          );
         }
       } else {
         selectedColumns = Object.keys(tableConfig.columns);
@@ -678,7 +757,13 @@ class MySqlDialect {
       }
       let selectedRelations = [];
       if (config.with) {
-        selectedRelations = Object.entries(config.with).filter((entry) => !!entry[1]).map(([tsKey, queryConfig]) => ({ tsKey, queryConfig, relation: tableConfig.relations[tsKey] }));
+        selectedRelations = Object.entries(config.with).filter(
+          (entry) => !!entry[1]
+        ).map(([tsKey, queryConfig]) => ({
+          tsKey,
+          queryConfig,
+          relation: tableConfig.relations[tsKey]
+        }));
       }
       let extras;
       if (config.extras) {
@@ -717,29 +802,38 @@ class MySqlDialect {
         queryConfig: selectedRelationConfigValue,
         relation
       } of selectedRelations) {
-        const normalizedRelation = normalizeRelation(schema, tableNamesMap, relation);
+        const normalizedRelation = normalizeRelation(
+          schema,
+          tableNamesMap,
+          relation
+        );
         const relationTableName = getTableUniqueName(relation.referencedTable);
         const relationTableTsName = tableNamesMap[relationTableName];
         const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
         const joinOn2 = and(
           ...normalizedRelation.fields.map(
             (field2, i) => eq(
-              aliasedTableColumn(normalizedRelation.references[i], relationTableAlias),
+              aliasedTableColumn(
+                normalizedRelation.references[i],
+                relationTableAlias
+              ),
               aliasedTableColumn(field2, tableAlias)
             )
           )
         );
-        const builtRelation = this.buildRelationalQueryWithoutLateralSubqueries({
-          fullSchema,
-          schema,
-          tableNamesMap,
-          table: fullSchema[relationTableTsName],
-          tableConfig: schema[relationTableTsName],
-          queryConfig: is(relation, One) ? selectedRelationConfigValue === true ? { limit: 1 } : { ...selectedRelationConfigValue, limit: 1 } : selectedRelationConfigValue,
-          tableAlias: relationTableAlias,
-          joinOn: joinOn2,
-          nestedQueryRelation: relation
-        });
+        const builtRelation = this.buildRelationalQueryWithoutLateralSubqueries(
+          {
+            fullSchema,
+            schema,
+            tableNamesMap,
+            table: fullSchema[relationTableTsName],
+            tableConfig: schema[relationTableTsName],
+            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, Many)) {
           fieldSql = sql`coalesce(${fieldSql}, json_array())`;
@@ -772,14 +866,16 @@ class MySqlDialect {
       if (is(nestedQueryRelation, Many)) {
         field = sql`json_arrayagg(${field})`;
       }
-      const nestedSelection = [{
-        dbKey: "data",
-        tsKey: "data",
-        field,
-        isJson: true,
-        relationTableTsKey: tableConfig.tsName,
-        selection
-      }];
+      const nestedSelection = [
+        {
+          dbKey: "data",
+          tsKey: "data",
+          field,
+          isJson: true,
+          relationTableTsKey: tableConfig.tsName,
+          selection
+        }
+      ];
       const needsSubquery = limit !== void 0 || offset !== void 0 || orderBy.length > 0;
       if (needsSubquery) {
         result = this.buildSelectQuery({
@@ -790,10 +886,12 @@ class MySqlDialect {
               path: [],
               field: sql.raw("*")
             },
-            ...(orderBy.length > 0 ? [{
-              path: [],
-              field: sql`row_number() over (order by ${sql.join(orderBy, sql`, `)})`
-            }] : [])
+            ...(orderBy.length > 0 ? [
+              {
+                path: [],
+                field: sql`row_number() over (order by ${sql.join(orderBy, sql`, `)})`
+              }
+            ] : [])
           ],
           where,
           limit,