drizzle-kit 0.28.0 → 0.28.1-d7e3535

package/README.md

@@ -1,21 +1,21 @@
 ## Drizzle Kit
 
-DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like deletions and renames by prompting user input.
+Drizzle Kit is a CLI migrator tool for Drizzle ORM. It is probably the one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like deletions and renames by prompting user input.
 <https://github.com/drizzle-team/drizzle-kit-mirror> - is a mirror repository for issues.
 
 ## Documentation
 
-Check the full documenation on [the website](https://orm.drizzle.team/kit-docs/overview)
+Check the full documentation on [the website](https://orm.drizzle.team/kit-docs/overview).
 
 ### How it works
 
-`drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version, if there's one.
- Based on the difference it will generate all needed SQL migrations and if there are any `automatically unresolvable` cases like `renames` it will prompt user for input.
+Drizzle Kit traverses a schema module and generates a snapshot to compare with the previous version, if there is one.
+Based on the difference, it will generate all needed SQL migrations. If there are any cases that can't be resolved automatically, such as renames, it will prompt the user for input.
 
-For schema file:
+For example, for this schema module:
 
 ```typescript
-// ./src/db/schema.ts
+// src/db/schema.ts
 
 import { integer, pgTable, serial, text, varchar } from "drizzle-orm/pg-core";
 
@@ -63,7 +63,7 @@ CREATE INDEX IF NOT EXISTS users_full_name_index ON users (full_name);
 npm install -D drizzle-kit
 ```
 
-Running with CLI options
+Running with CLI options:
 
 ```jsonc
 // package.json

package/api.js

@@ -21121,7 +21121,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.36.1";
+    version = "0.36.2";
   }
 });
 
