orchid-orm 1.25.3 → 1.26.1

package/dist/migrations.js

@@ -899,7 +899,7 @@ const changePrimaryKey = (columnsPrimaryKey, {
   changeTableAst: { shape, add, drop }
 }) => {
   var _a;
-  const tablePrimaryKey = codeTable.internal.primaryKey;
+  const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
   const primaryKey = [
     .../* @__PURE__ */ new Set([...columnsPrimaryKey, ...(_a = tablePrimaryKey == null ? void 0 : tablePrimaryKey.columns) != null ? _a : []])
   ];
@@ -908,13 +908,13 @@ const changePrimaryKey = (columnsPrimaryKey, {
       (key) => !checkForColumnChange(shape, key)
     );
     if (toDrop == null ? void 0 : toDrop.length) {
-      drop.primaryKey = { columns: toDrop, options: dbPrimaryKey == null ? void 0 : dbPrimaryKey.options };
+      drop.primaryKey = { columns: toDrop, name: dbPrimaryKey == null ? void 0 : dbPrimaryKey.name };
     }
     const toAdd = primaryKey.filter((key) => !checkForColumnChange(shape, key));
     if (toAdd.length) {
       add.primaryKey = {
         columns: toAdd,
-        options: tablePrimaryKey == null ? void 0 : tablePrimaryKey.options
+        name: tablePrimaryKey == null ? void 0 : tablePrimaryKey.name
       };
     }
   }
@@ -924,16 +924,16 @@ const renamePrimaryKey = (ast, {
   dbTableData: { primaryKey: dbPrimaryKey },
   schema
 }) => {
-  var _a, _b, _c, _d, _e, _f;
-  const tablePrimaryKey = codeTable.internal.primaryKey;
-  if (dbPrimaryKey && tablePrimaryKey && ((_a = dbPrimaryKey == null ? void 0 : dbPrimaryKey.options) == null ? void 0 : _a.name) !== ((_b = tablePrimaryKey == null ? void 0 : tablePrimaryKey.options) == null ? void 0 : _b.name)) {
+  var _a, _b;
+  const tablePrimaryKey = codeTable.internal.tableData.primaryKey;
+  if (dbPrimaryKey && tablePrimaryKey && (dbPrimaryKey == null ? void 0 : dbPrimaryKey.name) !== (tablePrimaryKey == null ? void 0 : tablePrimaryKey.name)) {
     ast.push({
       type: "renameTableItem",
       kind: "CONSTRAINT",
       tableSchema: schema,
       tableName: codeTable.table,
-      from: (_d = (_c = dbPrimaryKey.options) == null ? void 0 : _c.name) != null ? _d : `${codeTable.table}_pkey`,
-      to: (_f = (_e = tablePrimaryKey.options) == null ? void 0 : _e.name) != null ? _f : `${codeTable}_pkey`
+      from: (_a = dbPrimaryKey.name) != null ? _a : `${codeTable.table}_pkey`,
+      to: (_b = tablePrimaryKey.name) != null ? _b : `${codeTable}_pkey`
     });
   }
 };
@@ -1085,17 +1085,21 @@ const collectCodeIndexes = ({
     codeIndexes.push(
       ...column.data.indexes.map(
         (_b) => {
-          var _c = _b, { collate, opclass, order, weight } = _c, options = __objRest(_c, ["collate", "opclass", "order", "weight"]);
-          return {
+          var _c = _b, {
+            options: _d
+          } = _c, _e = _d, { collate, opclass, order, weight } = _e, options = __objRest(_e, ["collate", "opclass", "order", "weight"]), index = __objRest(_c, [
+            "options"
+          ]);
+          return __spreadValues$3({
             columns: [{ collate, opclass, order, weight, column: name }],
             options
-          };
+          }, index);
         }
       )
     );
   }
-  if (codeTable.internal.indexes) {
-    codeIndexes.push(...codeTable.internal.indexes);
+  if (codeTable.internal.tableData.indexes) {
+    codeIndexes.push(...codeTable.internal.tableData.indexes);
   }
   return codeIndexes;
 };
@@ -1104,14 +1108,15 @@ const collectCodeComparableIndexes = (codeIndexes) => {
     normalizeIndex(codeIndex.options);
     return indexToComparable(__spreadProps$3(__spreadValues$3({}, codeIndex.options), {
       include: codeIndex.options.include === void 0 ? void 0 : orchidCore.toArray(codeIndex.options.include),
-      columns: codeIndex.columns
+      columns: codeIndex.columns,
+      name: codeIndex.name
     }));
   });
 };
 const normalizeIndex = (index) => {
   if (index.using === "btree")
     index.using = void 0;
-  if (index.unique === false)
+  if (!index.unique)
     index.unique = void 0;
   if (index.nullsNotDistinct === false)
     index.nullsNotDistinct = void 0;
@@ -1180,7 +1185,8 @@ const handleIndexChange = (ast, { changeTableAst, schema, codeTable }, dbIndex,
   if (!found) {
     ((_b = (_a = changeTableAst.drop).indexes) != null ? _b : _a.indexes = []).push({
       columns: dbColumns,
-      options: dbIndex
+      options: dbIndex,
+      name: dbIndex.name === rakeDb.getIndexName(changeTableAst.name, dbColumns) ? void 0 : dbIndex.name
     });
   } else if (rename) {
     ast.push({
@@ -1290,21 +1296,17 @@ const collectCodeFkeys = ({ codeTable, changeTableAst: { shape } }, currentSchem
       continue;
     codeForeignKeys.push(
       ...column.data.foreignKeys.map((x) => {
+        var _a2;
         const columns = [name];
         const references = {
           columns,
-          fnOrTable: fnOrTableToString("fn" in x ? x.fn : x.table),
-          foreignColumns: x.columns,
-          options: {
-            name: x.name,
-            match: x.match,
-            onUpdate: x.onUpdate,
-            onDelete: x.onDelete
-          }
+          fnOrTable: fnOrTableToString(x.fnOrTable),
+          foreignColumns: x.foreignColumns,
+          options: x.options
         };
         return parseForeignKey(
           {
-            name: x.name,
+            name: (_a2 = x.options) == null ? void 0 : _a2.name,
             references
           },
           references,
@@ -1313,8 +1315,8 @@ const collectCodeFkeys = ({ codeTable, changeTableAst: { shape } }, currentSchem
       })
     );
   }
-  if (codeTable.internal.constraints) {
-    for (const constraint of codeTable.internal.constraints) {
+  if (codeTable.internal.tableData.constraints) {
+    for (const constraint of codeTable.internal.tableData.constraints) {
       const { references } = constraint;
       if (!references)
         continue;
@@ -1378,13 +1380,7 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
   if (!hasDbChecks) {
     if (codeChecks.length) {
       ((_a = add.constraints) != null ? _a : add.constraints = []).push(
-        ...codeChecks.map((check) => {
-          var _a2;
-          return {
-            name: (_a2 = check.options) == null ? void 0 : _a2.name,
-            check: check.sql
-          };
-        })
+        ...codeChecks.map((check) => ({ check: check.sql, name: check.name }))
       );
     }
     return;
@@ -1417,13 +1413,10 @@ const processChecks = (ast, changeTableData, compareExpressions) => {
           if (--wait === 0 && !changeTableData.pushedAst) {
             changeTableData.pushedAst = true;
             ((_a2 = add.constraints) != null ? _a2 : add.constraints = []).push(
-              ...codeChecks.filter((_, i) => !foundCodeChecks.has(i)).map((check) => {
-                var _a3;
-                return {
-                  name: (_a3 = check.options) == null ? void 0 : _a3.name,
-                  check: check.sql
-                };
-              })
+              ...codeChecks.filter((_, i) => !foundCodeChecks.has(i)).map((check) => ({
+                name: check.name,
+                check: check.sql
+              }))
             );
             ast.push(changeTableData.changeTableAst);
           }
@@ -1449,11 +1442,11 @@ const collectCodeChecks = ({
       continue;
     codeChecks.push(column.data.check);
   }
-  if (codeTable.internal.constraints) {
-    for (const constraint of codeTable.internal.constraints) {
+  if (codeTable.internal.tableData.constraints) {
+    for (const constraint of codeTable.internal.tableData.constraints) {
       const { check } = constraint;
       if (check) {
-        codeChecks.push({ sql: check, options: { name: constraint.name } });
+        codeChecks.push({ sql: check, name: constraint.name });
       }
     }
   }
@@ -1711,16 +1704,15 @@ const addChangeTable = (dbStructure, changeTables, tableShapes, currentSchema, d
   tableShapes[`${schema}.${codeTable.table}`] = shape;
 };
 const createTableAst = (currentSchema, table) => {
-  return __spreadProps$2(__spreadValues$2({
+  return __spreadValues$2({
     type: "table",
     action: "create",
     schema: table.q.schema === currentSchema ? void 0 : table.q.schema,
     comment: table.internal.comment,
     name: table.table,
-    shape: makeTableShape(table)
-  }, table.internal), {
+    shape: makeTableShape(table),
     noPrimaryKey: table.internal.noPrimaryKey ? "ignore" : "error"
-  });
+  }, table.internal.tableData);
 };
 const makeTableShape = (table) => {
   const shape = {};
@@ -1803,7 +1795,11 @@ const verifyMigration = async (adapter, config, migrationCode, generateMigration
       });
       const { log } = config;
       config.log = false;
-      const db = rakeDb.createMigrationInterface(trx, true, config);
+      const db = rakeDb.createMigrationInterface(
+        trx,
+        true,
+        config
+      );
       config.log = log;
       for (const changeFn of changeFns) {
         await changeFn(db, true);
@@ -1903,8 +1899,8 @@ const report = (ast, config, currentSchema) => {
               inner.push(
                 `${change.type === "add" ? green("+ add column") : red("- drop column")} ${name} ${(_h = column.data.alias) != null ? _h : getColumnDbType(column, currentSchema)}${column.data.isNullable ? " nullable" : ""}${primaryKey ? " primary key" : ""}${foreignKeys ? ` references ${foreignKeys.map((fk) => {
                   return `${fnOrTableToString(
-                    "fn" in fk ? fk.fn : fk.table
-                  )}(${fk.columns.join(", ")})`;
+                    fk.fnOrTable
+                  )}(${fk.foreignColumns.join(", ")})`;
                 }).join(", ")}` : ""}${(indexes == null ? void 0 : indexes.length) ? indexes.length === 1 ? ", has index" : `, has ${indexes.length} indexes` : ""}${check ? `, checks ${check.sql.toSQL({ values: [] })}` : ""}`
               );
             } else if (change.type === "change") {
@@ -2428,8 +2424,10 @@ const processHasAndBelongsToManyColumn = (column, habtmTables, codeItems) => {
     shape[key] = column2;
   }
   joinTable.shape = shape;
-  joinTable.internal.primaryKey = {
-    columns: Object.keys(shape)
+  joinTable.internal.tableData = {
+    primaryKey: {
+      columns: Object.keys(shape)
+    }
   };
   joinTable.internal.noPrimaryKey = false;
   codeItems.tables.push(joinTable);
@@ -2494,6 +2492,7 @@ const getTableInfosAndFKeys = (asts, config) => {
   return { tableInfos, fkeys };
 };
 const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs) => {
+  var _a, _b;
   const tableInfo = tableInfos[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
   const imports = {
     "orchid-orm": "Selectable, Insertable, Updatable",
@@ -2510,11 +2509,18 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   if (ast.noPrimaryKey === "ignore") {
     props.push("noPrimaryKey = true;");
   }
+  const hasTableData = Boolean(
+    ast.primaryKey || ((_a = ast.indexes) == null ? void 0 : _a.length) || ((_b = ast.constraints) == null ? void 0 : _b.length)
+  );
+  const shapeCode = pqb.columnsShapeToCode(ast.shape, "t");
   props.push(
-    "columns = this.setColumns((t) => ({",
-    pqb.columnsShapeToCode(ast.shape, ast, "t"),
-    "}));"
+    `columns = this.setColumns(${hasTableData ? "\n    " : ""}(t) => ({`,
+    hasTableData ? [shapeCode] : shapeCode,
+    hasTableData ? "  })," : "}));"
   );
+  if (hasTableData) {
+    props.push(pqb.pushTableDataCode([], ast), ");");
+  }
   const relations = [];
   const fullTableName = ast.schema ? `${ast.schema}.${ast.name}` : ast.name;
   const belongsTo = fkeys[fullTableName];