drizzle-kit 0.30.3 → 0.30.4

package/api.js

@@ -22115,7 +22115,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.39.0";
+    version = "0.39.1";
   }
 });
 
@@ -22398,7 +22398,7 @@ var init_sql = __esm({
             const schemaName = chunk[Table2.Symbol.Schema];
             const tableName = chunk[Table2.Symbol.Name];
             return {
-              sql: schemaName === void 0 ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
+              sql: schemaName === void 0 || chunk[IsAlias] ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
               params: []
             };
           }
@@ -22417,7 +22417,7 @@ var init_sql = __esm({
             const schemaName = chunk[ViewBaseConfig].schema;
             const viewName = chunk[ViewBaseConfig].name;
             return {
-              sql: schemaName === void 0 ? escapeName(viewName) : escapeName(schemaName) + "." + escapeName(viewName),
+              sql: schemaName === void 0 || chunk[ViewBaseConfig].isAlias ? escapeName(viewName) : escapeName(schemaName) + "." + escapeName(viewName),
               params: []
             };
           }
@@ -32463,7 +32463,7 @@ var init_dialect2 = __esm({
         const withSql = this.buildWithCTE(withList);
         const valuesSql = sql.join(valuesSqlList);
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-        const onConflictSql = onConflict ? sql` on conflict ${onConflict}` : void 0;
+        const onConflictSql = onConflict?.length ? sql.join(onConflict) : void 0;
         return sql`${withSql}insert into ${table5} ${insertOrder} ${valuesSql}${onConflictSql}${returningSql}`;
       }
       sqlToQuery(sql2, invokeSource) {
@@ -33570,12 +33570,14 @@ var init_insert2 = __esm({
        * ```
        */
       onConflictDoNothing(config = {}) {
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         if (config.target === void 0) {
-          this.config.onConflict = sql`do nothing`;
+          this.config.onConflict.push(sql` on conflict do nothing`);
         } else {
           const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
           const whereSql = config.where ? sql` where ${config.where}` : sql``;
-          this.config.onConflict = sql`${targetSql} do nothing${whereSql}`;
+          this.config.onConflict.push(sql` on conflict ${targetSql} do nothing${whereSql}`);
         }
         return this;
       }
@@ -33614,12 +33616,16 @@ var init_insert2 = __esm({
             'You cannot use both "where" and "targetWhere"/"setWhere" at the same time - "where" is deprecated, use "targetWhere" or "setWhere" instead.'
           );
         }
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         const whereSql = config.where ? sql` where ${config.where}` : void 0;
         const targetWhereSql = config.targetWhere ? sql` where ${config.targetWhere}` : void 0;
         const setWhereSql = config.setWhere ? sql` where ${config.setWhere}` : void 0;
         const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
         const setSql = this.dialect.buildUpdateSet(this.config.table, mapUpdateSet(this.config.table, config.set));
-        this.config.onConflict = sql`${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`;
+        this.config.onConflict.push(
+          sql` on conflict ${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`
+        );
         return this;
       }
       /** @internal */

package/api.mjs

@@ -22120,7 +22120,7 @@ var version;
 var init_version = __esm({
   "../drizzle-orm/dist/version.js"() {
     "use strict";
-    version = "0.39.0";
+    version = "0.39.1";
   }
 });
 
@@ -22403,7 +22403,7 @@ var init_sql = __esm({
             const schemaName = chunk[Table2.Symbol.Schema];
             const tableName = chunk[Table2.Symbol.Name];
             return {
-              sql: schemaName === void 0 ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
+              sql: schemaName === void 0 || chunk[IsAlias] ? escapeName(tableName) : escapeName(schemaName) + "." + escapeName(tableName),
               params: []
             };
           }
@@ -22422,7 +22422,7 @@ var init_sql = __esm({
             const schemaName = chunk[ViewBaseConfig].schema;
             const viewName = chunk[ViewBaseConfig].name;
             return {
-              sql: schemaName === void 0 ? escapeName(viewName) : escapeName(schemaName) + "." + escapeName(viewName),
+              sql: schemaName === void 0 || chunk[ViewBaseConfig].isAlias ? escapeName(viewName) : escapeName(schemaName) + "." + escapeName(viewName),
               params: []
             };
           }
@@ -32468,7 +32468,7 @@ var init_dialect2 = __esm({
         const withSql = this.buildWithCTE(withList);
         const valuesSql = sql.join(valuesSqlList);
         const returningSql = returning ? sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
-        const onConflictSql = onConflict ? sql` on conflict ${onConflict}` : void 0;
+        const onConflictSql = onConflict?.length ? sql.join(onConflict) : void 0;
         return sql`${withSql}insert into ${table5} ${insertOrder} ${valuesSql}${onConflictSql}${returningSql}`;
       }
       sqlToQuery(sql2, invokeSource) {
@@ -33575,12 +33575,14 @@ var init_insert2 = __esm({
        * ```
        */
       onConflictDoNothing(config = {}) {
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         if (config.target === void 0) {
-          this.config.onConflict = sql`do nothing`;
+          this.config.onConflict.push(sql` on conflict do nothing`);
         } else {
           const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
           const whereSql = config.where ? sql` where ${config.where}` : sql``;
-          this.config.onConflict = sql`${targetSql} do nothing${whereSql}`;
+          this.config.onConflict.push(sql` on conflict ${targetSql} do nothing${whereSql}`);
         }
         return this;
       }
@@ -33619,12 +33621,16 @@ var init_insert2 = __esm({
             'You cannot use both "where" and "targetWhere"/"setWhere" at the same time - "where" is deprecated, use "targetWhere" or "setWhere" instead.'
           );
         }
+        if (!this.config.onConflict)
+          this.config.onConflict = [];
         const whereSql = config.where ? sql` where ${config.where}` : void 0;
         const targetWhereSql = config.targetWhere ? sql` where ${config.targetWhere}` : void 0;
         const setWhereSql = config.setWhere ? sql` where ${config.setWhere}` : void 0;
         const targetSql = Array.isArray(config.target) ? sql`${config.target}` : sql`${[config.target]}`;
         const setSql = this.dialect.buildUpdateSet(this.config.table, mapUpdateSet(this.config.table, config.set));
-        this.config.onConflict = sql`${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`;
+        this.config.onConflict.push(
+          sql` on conflict ${targetSql}${targetWhereSql} do update set ${setSql}${whereSql}${setWhereSql}`
+        );
         return this;
       }
       /** @internal */

package/bin.cjs

@@ -70965,7 +70965,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("int")) {
         const isUnsigned = lowered.startsWith("int unsigned");
         const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: int(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: int(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
@@ -70973,7 +70973,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("tinyint")) {
         const isUnsigned = lowered.startsWith("tinyint unsigned");
         const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: tinyint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: tinyint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
@@ -70981,7 +70981,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("smallint")) {
         const isUnsigned = lowered.startsWith("smallint unsigned");
         const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: smallint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: smallint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
@@ -70989,7 +70989,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("mediumint")) {
         const isUnsigned = lowered.startsWith("mediumint unsigned");
         const columnName = dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: mediumint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: mediumint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
@@ -71239,7 +71239,8 @@ import { sql } from "drizzle-orm"
         let idxKey = it.name.startsWith(tableName) && it.name !== tableName ? it.name.slice(tableName.length + 1) : it.name;
         idxKey = idxKey.endsWith("_index") ? idxKey.slice(0, -"_index".length) + "_idx" : idxKey;
         idxKey = casing2(idxKey);
-        statement += `		${idxKey}: `;
+        statement += `
+	`;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `"${it.name}")`;
         statement += `.on(${it.columns.map((it2) => `table.${casing2(it2)}`).join(", ")}),`;
@@ -72404,7 +72405,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("int")) {
         const isUnsigned = lowered.includes("unsigned");
         const columnName = dbColumnName4({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: int(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: int(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
         return out;
@@ -72412,7 +72413,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("tinyint")) {
         const isUnsigned = lowered.includes("unsigned");
         const columnName = dbColumnName4({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: tinyint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: tinyint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
         return out;
@@ -72420,7 +72421,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("smallint")) {
         const isUnsigned = lowered.includes("unsigned");
         const columnName = dbColumnName4({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: smallint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: smallint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
         return out;
@@ -72428,7 +72429,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("mediumint")) {
         const isUnsigned = lowered.includes("unsigned");
         const columnName = dbColumnName4({ name, casing: rawCasing, withMode: isUnsigned });
-        let out = `${casing2(name)}: mediumint(${columnName}${isUnsigned ? `${columnName.length > 0 ? ", " : ""}{ unsigned: true }` : ""})`;
+        let out = `${casing2(name)}: mediumint(${columnName}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault4(defaultValue, isExpression)})` : "";
         return out;
@@ -79541,7 +79542,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.3";
+  const envVersion = "0.30.4";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

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