@@ -21407,7 +21407,11 @@ var init_sql = __esm({
             if (_config.invokeSource === "indexes") {
               return { sql: escapeName(columnName), params: [] };
             }
-            return { sql: escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName), params: [] };
+            const schemaName = chunk.table[Table2.Symbol.Schema];
+            return {
+              sql: chunk.table[IsAlias] || schemaName === void 0 ? escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName) : escapeName(schemaName) + "." + escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName),
+              params: []
+            };
           }
           if (is(chunk, View3)) {
             const schemaName = chunk[ViewBaseConfig].schema;
@@ -22140,7 +22144,7 @@ function haveSameKeys(left, right) {
 }
 function mapUpdateSet(table4, values) {
   const entries = Object.entries(values).filter(([, value]) => value !== void 0).map(([key, value]) => {
-    if (is(value, SQL)) {
+    if (is(value, SQL) || is(value, Column2)) {
       return [key, value];
     } else {
       return [key, new Param(value, table4[Table2.Symbol.Columns][key])];
@@ -24981,12 +24985,19 @@ var init_dialect = __esm({
           return [res];
         }));
       }
-      buildUpdateQuery({ table: table4, set, where, returning, withList }) {
+      buildUpdateQuery({ table: table4, set, where, returning, withList, from, joins }) {
         const withSql = this.buildWithCTE(withList);
+        const tableName = table4[PgTable.Symbol.Name];
+        const tableSchema = table4[PgTable.Symbol.Schema];
+        const origTableName = table4[PgTable.Symbol.OriginalName];
+        const alias = tableName === origTableName ? void 0 : tableName;
+        const tableSql = sql`${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`}`;
         const setSql = this.buildUpdateSet(table4, set);
-        const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+        const fromSql = from && sql.join([sql.raw(" from "), this.buildFromTable(from)]);
+        const joinsSql = this.buildJoins(joins);
+        const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: !from })}` : void 0;
         const whereSql = where ? sql` where ${where}` : void 0;
-        return sql`${withSql}update ${table4} set ${setSql}${whereSql}${returningSql}`;
+        return sql`${withSql}update ${tableSql} set ${setSql}${fromSql}${joinsSql}${whereSql}${returningSql}`;
       }
       /**
        * Builds selection SQL with provided fields/expressions
@@ -25038,6 +25049,54 @@ var init_dialect = __esm({
         });
         return sql.join(chunks);
       }
+      buildJoins(joins) {
+        if (!joins || joins.length === 0) {
+          return void 0;
+        }
+        const joinsArray = [];
+        for (const [index4, joinMeta] of joins.entries()) {
+          if (index4 === 0) {
+            joinsArray.push(sql` `);
+          }
+          const table4 = joinMeta.table;
+          const lateralSql = joinMeta.lateral ? sql` lateral` : void 0;
+          if (is(table4, PgTable)) {
+            const tableName = table4[PgTable.Symbol.Name];
+            const tableSchema = table4[PgTable.Symbol.Schema];
+            const origTableName = table4[PgTable.Symbol.OriginalName];
+            const alias = tableName === origTableName ? void 0 : joinMeta.alias;
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+            );
+          } else if (is(table4, View3)) {
+            const viewName = table4[ViewBaseConfig].name;
+            const viewSchema = table4[ViewBaseConfig].schema;
+            const origViewName = table4[ViewBaseConfig].originalName;
+            const alias = viewName === origViewName ? void 0 : joinMeta.alias;
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : void 0}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+            );
+          } else {
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table4} on ${joinMeta.on}`
+            );
+          }
+          if (index4 < joins.length - 1) {
+            joinsArray.push(sql` `);
+          }
+        }
+        return sql.join(joinsArray);
+      }
+      buildFromTable(table4) {
+        if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
+          let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
+          if (table4[Table2.Symbol.Schema]) {
+            fullName = sql`${sql.identifier(table4[Table2.Symbol.Schema])}.${fullName}`;
+          }
+          return sql`${fullName} ${sql.identifier(table4[Table2.Symbol.Name])}`;
+        }
+        return table4;
+      }
       buildSelectQuery({
         withList,
         fields,
@@ -25072,51 +25131,8 @@ var init_dialect = __esm({
           distinctSql = distinct === true ? sql` distinct` : sql` distinct on (${sql.join(distinct.on, sql`, `)})`;
         }
         const selection = this.buildSelection(fieldsList, { isSingleTable });
-        const tableSql = (() => {
-          if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
-            let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
-            if (table4[Table2.Symbol.Schema]) {
-              fullName = sql`${sql.identifier(table4[Table2.Symbol.Schema])}.${fullName}`;
-            }
-            return sql`${fullName} ${sql.identifier(table4[Table2.Symbol.Name])}`;
-          }
-          return table4;
-        })();
-        const joinsArray = [];
-        if (joins) {
-          for (const [index4, joinMeta] of joins.entries()) {
-            if (index4 === 0) {
-              joinsArray.push(sql` `);
-            }
-            const table22 = joinMeta.table;
-            const lateralSql = joinMeta.lateral ? sql` lateral` : void 0;
-            if (is(table22, PgTable)) {
-              const tableName = table22[PgTable.Symbol.Name];
-              const tableSchema = table22[PgTable.Symbol.Schema];
-              const origTableName = table22[PgTable.Symbol.OriginalName];
-              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else if (is(table22, View3)) {
-              const viewName = table22[ViewBaseConfig].name;
-              const viewSchema = table22[ViewBaseConfig].schema;
-              const origViewName = table22[ViewBaseConfig].originalName;
-              const alias = viewName === origViewName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : void 0}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else {
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table22} on ${joinMeta.on}`
-              );
-            }
-            if (index4 < joins.length - 1) {
-              joinsArray.push(sql` `);
-            }
-          }
-        }
-        const joinsSql = sql.join(joinsArray);
+        const tableSql = this.buildFromTable(table4);
+        const joinsSql = this.buildJoins(joins);
         const whereSql = where ? sql` where ${where}` : void 0;
         const havingSql = having ? sql` having ${having}` : void 0;
         let orderBySql;
@@ -26974,9 +26990,14 @@ var init_update = __esm({
   "../drizzle-orm/dist/pg-core/query-builders/update.js"() {
     "use strict";
     init_entity();
+    init_table2();
     init_query_promise();
+    init_selection_proxy();
+    init_sql();
+    init_subquery();
     init_table();
     init_utils2();
+    init_view_common();
     _a137 = entityKind;
     PgUpdateBuilder = class {
       constructor(table4, session, dialect4, withList) {
@@ -27000,12 +27021,85 @@ var init_update = __esm({
       constructor(table4, set, session, dialect4, withList) {
         super();
         __publicField(this, "config");
+        __publicField(this, "tableName");
+        __publicField(this, "joinsNotNullableMap");
+        __publicField(this, "leftJoin", this.createJoin("left"));
+        __publicField(this, "rightJoin", this.createJoin("right"));
+        __publicField(this, "innerJoin", this.createJoin("inner"));
+        __publicField(this, "fullJoin", this.createJoin("full"));
         __publicField(this, "execute", (placeholderValues) => {
           return this._prepare().execute(placeholderValues);
         });
         this.session = session;
         this.dialect = dialect4;
-        this.config = { set, table: table4, withList };
+        this.config = { set, table: table4, withList, joins: [] };
+        this.tableName = getTableLikeName(table4);
+        this.joinsNotNullableMap = typeof this.tableName === "string" ? { [this.tableName]: true } : {};
+      }
+      from(source) {
+        const tableName = getTableLikeName(source);
+        if (typeof tableName === "string") {
+          this.joinsNotNullableMap[tableName] = true;
+        }
+        this.config.from = source;
+        return this;
+      }
+      getTableLikeFields(table4) {
+        if (is(table4, PgTable)) {
+          return table4[Table2.Symbol.Columns];
+        } else if (is(table4, Subquery)) {
+          return table4._.selectedFields;
+        }
+        return table4[ViewBaseConfig].selectedFields;
+      }
+      createJoin(joinType) {
+        return (table4, on) => {
+          const tableName = getTableLikeName(table4);
+          if (typeof tableName === "string" && this.config.joins.some((join) => join.alias === tableName)) {
+            throw new Error(`Alias "${tableName}" is already used in this query`);
+          }
+          if (typeof on === "function") {
+            const from = this.config.from && !is(this.config.from, SQL) ? this.getTableLikeFields(this.config.from) : void 0;
+            on = on(
+              new Proxy(
+                this.config.table[Table2.Symbol.Columns],
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              ),
+              from && new Proxy(
+                from,
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              )
+            );
+          }
+          this.config.joins.push({ on, table: table4, joinType, alias: tableName });
+          if (typeof tableName === "string") {
+            switch (joinType) {
+              case "left": {
+                this.joinsNotNullableMap[tableName] = false;
+                break;
+              }
+              case "right": {
+                this.joinsNotNullableMap = Object.fromEntries(
+                  Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false])
+                );
+                this.joinsNotNullableMap[tableName] = true;
+                break;
+              }
+              case "inner": {
+                this.joinsNotNullableMap[tableName] = true;
+                break;
+              }
+              case "full": {
+                this.joinsNotNullableMap = Object.fromEntries(
+                  Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false])
+                );
+                this.joinsNotNullableMap[tableName] = false;
+                break;
+              }
+            }
+          }
+          return this;
+        };
       }
       /**
        * Adds a 'where' clause to the query.
@@ -27044,7 +27138,24 @@ var init_update = __esm({
         this.config.where = where;
         return this;
       }
-      returning(fields = this.config.table[Table2.Symbol.Columns]) {
+      returning(fields) {
+        if (!fields) {
+          fields = Object.assign({}, this.config.table[Table2.Symbol.Columns]);
+          if (this.config.from) {
+            const tableName = getTableLikeName(this.config.from);
+            if (typeof tableName === "string" && this.config.from && !is(this.config.from, SQL)) {
+              const fromFields = this.getTableLikeFields(this.config.from);
+              fields[tableName] = fromFields;
+            }
+            for (const join of this.config.joins) {
+              const tableName2 = getTableLikeName(join.table);
+              if (typeof tableName2 === "string" && !is(join.table, SQL)) {
+                const fromFields = this.getTableLikeFields(join.table);
+                fields[tableName2] = fromFields;
+              }
+            }
+          }
+        }
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -27058,7 +27169,9 @@ var init_update = __esm({
       }
       /** @internal */
       _prepare(name2) {
-        return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name2, true);
+        const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name2, true);
+        query.joinsNotNullableMap = this.joinsNotNullableMap;
+        return query;
       }
       prepare(name2) {
         return this._prepare(name2);
@@ -31073,14 +31186,16 @@ var init_dialect2 = __esm({
           return [res];
         }));
       }
-      buildUpdateQuery({ table: table4, set, where, returning, withList, limit, orderBy }) {
+      buildUpdateQuery({ table: table4, set, where, returning, withList, joins, from, limit, orderBy }) {
         const withSql = this.buildWithCTE(withList);
         const setSql = this.buildUpdateSet(table4, set);
+        const fromSql = from && sql.join([sql.raw(" from "), this.buildFromTable(from)]);
+        const joinsSql = this.buildJoins(joins);
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
         const whereSql = where ? sql` where ${where}` : void 0;
         const orderBySql = this.buildOrderBy(orderBy);
         const limitSql = this.buildLimit(limit);
-        return sql`${withSql}update ${table4} set ${setSql}${whereSql}${returningSql}${orderBySql}${limitSql}`;
+        return sql`${withSql}update ${table4} set ${setSql}${fromSql}${joinsSql}${whereSql}${returningSql}${orderBySql}${limitSql}`;
       }
       /**
        * Builds selection SQL with provided fields/expressions
@@ -31133,6 +31248,37 @@ var init_dialect2 = __esm({
         });
         return sql.join(chunks);
       }
+      buildJoins(joins) {
+        if (!joins || joins.length === 0) {
+          return void 0;
+        }
+        const joinsArray = [];
+        if (joins) {
+          for (const [index4, joinMeta] of joins.entries()) {
+            if (index4 === 0) {
+              joinsArray.push(sql` `);
+            }
+            const table4 = joinMeta.table;
+            if (is(table4, SQLiteTable)) {
+              const tableName = table4[SQLiteTable.Symbol.Name];
+              const tableSchema = table4[SQLiteTable.Symbol.Schema];
+              const origTableName = table4[SQLiteTable.Symbol.OriginalName];
+              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
+              joinsArray.push(
+                sql`${sql.raw(joinMeta.joinType)} join ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+              );
+            } else {
+              joinsArray.push(
+                sql`${sql.raw(joinMeta.joinType)} join ${table4} on ${joinMeta.on}`
+              );
+            }
+            if (index4 < joins.length - 1) {
+              joinsArray.push(sql` `);
+            }
+          }
+        }
+        return sql.join(joinsArray);
+      }
       buildLimit(limit) {
         return typeof limit === "object" || typeof limit === "number" && limit >= 0 ? sql` limit ${limit}` : void 0;
       }
@@ -31148,6 +31294,12 @@ var init_dialect2 = __esm({
         }
         return orderByList.length > 0 ? sql` order by ${sql.join(orderByList)}` : void 0;
       }
+      buildFromTable(table4) {
+        if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
+          return sql`${sql.identifier(table4[Table2.Symbol.OriginalName])} ${sql.identifier(table4[Table2.Symbol.Name])}`;
+        }
+        return table4;
+      }
       buildSelectQuery({
         withList,
         fields,
@@ -31178,38 +31330,8 @@ var init_dialect2 = __esm({
         const withSql = this.buildWithCTE(withList);
         const distinctSql = distinct ? sql` distinct` : void 0;
         const selection = this.buildSelection(fieldsList, { isSingleTable });
-        const tableSql = (() => {
-          if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
-            return sql`${sql.identifier(table4[Table2.Symbol.OriginalName])} ${sql.identifier(table4[Table2.Symbol.Name])}`;
-          }
-          return table4;
-        })();
-        const joinsArray = [];
-        if (joins) {
-          for (const [index4, joinMeta] of joins.entries()) {
-            if (index4 === 0) {
-              joinsArray.push(sql` `);
-            }
-            const table22 = joinMeta.table;
-            if (is(table22, SQLiteTable)) {
-              const tableName = table22[SQLiteTable.Symbol.Name];
-              const tableSchema = table22[SQLiteTable.Symbol.Schema];
-              const origTableName = table22[SQLiteTable.Symbol.OriginalName];
-              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else {
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join ${table22} on ${joinMeta.on}`
-              );
-            }
-            if (index4 < joins.length - 1) {
-              joinsArray.push(sql` `);
-            }
-          }
-        }
-        const joinsSql = sql.join(joinsArray);
+        const tableSql = this.buildFromTable(table4);
+        const joinsSql = this.buildJoins(joins);
         const whereSql = where ? sql` where ${where}` : void 0;
         const havingSql = having ? sql` having ${having}` : void 0;
         const groupByList = [];
@@ -32336,8 +32458,11 @@ var init_update2 = __esm({
     init_query_promise();
     init_selection_proxy();
     init_table3();
+    init_subquery();
     init_table();
     init_utils2();
+    init_view_common();
+    init_view_base2();
     _a207 = entityKind;
     SQLiteUpdateBuilder = class {
       constructor(table4, session, dialect4, withList) {
@@ -32362,6 +32487,10 @@ var init_update2 = __esm({
         super();
         /** @internal */
         __publicField(this, "config");
+        __publicField(this, "leftJoin", this.createJoin("left"));
+        __publicField(this, "rightJoin", this.createJoin("right"));
+        __publicField(this, "innerJoin", this.createJoin("inner"));
+        __publicField(this, "fullJoin", this.createJoin("full"));
         __publicField(this, "run", (placeholderValues) => {
           return this._prepare().run(placeholderValues);
         });
@@ -32376,7 +32505,34 @@ var init_update2 = __esm({
         });
         this.session = session;
         this.dialect = dialect4;
-        this.config = { set, table: table4, withList };
+        this.config = { set, table: table4, withList, joins: [] };
+      }
+      from(source) {
+        this.config.from = source;
+        return this;
+      }
+      createJoin(joinType) {
+        return (table4, on) => {
+          const tableName = getTableLikeName(table4);
+          if (typeof tableName === "string" && this.config.joins.some((join) => join.alias === tableName)) {
+            throw new Error(`Alias "${tableName}" is already used in this query`);
+          }
+          if (typeof on === "function") {
+            const from = this.config.from ? is(table4, SQLiteTable) ? table4[Table2.Symbol.Columns] : is(table4, Subquery) ? table4._.selectedFields : is(table4, SQLiteViewBase) ? table4[ViewBaseConfig].selectedFields : void 0 : void 0;
+            on = on(
+              new Proxy(
+                this.config.table[Table2.Symbol.Columns],
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              ),
+              from && new Proxy(
+                from,
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              )
+            );
+          }
+          this.config.joins.push({ on, table: table4, joinType, alias: tableName });
+          return this;
+        };
       }
       /**
        * Adds a 'where' clause to the query.
@@ -35735,7 +35891,7 @@ var init_insert3 = __esm({
       /**
        * Adds an `on duplicate key update` clause to the query.
        *
-       * Calling this method will update update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.
+       * Calling this method will update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.
        *
        * See docs: {@link https://orm.drizzle.team/docs/insert#on-duplicate-key-update}
        *
@@ -35770,7 +35926,7 @@ var init_insert3 = __esm({
             returning.push({ field: value, path: [key] });
           }
         }
-        this.config.returning = orderSelectedFields(this.config.table[Table2.Symbol.Columns]);
+        this.config.returning = returning;
         return this;
       }
       /** @internal */

package/api.mjs

@@ -21126,7 +21126,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.36.1";
+    version = "0.36.2";
   }
 });
 
