orchid-orm 1.6.33 → 1.6.35

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, getClonedQueryData, columnsShapeToCode, primaryKeyToCode, indexToCode, constraintToCode, columnIndexesToCode, columnForeignKeysToCode, columnCheckToCode } from 'pqb';
+import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Db, Adapter, anyShape, getClonedQueryData, columnsShapeToCode, primaryKeyToCode, indexToCode, constraintToCode, columnIndexesToCode, columnForeignKeysToCode, columnCheckToCode, identityToCode } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes } from 'pqb';
-import { snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode } from 'orchid-core';
+import { snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode, deepCompare } from 'orchid-core';
 import * as path from 'path';
 import path__default from 'path';
 import fs from 'fs/promises';
@@ -1999,7 +1999,7 @@ const removeProp = ({ props, changes }, prop, i) => {
 };
 const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
   const { from, to } = changeItem;
-  if (from.type !== to.type && to.column) {
+  if ((from.type !== to.type || !!from.identity !== !!to.identity) && to.column) {
     changes.replace(
       prop.initializer.pos,
       prop.end,
@@ -2039,7 +2039,10 @@ const changeColumn = ({ changes, t, spaces }, changeItem, prop) => {
       continue;
     let remove = true;
     if (!replaced[key]) {
-      const code = getColumnMethodArgs(t, to, key);
+      let code = getColumnMethodArgs(t, to, key, to.type);
+      if (!code && key === "identity" && to.type) {
+        code = [`.${to.type}()`];
+      }
       if (code) {
         changes.replace(
           item.expression.expression.end,
@@ -2116,7 +2119,7 @@ ${spaces}`);
     }
   }
 };
-const getColumnMethodArgs = (t, to, key) => {
+const getColumnMethodArgs = (t, to, key, dataType) => {
   const value = to[key];
   if (!value)
     return;
@@ -2129,6 +2132,11 @@ const getColumnMethodArgs = (t, to, key) => {
   if (key === "check") {
     return [columnCheckToCode(t, value)];
   }
+  if (key === "identity") {
+    const code2 = identityToCode(value, dataType);
+    code2[0] = `.${code2[0]}`;
+    return code2;
+  }
   const code = [`.${key}(`];
   if (key === "collate" || key === "compression") {
     addCode(code, singleQuote(value));
@@ -2298,40 +2306,6 @@ const collectObjectFromCode = (node) => {
   }
   return object;
 };
-const deepCompare = (a, b) => {
-  if (typeof a !== typeof b) {
-    if (a === void 0 && typeof b === "object") {
-      a = emptyObject;
-    } else if (typeof a === "object" && b === void 0) {
-      b = emptyObject;
-    } else {
-      return false;
-    }
-  }
-  if (a === b)
-    return true;
-  if (typeof a === "object") {
-    if (a === null)
-      return b === null;
-    if (Array.isArray(a)) {
-      if (!Array.isArray(b) || a.length !== b.length)
-        return false;
-      return a.every((item, i) => deepCompare(item, b[i]));
-    }
-    for (const key in a) {
-      if (!deepCompare(
-        a[key],
-        b[key]
-      ))
-        return false;
-    }
-    for (const key in b) {
-      if (!(key in a))
-        return false;
-    }
-  }
-  return true;
-};
 
 var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
 var __hasOwnProp$2 = Object.prototype.hasOwnProperty;