drizzle-kit 0.28.0 → 0.28.1

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;
@@ -35735,7 +35739,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 +35774,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;
@@ -35740,7 +35744,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 +35779,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";
   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",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",