@@ -21412,7 +21412,11 @@ var init_sql = __esm({
             if (_config.invokeSource === "indexes") {
               return { sql: escapeName(columnName), params: [] };
             }
-            return { sql: escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName), params: [] };
+            const schemaName = chunk.table[Table2.Symbol.Schema];
+            return {
+              sql: chunk.table[IsAlias] || schemaName === void 0 ? escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName) : escapeName(schemaName) + "." + escapeName(chunk.table[Table2.Symbol.Name]) + "." + escapeName(columnName),
+              params: []
+            };
           }
           if (is(chunk, View3)) {
             const schemaName = chunk[ViewBaseConfig].schema;
@@ -22145,7 +22149,7 @@ function haveSameKeys(left, right) {
 }
 function mapUpdateSet(table4, values) {
   const entries = Object.entries(values).filter(([, value]) => value !== void 0).map(([key, value]) => {
-    if (is(value, SQL)) {
+    if (is(value, SQL) || is(value, Column2)) {
       return [key, value];
     } else {
       return [key, new Param(value, table4[Table2.Symbol.Columns][key])];
@@ -24986,12 +24990,19 @@ var init_dialect = __esm({
           return [res];
         }));
       }
-      buildUpdateQuery({ table: table4, set, where, returning, withList }) {
+      buildUpdateQuery({ table: table4, set, where, returning, withList, from, joins }) {
         const withSql = this.buildWithCTE(withList);
+        const tableName = table4[PgTable.Symbol.Name];
+        const tableSchema = table4[PgTable.Symbol.Schema];
+        const origTableName = table4[PgTable.Symbol.OriginalName];
+        const alias = tableName === origTableName ? void 0 : tableName;
+        const tableSql = sql`${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`}`;
         const setSql = this.buildUpdateSet(table4, set);
-        const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+        const fromSql = from && sql.join([sql.raw(" from "), this.buildFromTable(from)]);
+        const joinsSql = this.buildJoins(joins);
+        const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: !from })}` : void 0;
         const whereSql = where ? sql` where ${where}` : void 0;
-        return sql`${withSql}update ${table4} set ${setSql}${whereSql}${returningSql}`;
+        return sql`${withSql}update ${tableSql} set ${setSql}${fromSql}${joinsSql}${whereSql}${returningSql}`;
       }
       /**
        * Builds selection SQL with provided fields/expressions
@@ -25043,6 +25054,54 @@ var init_dialect = __esm({
         });
         return sql.join(chunks);
       }
+      buildJoins(joins) {
+        if (!joins || joins.length === 0) {
+          return void 0;
+        }
+        const joinsArray = [];
+        for (const [index4, joinMeta] of joins.entries()) {
+          if (index4 === 0) {
+            joinsArray.push(sql` `);
+          }
+          const table4 = joinMeta.table;
+          const lateralSql = joinMeta.lateral ? sql` lateral` : void 0;
+          if (is(table4, PgTable)) {
+            const tableName = table4[PgTable.Symbol.Name];
+            const tableSchema = table4[PgTable.Symbol.Schema];
+            const origTableName = table4[PgTable.Symbol.OriginalName];
+            const alias = tableName === origTableName ? void 0 : joinMeta.alias;
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+            );
+          } else if (is(table4, View3)) {
+            const viewName = table4[ViewBaseConfig].name;
+            const viewSchema = table4[ViewBaseConfig].schema;
+            const origViewName = table4[ViewBaseConfig].originalName;
+            const alias = viewName === origViewName ? void 0 : joinMeta.alias;
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : void 0}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+            );
+          } else {
+            joinsArray.push(
+              sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table4} on ${joinMeta.on}`
+            );
+          }
+          if (index4 < joins.length - 1) {
+            joinsArray.push(sql` `);
+          }
+        }
+        return sql.join(joinsArray);
+      }
+      buildFromTable(table4) {
+        if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
+          let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
+          if (table4[Table2.Symbol.Schema]) {
+            fullName = sql`${sql.identifier(table4[Table2.Symbol.Schema])}.${fullName}`;
+          }
+          return sql`${fullName} ${sql.identifier(table4[Table2.Symbol.Name])}`;
+        }
+        return table4;
+      }
       buildSelectQuery({
         withList,
         fields,
@@ -25077,51 +25136,8 @@ var init_dialect = __esm({
           distinctSql = distinct === true ? sql` distinct` : sql` distinct on (${sql.join(distinct.on, sql`, `)})`;
         }
         const selection = this.buildSelection(fieldsList, { isSingleTable });
-        const tableSql = (() => {
-          if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
-            let fullName = sql`${sql.identifier(table4[Table2.Symbol.OriginalName])}`;
-            if (table4[Table2.Symbol.Schema]) {
-              fullName = sql`${sql.identifier(table4[Table2.Symbol.Schema])}.${fullName}`;
-            }
-            return sql`${fullName} ${sql.identifier(table4[Table2.Symbol.Name])}`;
-          }
-          return table4;
-        })();
-        const joinsArray = [];
-        if (joins) {
-          for (const [index4, joinMeta] of joins.entries()) {
-            if (index4 === 0) {
-              joinsArray.push(sql` `);
-            }
-            const table22 = joinMeta.table;
-            const lateralSql = joinMeta.lateral ? sql` lateral` : void 0;
-            if (is(table22, PgTable)) {
-              const tableName = table22[PgTable.Symbol.Name];
-              const tableSchema = table22[PgTable.Symbol.Schema];
-              const origTableName = table22[PgTable.Symbol.OriginalName];
-              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else if (is(table22, View3)) {
-              const viewName = table22[ViewBaseConfig].name;
-              const viewSchema = table22[ViewBaseConfig].schema;
-              const origViewName = table22[ViewBaseConfig].originalName;
-              const alias = viewName === origViewName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${viewSchema ? sql`${sql.identifier(viewSchema)}.` : void 0}${sql.identifier(origViewName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else {
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join${lateralSql} ${table22} on ${joinMeta.on}`
-              );
-            }
-            if (index4 < joins.length - 1) {
-              joinsArray.push(sql` `);
-            }
-          }
-        }
-        const joinsSql = sql.join(joinsArray);
+        const tableSql = this.buildFromTable(table4);
+        const joinsSql = this.buildJoins(joins);
         const whereSql = where ? sql` where ${where}` : void 0;
         const havingSql = having ? sql` having ${having}` : void 0;
         let orderBySql;
@@ -26979,9 +26995,14 @@ var init_update = __esm({
   "../drizzle-orm/dist/pg-core/query-builders/update.js"() {
     "use strict";
     init_entity();
+    init_table2();
     init_query_promise();
+    init_selection_proxy();
+    init_sql();
+    init_subquery();
     init_table();
     init_utils2();
+    init_view_common();
     _a137 = entityKind;
     PgUpdateBuilder = class {
       constructor(table4, session, dialect4, withList) {
@@ -27005,12 +27026,85 @@ var init_update = __esm({
       constructor(table4, set, session, dialect4, withList) {
         super();
         __publicField(this, "config");
+        __publicField(this, "tableName");
+        __publicField(this, "joinsNotNullableMap");
+        __publicField(this, "leftJoin", this.createJoin("left"));
+        __publicField(this, "rightJoin", this.createJoin("right"));
+        __publicField(this, "innerJoin", this.createJoin("inner"));
+        __publicField(this, "fullJoin", this.createJoin("full"));
         __publicField(this, "execute", (placeholderValues) => {
           return this._prepare().execute(placeholderValues);
         });
         this.session = session;
         this.dialect = dialect4;
-        this.config = { set, table: table4, withList };
+        this.config = { set, table: table4, withList, joins: [] };
+        this.tableName = getTableLikeName(table4);
+        this.joinsNotNullableMap = typeof this.tableName === "string" ? { [this.tableName]: true } : {};
+      }
+      from(source) {
+        const tableName = getTableLikeName(source);
+        if (typeof tableName === "string") {
+          this.joinsNotNullableMap[tableName] = true;
+        }
+        this.config.from = source;
+        return this;
+      }
+      getTableLikeFields(table4) {
+        if (is(table4, PgTable)) {
+          return table4[Table2.Symbol.Columns];
+        } else if (is(table4, Subquery)) {
+          return table4._.selectedFields;
+        }
+        return table4[ViewBaseConfig].selectedFields;
+      }
+      createJoin(joinType) {
+        return (table4, on) => {
+          const tableName = getTableLikeName(table4);
+          if (typeof tableName === "string" && this.config.joins.some((join) => join.alias === tableName)) {
+            throw new Error(`Alias "${tableName}" is already used in this query`);
+          }
+          if (typeof on === "function") {
+            const from = this.config.from && !is(this.config.from, SQL) ? this.getTableLikeFields(this.config.from) : void 0;
+            on = on(
+              new Proxy(
+                this.config.table[Table2.Symbol.Columns],
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              ),
+              from && new Proxy(
+                from,
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              )
+            );
+          }
+          this.config.joins.push({ on, table: table4, joinType, alias: tableName });
+          if (typeof tableName === "string") {
+            switch (joinType) {
+              case "left": {
+                this.joinsNotNullableMap[tableName] = false;
+                break;
+              }
+              case "right": {
+                this.joinsNotNullableMap = Object.fromEntries(
+                  Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false])
+                );
+                this.joinsNotNullableMap[tableName] = true;
+                break;
+              }
+              case "inner": {
+                this.joinsNotNullableMap[tableName] = true;
+                break;
+              }
+              case "full": {
+                this.joinsNotNullableMap = Object.fromEntries(
+                  Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false])
+                );
+                this.joinsNotNullableMap[tableName] = false;
+                break;
+              }
+            }
+          }
+          return this;
+        };
       }
       /**
        * Adds a 'where' clause to the query.
@@ -27049,7 +27143,24 @@ var init_update = __esm({
         this.config.where = where;
         return this;
       }
-      returning(fields = this.config.table[Table2.Symbol.Columns]) {
+      returning(fields) {
+        if (!fields) {
+          fields = Object.assign({}, this.config.table[Table2.Symbol.Columns]);
+          if (this.config.from) {
+            const tableName = getTableLikeName(this.config.from);
+            if (typeof tableName === "string" && this.config.from && !is(this.config.from, SQL)) {
+              const fromFields = this.getTableLikeFields(this.config.from);
+              fields[tableName] = fromFields;
+            }
+            for (const join of this.config.joins) {
+              const tableName2 = getTableLikeName(join.table);
+              if (typeof tableName2 === "string" && !is(join.table, SQL)) {
+                const fromFields = this.getTableLikeFields(join.table);
+                fields[tableName2] = fromFields;
+              }
+            }
+          }
+        }
         this.config.returning = orderSelectedFields(fields);
         return this;
       }
@@ -27063,7 +27174,9 @@ var init_update = __esm({
       }
       /** @internal */
       _prepare(name2) {
-        return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name2, true);
+        const query = this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), this.config.returning, name2, true);
+        query.joinsNotNullableMap = this.joinsNotNullableMap;
+        return query;
       }
       prepare(name2) {
         return this._prepare(name2);
@@ -31078,14 +31191,16 @@ var init_dialect2 = __esm({
           return [res];
         }));
       }
