orchid-orm 1.76.1 → 1.76.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -340,6 +340,8 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
|
|
|
340
340
|
}
|
|
341
341
|
const dbData = dbColumn.data;
|
|
342
342
|
const codeData = codeColumn.data;
|
|
343
|
+
const dbColumnData = maybeArrayDbColumn.data;
|
|
344
|
+
const codeColumnData = maybeArrayCodeColumn.data;
|
|
343
345
|
for (const key of ["isNullable", "comment"]) if (dbData[key] !== codeData[key]) return "change";
|
|
344
346
|
for (const key of [
|
|
345
347
|
"maxChars",
|
|
@@ -356,26 +358,26 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
|
|
|
356
358
|
if (i === -1 || codeColumn.dataType.slice(i + 1, -1) !== `${typmod}`) return "change";
|
|
357
359
|
}
|
|
358
360
|
}
|
|
359
|
-
if (!deepCompare(
|
|
361
|
+
if (!deepCompare(dbColumnData.identity, codeColumnData.identity ? {
|
|
360
362
|
always: false,
|
|
361
363
|
start: 1,
|
|
362
364
|
increment: 1,
|
|
363
365
|
cache: 1,
|
|
364
366
|
cycle: false,
|
|
365
|
-
...
|
|
367
|
+
...codeColumnData.identity ?? {}
|
|
366
368
|
} : void 0)) return "change";
|
|
367
|
-
if (
|
|
369
|
+
if (dbColumnData.default === void 0 !== (codeColumnData.default === void 0)) {
|
|
368
370
|
const valuesBeforeLen = compareSql.values.length;
|
|
369
|
-
const dbDefault = encodeColumnDefault(
|
|
370
|
-
const codeDefault = encodeColumnDefault(
|
|
371
|
+
const dbDefault = encodeColumnDefault(dbColumnData.default, compareSql.values, maybeArrayDbColumn);
|
|
372
|
+
const codeDefault = encodeColumnDefault(codeColumnData.default, compareSql.values, maybeArrayCodeColumn);
|
|
371
373
|
compareSql.values.length = valuesBeforeLen;
|
|
372
374
|
if (dbDefault !== codeDefault) return "change";
|
|
373
375
|
}
|
|
374
|
-
if (
|
|
376
|
+
if (dbColumnData.default !== void 0 && codeColumnData.default !== void 0) {
|
|
375
377
|
const valuesBeforeLen = compareSql.values.length;
|
|
376
|
-
const dbDefault = encodeColumnDefault(
|
|
378
|
+
const dbDefault = encodeColumnDefault(dbColumnData.default, compareSql.values, maybeArrayDbColumn);
|
|
377
379
|
const dbValues = compareSql.values.slice(valuesBeforeLen);
|
|
378
|
-
const codeDefault = encodeColumnDefault(
|
|
380
|
+
const codeDefault = encodeColumnDefault(codeColumnData.default, compareSql.values, maybeArrayCodeColumn);
|
|
379
381
|
const codeValues = compareSql.values.slice(valuesBeforeLen);
|
|
380
382
|
if (dbValues.length !== codeValues.length || dbValues.length && JSON.stringify(dbValues) !== JSON.stringify(codeValues)) {
|
|
381
383
|
compareSql.values.length = valuesBeforeLen;
|
|
@@ -1002,6 +1004,7 @@ const normalizeItem = (item) => {
|
|
|
1002
1004
|
if (item.using) item.using = item.using.toLowerCase();
|
|
1003
1005
|
if (item.using === "btree") item.using = void 0;
|
|
1004
1006
|
if (!item.unique) item.unique = void 0;
|
|
1007
|
+
if (!item.deferrable) item.deferrable = void 0;
|
|
1005
1008
|
if (item.nullsNotDistinct === false) item.nullsNotDistinct = void 0;
|
|
1006
1009
|
if (item.exclude) for (let i = 0; i < item.columns.length; i++) item.columns[i].with = item.exclude[i];
|
|
1007
1010
|
return item;
|