drizzle-kit 0.30.1-c095ebc → 0.30.1-e6823b4

package/api.js

@@ -24999,14 +24999,20 @@ function relationsFilterToSQL(table5, filter2) {
   return and(...parts);
 }
 function relationsOrderToSQL(table5, orders) {
-  const data = typeof orders === "function" ? orders(table5[Columns], orderByOperators) : orders;
-  return is(data, SQL) ? data : Array.isArray(data) ? data.length ? sql.join(data.map((o) => is(o, SQL) ? o : asc(o)), sql`, `) : void 0 : asc(data);
+  if (typeof orders === "function") {
+    const data = orders(table5, orderByOperators);
+    return is(data, SQL) ? data : Array.isArray(data) ? data.length ? sql.join(data.map((o) => is(o, SQL) ? o : asc(o)), sql`, `) : void 0 : is(data, Column2) ? asc(data) : void 0;
+  }
+  const entries = Object.entries(orders).filter(([_2, value]) => value);
+  if (!entries.length)
+    return void 0;
+  return sql.join(entries.map(([column5, value]) => (value === "asc" ? asc : desc)(table5[Columns][column5])), sql`, `);
 }
 function relationExtrasToSQL(table5, extras) {
   const subqueries = [];
   const selection = [];
   for (const [key, extra] of Object.entries(
-    typeof extras === "function" ? extras(table5[Columns], { sql: operators.sql }) : extras
+    typeof extras === "function" ? extras(table5, { sql: operators.sql }) : extras
   )) {
     if (!extra)
       continue;
@@ -25189,7 +25195,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.targetTable = targetTable;
       }
     };
-    __publicField(Relation, _a119, "Relation");
+    __publicField(Relation, _a119, "RelationV2");
     One = class extends (_b95 = Relation, _a120 = entityKind, _b95) {
       constructor(targetTable, config) {
         super(targetTable);
@@ -25205,7 +25211,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.optional = config?.optional ?? false;
       }
     };
-    __publicField(One, _a120, "One");
+    __publicField(One, _a120, "OneV2");
     Many = class extends (_b96 = Relation, _a121 = entityKind, _b96) {
       constructor(targetTable, config) {
         super(targetTable);
@@ -25220,7 +25226,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         }
       }
     };
-    __publicField(Many, _a121, "Many");
+    __publicField(Many, _a121, "ManyV2");
     _a122 = entityKind;
     AggregatedField = class {
       constructor() {
@@ -26070,11 +26076,9 @@ var init_dialect = __esm({
           const columnIdentifiers = [];
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               columnIdentifiers.push(
                 sql`${table5[Columns][k]} as ${sql.identifier(k)}`
@@ -32211,11 +32215,9 @@ var init_dialect2 = __esm({
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               selectedColumns.push({
                 column: table5[Columns][k],
@@ -32831,7 +32833,7 @@ var init_dialect2 = __esm({
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const relationFilter = relationToSQL(relation, table5, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
@@ -37713,11 +37715,9 @@ var init_dialect3 = __esm({
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               selectedColumns.push({
                 column: table5[Columns][k],

package/api.mjs

@@ -25004,14 +25004,20 @@ function relationsFilterToSQL(table5, filter2) {
   return and(...parts);
 }
 function relationsOrderToSQL(table5, orders) {
-  const data = typeof orders === "function" ? orders(table5[Columns], orderByOperators) : orders;
-  return is(data, SQL) ? data : Array.isArray(data) ? data.length ? sql.join(data.map((o) => is(o, SQL) ? o : asc(o)), sql`, `) : void 0 : asc(data);
+  if (typeof orders === "function") {
+    const data = orders(table5, orderByOperators);
+    return is(data, SQL) ? data : Array.isArray(data) ? data.length ? sql.join(data.map((o) => is(o, SQL) ? o : asc(o)), sql`, `) : void 0 : is(data, Column2) ? asc(data) : void 0;
+  }
+  const entries = Object.entries(orders).filter(([_2, value]) => value);
+  if (!entries.length)
+    return void 0;
+  return sql.join(entries.map(([column5, value]) => (value === "asc" ? asc : desc)(table5[Columns][column5])), sql`, `);
 }
 function relationExtrasToSQL(table5, extras) {
   const subqueries = [];
   const selection = [];
   for (const [key, extra] of Object.entries(
-    typeof extras === "function" ? extras(table5[Columns], { sql: operators.sql }) : extras
+    typeof extras === "function" ? extras(table5, { sql: operators.sql }) : extras
   )) {
     if (!extra)
       continue;
@@ -25194,7 +25200,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.targetTable = targetTable;
       }
     };
-    __publicField(Relation, _a119, "Relation");
+    __publicField(Relation, _a119, "RelationV2");
     One = class extends (_b95 = Relation, _a120 = entityKind, _b95) {
       constructor(targetTable, config) {
         super(targetTable);
@@ -25210,7 +25216,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         this.optional = config?.optional ?? false;
       }
     };
-    __publicField(One, _a120, "One");
+    __publicField(One, _a120, "OneV2");
     Many = class extends (_b96 = Relation, _a121 = entityKind, _b96) {
       constructor(targetTable, config) {
         super(targetTable);
@@ -25225,7 +25231,7 @@ Hint: you can specify "alias" on both sides of the relation with the same value`
         }
       }
     };
-    __publicField(Many, _a121, "Many");
+    __publicField(Many, _a121, "ManyV2");
     _a122 = entityKind;
     AggregatedField = class {
       constructor() {
@@ -26075,11 +26081,9 @@ var init_dialect = __esm({
           const columnIdentifiers = [];
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               columnIdentifiers.push(
                 sql`${table5[Columns][k]} as ${sql.identifier(k)}`
@@ -32216,11 +32220,9 @@ var init_dialect2 = __esm({
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               selectedColumns.push({
                 column: table5[Columns][k],
@@ -32836,7 +32838,7 @@ var init_dialect2 = __esm({
               }
               const relation = tableConfig.relations[k];
               const isSingle2 = is(relation, One);
-              const targetTable = relation.targetTable;
+              const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
               const relationFilter = relationToSQL(relation, table5, targetTable);
               const innerQuery = this.buildRelationalQuery({
                 table: targetTable,
@@ -37718,11 +37720,9 @@ var init_dialect3 = __esm({
           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 === void 0)
+              continue;
+            colSelectionMode = colSelectionMode || v;
             if (v) {
               selectedColumns.push({
                 column: table5[Columns][k],

package/bin.cjs

@@ -92611,7 +92611,7 @@ init_utils5();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.30.1-c095ebc";
+  const envVersion = "0.30.1-e6823b4";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

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