-      buildUpdateQuery({ table: table4, set, where, returning, withList, limit, orderBy }) {
+      buildUpdateQuery({ table: table4, set, where, returning, withList, joins, from, limit, orderBy }) {
         const withSql = this.buildWithCTE(withList);
         const setSql = this.buildUpdateSet(table4, set);
+        const fromSql = from && sql.join([sql.raw(" from "), this.buildFromTable(from)]);
+        const joinsSql = this.buildJoins(joins);
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
         const whereSql = where ? sql` where ${where}` : void 0;
         const orderBySql = this.buildOrderBy(orderBy);
         const limitSql = this.buildLimit(limit);
-        return sql`${withSql}update ${table4} set ${setSql}${whereSql}${returningSql}${orderBySql}${limitSql}`;
+        return sql`${withSql}update ${table4} set ${setSql}${fromSql}${joinsSql}${whereSql}${returningSql}${orderBySql}${limitSql}`;
       }
       /**
        * Builds selection SQL with provided fields/expressions
@@ -31138,6 +31253,37 @@ var init_dialect2 = __esm({
         });
         return sql.join(chunks);
       }
+      buildJoins(joins) {
+        if (!joins || joins.length === 0) {
+          return void 0;
+        }
+        const joinsArray = [];
+        if (joins) {
+          for (const [index4, joinMeta] of joins.entries()) {
+            if (index4 === 0) {
+              joinsArray.push(sql` `);
+            }
+            const table4 = joinMeta.table;
+            if (is(table4, SQLiteTable)) {
+              const tableName = table4[SQLiteTable.Symbol.Name];
+              const tableSchema = table4[SQLiteTable.Symbol.Schema];
+              const origTableName = table4[SQLiteTable.Symbol.OriginalName];
+              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
+              joinsArray.push(
+                sql`${sql.raw(joinMeta.joinType)} join ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
+              );
+            } else {
+              joinsArray.push(
+                sql`${sql.raw(joinMeta.joinType)} join ${table4} on ${joinMeta.on}`
+              );
+            }
+            if (index4 < joins.length - 1) {
+              joinsArray.push(sql` `);
+            }
+          }
+        }
+        return sql.join(joinsArray);
+      }
       buildLimit(limit) {
         return typeof limit === "object" || typeof limit === "number" && limit >= 0 ? sql` limit ${limit}` : void 0;
       }
@@ -31153,6 +31299,12 @@ var init_dialect2 = __esm({
         }
         return orderByList.length > 0 ? sql` order by ${sql.join(orderByList)}` : void 0;
       }
+      buildFromTable(table4) {
+        if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
+          return sql`${sql.identifier(table4[Table2.Symbol.OriginalName])} ${sql.identifier(table4[Table2.Symbol.Name])}`;
+        }
+        return table4;
+      }
       buildSelectQuery({
         withList,
         fields,
@@ -31183,38 +31335,8 @@ var init_dialect2 = __esm({
         const withSql = this.buildWithCTE(withList);
         const distinctSql = distinct ? sql` distinct` : void 0;
         const selection = this.buildSelection(fieldsList, { isSingleTable });
-        const tableSql = (() => {
-          if (is(table4, Table2) && table4[Table2.Symbol.OriginalName] !== table4[Table2.Symbol.Name]) {
-            return sql`${sql.identifier(table4[Table2.Symbol.OriginalName])} ${sql.identifier(table4[Table2.Symbol.Name])}`;
-          }
-          return table4;
-        })();
-        const joinsArray = [];
-        if (joins) {
-          for (const [index4, joinMeta] of joins.entries()) {
-            if (index4 === 0) {
-              joinsArray.push(sql` `);
-            }
-            const table22 = joinMeta.table;
-            if (is(table22, SQLiteTable)) {
-              const tableName = table22[SQLiteTable.Symbol.Name];
-              const tableSchema = table22[SQLiteTable.Symbol.Schema];
-              const origTableName = table22[SQLiteTable.Symbol.OriginalName];
-              const alias = tableName === origTableName ? void 0 : joinMeta.alias;
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`} on ${joinMeta.on}`
-              );
-            } else {
-              joinsArray.push(
-                sql`${sql.raw(joinMeta.joinType)} join ${table22} on ${joinMeta.on}`
-              );
-            }
-            if (index4 < joins.length - 1) {
-              joinsArray.push(sql` `);
-            }
-          }
-        }
-        const joinsSql = sql.join(joinsArray);
+        const tableSql = this.buildFromTable(table4);
+        const joinsSql = this.buildJoins(joins);
         const whereSql = where ? sql` where ${where}` : void 0;
         const havingSql = having ? sql` having ${having}` : void 0;
         const groupByList = [];
@@ -32341,8 +32463,11 @@ var init_update2 = __esm({
     init_query_promise();
     init_selection_proxy();
     init_table3();
+    init_subquery();
     init_table();
     init_utils2();
+    init_view_common();
+    init_view_base2();
     _a207 = entityKind;
     SQLiteUpdateBuilder = class {
       constructor(table4, session, dialect4, withList) {
@@ -32367,6 +32492,10 @@ var init_update2 = __esm({
         super();
         /** @internal */
         __publicField(this, "config");
+        __publicField(this, "leftJoin", this.createJoin("left"));
+        __publicField(this, "rightJoin", this.createJoin("right"));
+        __publicField(this, "innerJoin", this.createJoin("inner"));
+        __publicField(this, "fullJoin", this.createJoin("full"));
         __publicField(this, "run", (placeholderValues) => {
           return this._prepare().run(placeholderValues);
         });
@@ -32381,7 +32510,34 @@ var init_update2 = __esm({
         });
         this.session = session;
         this.dialect = dialect4;
-        this.config = { set, table: table4, withList };
+        this.config = { set, table: table4, withList, joins: [] };
+      }
+      from(source) {
+        this.config.from = source;
+        return this;
+      }
+      createJoin(joinType) {
+        return (table4, on) => {
+          const tableName = getTableLikeName(table4);
+          if (typeof tableName === "string" && this.config.joins.some((join) => join.alias === tableName)) {
+            throw new Error(`Alias "${tableName}" is already used in this query`);
+          }
+          if (typeof on === "function") {
+            const from = this.config.from ? is(table4, SQLiteTable) ? table4[Table2.Symbol.Columns] : is(table4, Subquery) ? table4._.selectedFields : is(table4, SQLiteViewBase) ? table4[ViewBaseConfig].selectedFields : void 0 : void 0;
+            on = on(
+              new Proxy(
+                this.config.table[Table2.Symbol.Columns],
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              ),
+              from && new Proxy(
+                from,
+                new SelectionProxyHandler({ sqlAliasedBehavior: "sql", sqlBehavior: "sql" })
+              )
+            );
+          }
+          this.config.joins.push({ on, table: table4, joinType, alias: tableName });
+          return this;
+        };
       }
       /**
        * Adds a 'where' clause to the query.
@@ -35740,7 +35896,7 @@ var init_insert3 = __esm({
       /**
        * Adds an `on duplicate key update` clause to the query.
        *
-       * Calling this method will update update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.
+       * Calling this method will update the row if any unique index conflicts. MySQL will automatically determine the conflict target based on the primary key and unique indexes.
        *
        * See docs: {@link https://orm.drizzle.team/docs/insert#on-duplicate-key-update}
        *
@@ -35775,7 +35931,7 @@ var init_insert3 = __esm({
             returning.push({ field: value, path: [key] });
           }
         }
-        this.config.returning = orderSelectedFields(this.config.table[Table2.Symbol.Columns]);
+        this.config.returning = returning;
         return this;
       }
       /** @internal */

