pqb 0.47.4 → 0.47.5

package/dist/index.js

@@ -563,7 +563,7 @@ const indexInnerToCode = (index, t) => {
   if (columnsMultiline) {
     const objects = [];
     for (const column of index.columns) {
-      const expr = "column" in column ? column.column : column.expression;
+      const expr = "expression" in column ? column.expression : column.column;
       let hasOptions2 = false;
       for (const key in column) {
         if (key !== "column") {
@@ -574,7 +574,7 @@ const indexInnerToCode = (index, t) => {
         objects.push(`${orchidCore.singleQuote(expr)},`);
       } else {
         const props = [
-          `${"column" in column ? "column" : "expression"}: ${orchidCore.singleQuote(
+          `${"expression" in column ? "expression" : "column"}: ${orchidCore.singleQuote(
             expr
           )},`
         ];
@@ -644,9 +644,11 @@ const excludeInnerToCode = (item, t) => {
   const hasOptions = optionsKeys.some((key) => key && item.options[key]);
   const objects = [];
   for (const column of item.columns) {
-    const expr = "column" in column ? column.column : column.expression;
+    const expr = "expression" in column ? column.expression : column.column;
     const props = [
-      `${"column" in column ? "column" : "expression"}: ${orchidCore.singleQuote(expr)},`
+      `${"expression" in column ? "expression" : "column"}: ${orchidCore.singleQuote(
+        expr
+      )},`
     ];
     for (const key of columnOptions) {
       const value = column[key];
@@ -768,12 +770,14 @@ const foreignKeyArgumentToCode = ({
 const columnIndexesToCode = (items) => {
   const code = [];
   for (const { options, name } of items) {
-    orchidCore.addCode(code, `.${options.unique ? "unique" : "index"}(`);
+    orchidCore.addCode(
+      code,
+      `.${options.unique ? "unique" : "index"}(${name ? `${orchidCore.singleQuote(name)}` : ""}`
+    );
     const arr = [
       options.collate && `collate: ${orchidCore.singleQuote(options.collate)},`,
       options.opclass && `opclass: ${orchidCore.singleQuote(options.opclass)},`,
       options.order && `order: ${orchidCore.singleQuote(options.order)},`,
-      name && `name: ${orchidCore.singleQuote(name)},`,
       options.using && `using: ${orchidCore.singleQuote(options.using)},`,
       options.include && `include: ${typeof options.include === "string" ? orchidCore.singleQuote(options.include) : `[${options.include.map(orchidCore.singleQuote).join(", ")}]`},`,
       options.nullsNotDistinct && `nullsNotDistinct: true,`,
@@ -782,7 +786,7 @@ const columnIndexesToCode = (items) => {
       options.where && `where: ${orchidCore.singleQuote(options.where)},`
     ].filter((x) => !!x);
     if (arr.length) {
-      orchidCore.addCode(code, "{");
+      orchidCore.addCode(code, name ? `, {` : "{");
       orchidCore.addCode(code, arr);
       orchidCore.addCode(code, "}");
     }