orchid-orm 1.6.14 → 1.6.16

package/dist/index.js

@@ -450,7 +450,7 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
       return (query2) => {
         const fromQuery = query2.clone();
         fromQuery.query.select = fromQuerySelect;
-        relationQuery.query.fromQuery = fromQuery;
+        relationQuery.query.values = { from: fromQuery };
       };
     }
   };
@@ -646,7 +646,7 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
       return (query2) => {
         const fromQuery = query2.clone();
         fromQuery.query.select = fromQuerySelect;
-        relationQuery.query.fromQuery = fromQuery;
+        relationQuery.query.values = { from: fromQuery };
       };
     }
   };
@@ -1823,7 +1823,7 @@ const createTable = async (_a) => {
   ];
   await fs__default["default"].mkdir(path__default["default"].dirname(tablePath), { recursive: true });
   try {
-    await fs__default["default"].writeFile(tablePath, pqb.codeToString(code, "", "  "), { flag: "wx" });
+    await fs__default["default"].writeFile(tablePath, orchidCore.codeToString(code, "", "  "), { flag: "wx" });
     logger == null ? void 0 : logger.log(`Created ${orchidCore.pathToLog(tablePath)}`);
   } catch (err) {
     if (err.code !== "EEXIST") {
@@ -2006,7 +2006,7 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
     changes.replace(
       prop.initializer.pos,
       prop.end,
-      ` ${pqb.codeToString(to.column.toCode(t), spaces + "  ", "  ").trim()}`
+      ` ${orchidCore.codeToString(to.column.toCode(t), spaces + "  ", "  ").trim()}`
     );
     return;
   }
@@ -2047,7 +2047,7 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
         changes.replace(
           item.expression.expression.end,
           item.end,
-          pqb.codeToString(code, spaces + "  ", "  ").trim()
+          orchidCore.codeToString(code, spaces + "  ", "  ").trim()
         );
         replaced[key] = true;
         remove = false;
@@ -2064,7 +2064,7 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
       continue;
     const code = getColumnMethodArgs(t, to, key);
     if (code) {
-      append += pqb.codeToString(code, spaces + "  ", "  ").trim();
+      append += orchidCore.codeToString(code, spaces + "  ", "  ").trim();
     }
   }
   if (append) {
@@ -2088,7 +2088,7 @@ const addColumns = ({
 }) => {
   const end = object.end - 1;
   for (const key in add) {
-    const code = pqb.codeToString(add[key].toCode(t), spaces + "  ", "  ");
+    const code = orchidCore.codeToString(add[key].toCode(t), spaces + "  ", "  ");
     changes.add(end, `  ${orchidCore.quoteObjectKey(key)}: ${code.trim()},
 ${spaces}`);
   }
@@ -2096,7 +2096,7 @@ ${spaces}`);
 const addTableData = ({ add, changes, object, t, spaces }) => {
   const end = object.end - 1;
   if (add.primaryKey) {
-    const code = pqb.codeToString(
+    const code = orchidCore.codeToString(
       pqb.primaryKeyToCode(add.primaryKey, t),
       spaces,
       "  "
@@ -2105,12 +2105,12 @@ const addTableData = ({ add, changes, object, t, spaces }) => {
 ${spaces}`);
   }
   for (const item of add.indexes) {
-    const code = pqb.codeToString(pqb.indexToCode(item, t), spaces + "  ", "  ");
+    const code = orchidCore.codeToString(pqb.indexToCode(item, t), spaces + "  ", "  ");
     changes.add(end, `  ${code.trim()}
 ${spaces}`);
   }
   for (const item of add.foreignKeys) {
-    const code = pqb.codeToString(pqb.foreignKeyToCode(item, t), spaces + "  ", "  ");
+    const code = orchidCore.codeToString(pqb.foreignKeyToCode(item, t), spaces + "  ", "  ");
     changes.add(end, `  ${code.trim()}
 ${spaces}`);
   }
@@ -2132,7 +2132,7 @@ const getColumnMethodArgs = (t, to, key) => {
   if (key === "collate" || key === "compression") {
     orchidCore.addCode(code, orchidCore.singleQuote(value));
   } else if (key === "default") {
-    orchidCore.addCode(code, pqb.columnDefaultArgumentToCode(t, value));
+    orchidCore.addCode(code, orchidCore.columnDefaultArgumentToCode(t, value));
   } else if (key !== "nullable" && key !== "primaryKey") {
     return;
   }