orchid-orm 1.4.21 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # orchid-orm
 
+## 1.5.0
+
+### Minor Changes
+
+- Change index options: column or expression is required, operator renamed to opclass
+
+### Patch Changes
+
+- f1cd5db: Handle multiple indexes and foreignKeys of the column
+- Updated dependencies
+- Updated dependencies [f1cd5db]
+  - pqb@0.9.0
+
+## 1.4.22
+
+### Patch Changes
+
+- Change inner aspects of columns
+- Updated dependencies
+  - pqb@0.8.5
+
 ## 1.4.21
 
 ### Patch Changes

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, columnTypes, getClonedQueryData, singleQuote, columnsShapeToCode, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, columnDefaultArgumentToCode } from 'pqb';
+import { getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, columnTypes, getClonedQueryData, singleQuote, columnsShapeToCode, codeToString, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, columnIndexesToCode, columnForeignKeysToCode, addCode, columnDefaultArgumentToCode } from 'pqb';
 import * as path from 'path';
 import path__default from 'path';
 import fs from 'fs/promises';
@@ -1727,7 +1727,11 @@ const createTable = async (_a) => {
   ]);
   const tablePath = params.tablePath(ast.name);
   const baseTablePath = getImportPath(tablePath, params.baseTablePath);
-  const props = [`table = ${singleQuote(ast.name)};`];
+  const props = [];
+  if (ast.schema) {
+    props.push(`schema = ${singleQuote(ast.schema)};`);
+  }
+  props.push(`table = ${singleQuote(ast.name)};`);
   if (ast.noPrimaryKey === "ignore") {
     props.push("noPrimaryKey = true;");
   }
@@ -1940,20 +1944,32 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
     }
   }
   const changedProps = {};
+  const replaced = {};
   for (const item of items.reverse()) {
     if (!ts.is.propertyAccess(item.expression))
       continue;
     const { name } = item.expression;
-    const key = name.escapedText.toString();
+    let key = name.escapedText.toString();
+    if (key === "index")
+      key = "indexes";
+    else if (key === "foreignKey")
+      key = "foreignKeys";
     if (!propsToChange[key])
       continue;
-    const value = getColumnMethodArgs(to, key);
-    if (value) {
-      const code = [`${key}(`];
-      addCode(code, value);
-      addCode(code, ")");
-      changes.replace(name.pos, item.end, codeToString(code, "", "  ").trim());
-    } else {
+    let remove = true;
+    if (!replaced[key]) {
+      const code = getColumnMethodArgs(to, key);
+      if (code) {
+        changes.replace(
+          item.expression.expression.end,
+          item.end,
+          codeToString(code, spaces + "  ", "  ").trim()
+        );
+        replaced[key] = true;
+        remove = false;
+      }
+    }
+    if (remove) {
       changes.remove(item.expression.expression.end, item.end);
     }
     changedProps[key] = true;
@@ -1962,12 +1978,9 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
   for (const key in propsToChange) {
     if (changedProps[key])
       continue;
-    const value = getColumnMethodArgs(to, key);
-    if (value !== void 0) {
-      const code = [`.${key}(`];
-      addCode(code, value);
-      addCode(code, ")");
-      append += codeToString(code, "", "  ").trim();
+    const code = getColumnMethodArgs(to, key);
+    if (code) {
+      append += codeToString(code, spaces + "  ", "  ").trim();
     }
   }
   if (append) {
@@ -2022,15 +2035,22 @@ const getColumnMethodArgs = (to, key) => {
   const value = to[key];
   if (!value)
     return;
+  if (key === "indexes") {
+    return columnIndexesToCode(value);
+  }
+  if (key === "foreignKeys") {
+    return columnForeignKeysToCode(value);
+  }
+  const code = [`.${key}(`];
   if (key === "collate" || key === "compression") {
-    return singleQuote(value);
+    addCode(code, singleQuote(value));
   } else if (key === "default") {
-    return columnDefaultArgumentToCode(value);
-  } else if (key === "nullable" || key === "primaryKey") {
-    return "";
-  } else {
+    addCode(code, columnDefaultArgumentToCode(value));
+  } else if (key !== "nullable" && key !== "primaryKey") {
     return;
   }
+  addCode(code, ")");
+  return code;
 };
 const dropMatchingIndexes = (context, prop, i, call, items) => {
   if (!items.length)
@@ -2170,17 +2190,38 @@ const renameTable = async (_a) => {
   const changes = new FileChanges(content);
   const statements = ts.getStatements(content);
   const className = toPascalCase(ast.from);
+  const changeSchema = ast.fromSchema !== ast.toSchema;
   for (const node of ts.class.iterate(statements)) {
     if (((_a2 = node.name) == null ? void 0 : _a2.escapedText) !== className)
       continue;
+    const addSchema = changeSchema && ast.toSchema && !node.members.some((member) => ts.prop.getName(member) === "schema");
+    if (addSchema && ast.toSchema) {
+      changes.add(
+        node.members.pos,
+        `
+  schema = ${singleQuote(ast.toSchema)};`
+      );
+    }
     for (const member of node.members) {
       const name = ts.prop.getName(member);
-      if (name !== "table")
+      if (name !== "table" && !(changeSchema && name === "schema"))
         continue;
       const { initializer: value } = member;
       if (!value)
         continue;
-      changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      if (name === "schema") {
+        if (ast.toSchema) {
+          changes.replace(
+            value.pos,
+            value.end,
+            ` ${singleQuote(ast.toSchema)}`
+          );
+        } else {
+          changes.remove(member.pos, member.end);
+        }
+      } else {
+        changes.replace(value.pos, value.end, ` ${singleQuote(ast.to)}`);
+      }
     }
   }
   await fs.writeFile(params.tablePath(ast.to), changes.apply());