package/bin.cjs

@@ -33614,7 +33614,7 @@ ${sql}
       }
       if (type === "custom") {
         console.log("Prepared empty file for your custom SQL migration!");
-        sql = "-- Custom SQL migration file, put you code below! --";
+        sql = "-- Custom SQL migration file, put your code below! --";
       }
       journal.entries.push({
         idx,
@@ -81593,12 +81593,12 @@ var init_introspect = __esm({
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
+        )}] Your schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
       );
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You relations file is ready \u279C ${source_default.bold.underline.blue(
+        )}] Your relations file is ready \u279C ${source_default.bold.underline.blue(
           relationsFile
         )} \u{1F680}`
       );
@@ -81676,12 +81676,12 @@ var init_introspect = __esm({
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
+        )}] Your schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
       );
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You relations file is ready \u279C ${source_default.bold.underline.blue(
+        )}] Your relations file is ready \u279C ${source_default.bold.underline.blue(
           relationsFile
         )} \u{1F680}`
       );
@@ -81840,12 +81840,12 @@ var init_introspect = __esm({
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
+        )}] Your schema file is ready \u279C ${source_default.bold.underline.blue(schemaFile)} \u{1F680}`
       );
       (0, import_hanji12.render)(
         `[${source_default.green(
           "\u2713"
-        )}] You relations file is ready \u279C ${source_default.bold.underline.blue(
+        )}] Your relations file is ready \u279C ${source_default.bold.underline.blue(
           relationsFile
         )} \u{1F680}`
       );
@@ -89049,7 +89049,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.28.0";
+  const envVersion = "0.28.1-d7e3535";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.28.0",
+	"version": "0.28.1-d7e3535",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",