@payloadcms/drizzle 3.0.0-canary.b8dd0db → 3.0.0-canary.bb00d64

package/dist/postgres/schema/createIndex.d.ts

@@ -1,11 +1,10 @@
 import type { GenericColumn } from '../types.js';
 type CreateIndexArgs = {
-    columnName: string;
+    indexName: string;
     name: string | string[];
-    tableName: string;
     unique?: boolean;
 };
-export declare const createIndex: ({ name, columnName, tableName, unique }: CreateIndexArgs) => (table: {
+export declare const createIndex: ({ name, indexName, unique }: CreateIndexArgs) => (table: {
     [x: string]: GenericColumn;
 }) => import("drizzle-orm/pg-core").IndexBuilder;
 export {};

package/dist/postgres/schema/createIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createIndex.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/createIndex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,WAAW,4CAA6C,eAAe,aACnE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,+CAc9C,CAAA"}
+{"version":3,"file":"createIndex.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/createIndex.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IACvB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,WAAW,gCAAiC,eAAe,aACvD;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE,+CAe9C,CAAA"}

package/dist/postgres/schema/createIndex.js

@@ -1,5 +1,5 @@
 import { index, uniqueIndex } from 'drizzle-orm/pg-core';
-export const createIndex = ({ name, columnName, tableName, unique })=>{
+export const createIndex = ({ name, indexName, unique })=>{
     return (table)=>{
         let columns;
         if (Array.isArray(name)) {
@@ -10,8 +10,10 @@ export const createIndex = ({ name, columnName, tableName, unique })=>{
                 table[name]
             ];
         }
-        if (unique) return uniqueIndex(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1));
-        return index(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1));
+        if (unique) {
+            return uniqueIndex(indexName).on(columns[0], ...columns.slice(1));
+        }
+        return index(indexName).on(columns[0], ...columns.slice(1));
     };
 };
 

package/dist/postgres/schema/createIndex.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/postgres/schema/createIndex.ts"],"sourcesContent":["import { index, uniqueIndex } from 'drizzle-orm/pg-core'\n\nimport type { GenericColumn } from '../types.js'\n\ntype CreateIndexArgs = {\n  columnName: string\n  name: string | string[]\n  tableName: string\n  unique?: boolean\n}\n\nexport const createIndex = ({ name, columnName, tableName, unique }: CreateIndexArgs) => {\n  return (table: { [x: string]: GenericColumn }) => {\n    let columns\n    if (Array.isArray(name)) {\n      columns = name\n        .map((columnName) => table[columnName])\n        // exclude fields were included in compound indexes but do not exist on the table\n        .filter((col) => typeof col !== 'undefined')\n    } else {\n      columns = [table[name]]\n    }\n    if (unique)\n      return uniqueIndex(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))\n    return index(`${tableName}_${columnName}_idx`).on(columns[0], ...columns.slice(1))\n  }\n}\n"],"names":["index","uniqueIndex","createIndex","name","columnName","tableName","unique","table","columns","Array","isArray","map","filter","col","on","slice"],"mappings":"AAAA,SAASA,KAAK,EAAEC,WAAW,QAAQ,sBAAqB;AAWxD,OAAO,MAAMC,cAAc,CAAC,EAAEC,IAAI,EAAEC,UAAU,EAAEC,SAAS,EAAEC,MAAM,EAAmB;IAClF,OAAO,CAACC;QACN,IAAIC;QACJ,IAAIC,MAAMC,OAAO,CAACP,OAAO;YACvBK,UAAUL,KACPQ,GAAG,CAAC,CAACP,aAAeG,KAAK,CAACH,WAAW,CACtC,iFAAiF;aAChFQ,MAAM,CAAC,CAACC,MAAQ,OAAOA,QAAQ;QACpC,OAAO;YACLL,UAAU;gBAACD,KAAK,CAACJ,KAAK;aAAC;QACzB;QACA,IAAIG,QACF,OAAOL,YAAY,CAAC,EAAEI,UAAU,CAAC,EAAED,WAAW,IAAI,CAAC,EAAEU,EAAE,CAACN,OAAO,CAAC,EAAE,KAAKA,QAAQO,KAAK,CAAC;QACvF,OAAOf,MAAM,CAAC,EAAEK,UAAU,CAAC,EAAED,WAAW,IAAI,CAAC,EAAEU,EAAE,CAACN,OAAO,CAAC,EAAE,KAAKA,QAAQO,KAAK,CAAC;IACjF;AACF,EAAC"}
+{"version":3,"sources":["../../../src/postgres/schema/createIndex.ts"],"sourcesContent":["import { index, uniqueIndex } from 'drizzle-orm/pg-core'\n\nimport type { GenericColumn } from '../types.js'\n\ntype CreateIndexArgs = {\n  indexName: string\n  name: string | string[]\n  unique?: boolean\n}\n\nexport const createIndex = ({ name, indexName, unique }: CreateIndexArgs) => {\n  return (table: { [x: string]: GenericColumn }) => {\n    let columns\n    if (Array.isArray(name)) {\n      columns = name\n        .map((columnName) => table[columnName])\n        // exclude fields were included in compound indexes but do not exist on the table\n        .filter((col) => typeof col !== 'undefined')\n    } else {\n      columns = [table[name]]\n    }\n    if (unique) {\n      return uniqueIndex(indexName).on(columns[0], ...columns.slice(1))\n    }\n    return index(indexName).on(columns[0], ...columns.slice(1))\n  }\n}\n"],"names":["index","uniqueIndex","createIndex","name","indexName","unique","table","columns","Array","isArray","map","columnName","filter","col","on","slice"],"mappings":"AAAA,SAASA,KAAK,EAAEC,WAAW,QAAQ,sBAAqB;AAUxD,OAAO,MAAMC,cAAc,CAAC,EAAEC,IAAI,EAAEC,SAAS,EAAEC,MAAM,EAAmB;IACtE,OAAO,CAACC;QACN,IAAIC;QACJ,IAAIC,MAAMC,OAAO,CAACN,OAAO;YACvBI,UAAUJ,KACPO,GAAG,CAAC,CAACC,aAAeL,KAAK,CAACK,WAAW,CACtC,iFAAiF;aAChFC,MAAM,CAAC,CAACC,MAAQ,OAAOA,QAAQ;QACpC,OAAO;YACLN,UAAU;gBAACD,KAAK,CAACH,KAAK;aAAC;QACzB;QACA,IAAIE,QAAQ;YACV,OAAOJ,YAAYG,WAAWU,EAAE,CAACP,OAAO,CAAC,EAAE,KAAKA,QAAQQ,KAAK,CAAC;QAChE;QACA,OAAOf,MAAMI,WAAWU,EAAE,CAACP,OAAO,CAAC,EAAE,KAAKA,QAAQQ,KAAK,CAAC;IAC1D;AACF,EAAC"}

package/dist/postgres/schema/geometryColumn.d.ts

@@ -0,0 +1,12 @@
+type Point = [number, number];
+export declare const geometryColumn: (name: string) => import("drizzle-orm/pg-core").PgCustomColumnBuilder<{
+    name: string;
+    dataType: "custom";
+    columnType: "PgCustomColumn";
+    data: Point;
+    driverParam: string;
+    enumValues: undefined;
+    generated: undefined;
+}>;
+export {};
+//# sourceMappingURL=geometryColumn.d.ts.map

package/dist/postgres/schema/geometryColumn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometryColumn.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/geometryColumn.ts"],"names":[],"mappings":"AAMA,KAAK,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAE7B,eAAO,MAAM,cAAc,SAAU,MAAM;;;;;;;;EAWjC,CAAA"}

package/dist/postgres/schema/geometryColumn.js

@@ -0,0 +1,18 @@
+// Uses custom one instead of geometry() from drizzle-orm/pg-core because it's broken on pushDevSchema
+// Why?
+// It tries to give us a prompt "you're about to change.. from geometry(Point) to geometry(point)"
+import { customType } from 'drizzle-orm/pg-core';
+import { parseEWKB } from 'drizzle-orm/pg-core/columns/postgis_extension/utils';
+export const geometryColumn = (name)=>customType({
+        dataType () {
+            return `geometry(Point)`;
+        },
+        fromDriver (value) {
+            return parseEWKB(value);
+        },
+        toDriver (value) {
+            return `SRID=4326;point(${value[0]} ${value[1]})`;
+        }
+    })(name);
+
+//# sourceMappingURL=geometryColumn.js.map

package/dist/postgres/schema/geometryColumn.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/postgres/schema/geometryColumn.ts"],"sourcesContent":["// Uses custom one instead of geometry() from drizzle-orm/pg-core because it's broken on pushDevSchema\n// Why?\n// It tries to give us a prompt \"you're about to change.. from geometry(Point) to geometry(point)\"\nimport { customType } from 'drizzle-orm/pg-core'\nimport { parseEWKB } from 'drizzle-orm/pg-core/columns/postgis_extension/utils'\n\ntype Point = [number, number]\n\nexport const geometryColumn = (name: string) =>\n  customType<{ data: Point; driverData: string }>({\n    dataType() {\n      return `geometry(Point)`\n    },\n    fromDriver(value: string) {\n      return parseEWKB(value)\n    },\n    toDriver(value: Point) {\n      return `SRID=4326;point(${value[0]} ${value[1]})`\n    },\n  })(name)\n"],"names":["customType","parseEWKB","geometryColumn","name","dataType","fromDriver","value","toDriver"],"mappings":"AAAA,sGAAsG;AACtG,OAAO;AACP,kGAAkG;AAClG,SAASA,UAAU,QAAQ,sBAAqB;AAChD,SAASC,SAAS,QAAQ,sDAAqD;AAI/E,OAAO,MAAMC,iBAAiB,CAACC,OAC7BH,WAAgD;QAC9CI;YACE,OAAO,CAAC,eAAe,CAAC;QAC1B;QACAC,YAAWC,KAAa;YACtB,OAAOL,UAAUK;QACnB;QACAC,UAASD,KAAY;YACnB,OAAO,CAAC,gBAAgB,EAAEA,KAAK,CAAC,EAAE,CAAC,CAAC,EAAEA,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD;IACF,GAAGH,MAAK"}

package/dist/postgres/schema/traverseFields.d.ts

@@ -6,6 +6,7 @@ type Args = {
     columnPrefix?: string;
     columns: Record<string, PgColumnBuilder>;
     disableNotNull: boolean;
+    disableRelsTableUnique?: boolean;
     disableUnique?: boolean;
     fieldPrefix?: string;
     fields: (Field | TabAsField)[];
@@ -15,12 +16,18 @@ type Args = {
     localesIndexes: Record<string, (cols: GenericColumns) => IndexBuilder>;
     newTableName: string;
     parentTableName: string;
-    relationsToBuild: RelationMap;
     relationships: Set<string>;
+    relationsToBuild: RelationMap;
     rootRelationsToBuild?: RelationMap;
     rootTableIDColType: string;
     rootTableName: string;
+    uniqueRelationships: Set<string>;
     versions: boolean;
+    /**
+     * Tracks whether or not this table is built
+     * from the result of a localized array or block field at some point
+     */
+    withinLocalizedArrayOrBlock?: boolean;
 };
 type Result = {
     hasLocalizedField: boolean;
@@ -30,6 +37,6 @@ type Result = {
     hasManyNumberField: 'index' | boolean;
     hasManyTextField: 'index' | boolean;
 };
-export declare const traverseFields: ({ adapter, columnPrefix, columns, disableNotNull, disableUnique, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationsToBuild, relationships, rootRelationsToBuild, rootTableIDColType, rootTableName, versions, }: Args) => Result;
+export declare const traverseFields: ({ adapter, columnPrefix, columns, disableNotNull, disableRelsTableUnique, disableUnique, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, uniqueRelationships, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

package/dist/postgres/schema/traverseFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAqBhD,OAAO,KAAK,EAEV,mBAAmB,EACnB,cAAc,EAEd,WAAW,EACZ,MAAM,aAAa,CAAA;AAWpB,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACxC,cAAc,EAAE,OAAO,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,YAAY,CAAC,CAAA;IAC/D,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,YAAY,CAAC,CAAA;IACtE,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,WAAW,CAAA;IAC7B,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,oBAAoB,CAAC,EAAE,WAAW,CAAA;IAClC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,iBAAiB,EAAE,OAAO,CAAA;IAC1B,2BAA2B,EAAE,OAAO,CAAA;IACpC,yBAAyB,EAAE,OAAO,CAAA;IAClC,6BAA6B,EAAE,OAAO,CAAA;IACtC,kBAAkB,EAAE,OAAO,GAAG,OAAO,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,cAAc,wRAoBxB,IAAI,KAAG,MA+rBT,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../../src/postgres/schema/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,KAAK,EAAE,KAAK,EAAkB,UAAU,EAAE,MAAM,SAAS,CAAA;AAsBhE,OAAO,KAAK,EAEV,mBAAmB,EACnB,cAAc,EAEd,WAAW,EACZ,MAAM,aAAa,CAAA;AAapB,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,mBAAmB,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IACxC,cAAc,EAAE,OAAO,CAAA;IACvB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,YAAY,CAAC,CAAA;IAC/D,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC/C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,YAAY,CAAC,CAAA;IACtE,YAAY,EAAE,MAAM,CAAA;IACpB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,gBAAgB,EAAE,WAAW,CAAA;IAC7B,oBAAoB,CAAC,EAAE,WAAW,CAAA;IAClC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAChC,QAAQ,EAAE,OAAO,CAAA;IACjB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAA;CACtC,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,iBAAiB,EAAE,OAAO,CAAA;IAC1B,2BAA2B,EAAE,OAAO,CAAA;IACpC,yBAAyB,EAAE,OAAO,CAAA;IAClC,6BAA6B,EAAE,OAAO,CAAA;IACtC,kBAAkB,EAAE,OAAO,GAAG,OAAO,CAAA;IACrC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAA;CACpC,CAAA;AAED,eAAO,MAAM,cAAc,kWAuBxB,IAAI,KAAG,MA21BT,CAAA"}

package/dist/postgres/schema/traverseFields.js

@@ -1,17 +1,19 @@
 import { relations } from 'drizzle-orm';
-import { PgNumericBuilder, PgUUIDBuilder, PgVarcharBuilder, boolean, foreignKey, index, integer, jsonb, numeric, text, timestamp, varchar } from 'drizzle-orm/pg-core';
+import { boolean, foreignKey, index, integer, jsonb, numeric, PgNumericBuilder, PgUUIDBuilder, PgVarcharBuilder, text, timestamp, varchar } from 'drizzle-orm/pg-core';
 import { InvalidConfiguration } from 'payload';
-import { fieldAffectsData, optionIsObject } from 'payload/shared';
+import { fieldAffectsData, fieldIsVirtual, optionIsObject } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
 import { createTableName } from '../../createTableName.js';
+import { buildIndexName } from '../../utilities/buildIndexName.js';
 import { hasLocalesTable } from '../../utilities/hasLocalesTable.js';
 import { validateExistingBlockIsIdentical } from '../../utilities/validateExistingBlockIsIdentical.js';
 import { buildTable } from './build.js';
 import { createIndex } from './createIndex.js';
+import { geometryColumn } from './geometryColumn.js';
 import { idToUUID } from './idToUUID.js';
 import { parentIDColumnMap } from './parentIDColumnMap.js';
 import { withDefault } from './withDefault.js';
-export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull, disableUnique = false, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationsToBuild, relationships, rootRelationsToBuild, rootTableIDColType, rootTableName, versions })=>{
+export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull, disableRelsTableUnique, disableUnique = false, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, uniqueRelationships, versions, withinLocalizedArrayOrBlock })=>{
     const throwValidationError = true;
     let hasLocalizedField = false;
     let hasLocalizedRelationshipField = false;
@@ -20,11 +22,22 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
     let hasManyNumberField = false;
     let hasLocalizedManyNumberField = false;
     let parentIDColType = 'integer';
-    if (columns.id instanceof PgUUIDBuilder) parentIDColType = 'uuid';
-    if (columns.id instanceof PgNumericBuilder) parentIDColType = 'numeric';
-    if (columns.id instanceof PgVarcharBuilder) parentIDColType = 'varchar';
+    if (columns.id instanceof PgUUIDBuilder) {
+        parentIDColType = 'uuid';
+    }
+    if (columns.id instanceof PgNumericBuilder) {
+        parentIDColType = 'numeric';
+    }
+    if (columns.id instanceof PgVarcharBuilder) {
+        parentIDColType = 'varchar';
+    }
     fields.forEach((field)=>{
-        if ('name' in field && field.name === 'id') return;
+        if ('name' in field && field.name === 'id') {
+            return;
+        }
+        if (fieldIsVirtual(field)) {
+            return;
+        }
         let columnName;
         let fieldName;
         let targetTable = columns;
@@ -39,14 +52,14 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                 targetTable = localesColumns;
                 targetIndexes = localesIndexes;
             }
-            if ((field.unique || field.index) && ![
-                'array',
-                'blocks',
-                'group',
-                'point',
+            if ((field.unique || field.index || [
                 'relationship',
                 'upload'
-            ].includes(field.type) && !('hasMany' in field && field.hasMany === true)) {
+            ].includes(field.type)) && ![
+                'array',
+                'blocks',
+                'group'
+            ].includes(field.type) && !('hasMany' in field && field.hasMany === true) && !('relationTo' in field && Array.isArray(field.relationTo))) {
                 const unique = disableUnique !== true && field.unique;
                 if (unique) {
                     const constraintValue = `${fieldPrefix || ''}${field.name}`;
@@ -55,10 +68,16 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     }
                     adapter.fieldConstraints[rootTableName][`${columnName}_idx`] = constraintValue;
                 }
-                targetIndexes[`${newTableName}_${field.name}Idx`] = createIndex({
-                    name: fieldName,
-                    columnName,
-                    tableName: newTableName,
+                const indexName = buildIndexName({
+                    name: `${newTableName}_${columnName}`,
+                    adapter
+                });
+                targetIndexes[indexName] = createIndex({
+                    name: field.localized ? [
+                        fieldName,
+                        '_locale'
+                    ] : fieldName,
+                    indexName,
                     unique
                 });
             }
@@ -67,7 +86,8 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
             case 'text':
                 {
                     if (field.hasMany) {
-                        if (field.localized) {
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                        if (isLocalized) {
                             hasLocalizedManyTextField = true;
                         }
                         if (field.index) {
@@ -93,7 +113,8 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
             case 'number':
                 {
                     if (field.hasMany) {
-                        if (field.localized) {
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                        if (isLocalized) {
                             hasLocalizedManyNumberField = true;
                         }
                         if (field.index) {
@@ -126,6 +147,10 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                 }
             case 'point':
                 {
+                    targetTable[fieldName] = withDefault(geometryColumn(columnName), field);
+                    if (!adapter.extensions.postgis) {
+                        adapter.extensions.postgis = true;
+                    }
                     break;
                 }
             case 'radio':
@@ -172,7 +197,8 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 }).onDelete('cascade'),
                             parentIdx: (cols)=>index(`${selectTableName}_parent_idx`).on(cols.parent)
                         };
-                        if (field.localized) {
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                        if (isLocalized) {
                             baseColumns.locale = adapter.enums.enum__locales('locale').notNull();
                             baseExtraConfig.localeIdx = (cols)=>index(`${selectTableName}_locale_idx`).on(cols.locale);
                         }
@@ -208,7 +234,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 })
                             }));
                     } else {
-                        targetTable[fieldName] = withDefault(adapter.enums[enumName](fieldName), field);
+                        targetTable[fieldName] = withDefault(adapter.enums[enumName](columnName), field);
                     }
                     break;
                 }
@@ -245,29 +271,46 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             }).onDelete('cascade'),
                         _parentIDIdx: (cols)=>index(`${arrayTableName}_parent_id_idx`).on(cols._parentID)
                     };
-                    if (field.localized && adapter.payload.config.localization) {
+                    const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                    if (isLocalized) {
                         baseColumns._locale = adapter.enums.enum__locales('_locale').notNull();
                         baseExtraConfig._localeIdx = (cols)=>index(`${arrayTableName}_locale_idx`).on(cols._locale);
                     }
-                    const { hasManyNumberField: subHasManyNumberField, hasManyTextField: subHasManyTextField, relationsToBuild: subRelationsToBuild } = buildTable({
+                    const { hasLocalizedManyNumberField: subHasLocalizedManyNumberField, hasLocalizedManyTextField: subHasLocalizedManyTextField, hasLocalizedRelationshipField: subHasLocalizedRelationshipField, hasManyNumberField: subHasManyNumberField, hasManyTextField: subHasManyTextField, relationsToBuild: subRelationsToBuild } = buildTable({
                         adapter,
                         baseColumns,
                         baseExtraConfig,
                         disableNotNull: disableNotNullFromHere,
+                        disableRelsTableUnique: true,
                         disableUnique,
                         fields: disableUnique ? idToUUID(field.fields) : field.fields,
-                        rootRelationsToBuild,
                         rootRelationships: relationships,
+                        rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
+                        rootUniqueRelationships: uniqueRelationships,
                         tableName: arrayTableName,
-                        versions
+                        versions,
+                        withinLocalizedArrayOrBlock: isLocalized
                     });
+                    if (subHasLocalizedManyNumberField) {
+                        hasLocalizedManyNumberField = subHasLocalizedManyNumberField;
+                    }
+                    if (subHasLocalizedRelationshipField) {
+                        hasLocalizedRelationshipField = subHasLocalizedRelationshipField;
+                    }
+                    if (subHasLocalizedManyTextField) {
+                        hasLocalizedManyTextField = subHasLocalizedManyTextField;
+                    }
                     if (subHasManyTextField) {
-                        if (!hasManyTextField || subHasManyTextField === 'index') hasManyTextField = subHasManyTextField;
+                        if (!hasManyTextField || subHasManyTextField === 'index') {
+                            hasManyTextField = subHasManyTextField;
+                        }
                     }
                     if (subHasManyNumberField) {
-                        if (!hasManyNumberField || subHasManyNumberField === 'index') hasManyNumberField = subHasManyNumberField;
+                        if (!hasManyNumberField || subHasManyNumberField === 'index') {
+                            hasManyNumberField = subHasManyNumberField;
+                        }
                     }
                     relationsToBuild.set(fieldName, {
                         type: 'many',
@@ -335,7 +378,6 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             };
                             const baseExtraConfig = {
                                 _orderIdx: (cols)=>index(`${blockTableName}_order_idx`).on(cols._order),
-                                _parentIDIdx: (cols)=>index(`${blockTableName}_parent_id_idx`).on(cols._parentID),
                                 _parentIdFk: (cols)=>foreignKey({
                                         name: `${blockTableName}_parent_id_fk`,
                                         columns: [
@@ -345,31 +387,49 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                             adapter.tables[rootTableName].id
                                         ]
                                     }).onDelete('cascade'),
+                                _parentIDIdx: (cols)=>index(`${blockTableName}_parent_id_idx`).on(cols._parentID),
                                 _pathIdx: (cols)=>index(`${blockTableName}_path_idx`).on(cols._path)
                             };
-                            if (field.localized && adapter.payload.config.localization) {
+                            const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                            if (isLocalized) {
                                 baseColumns._locale = adapter.enums.enum__locales('_locale').notNull();
                                 baseExtraConfig._localeIdx = (cols)=>index(`${blockTableName}_locale_idx`).on(cols._locale);
                             }
-                            const { hasManyNumberField: subHasManyNumberField, hasManyTextField: subHasManyTextField, relationsToBuild: subRelationsToBuild } = buildTable({
+                            const { hasLocalizedManyNumberField: subHasLocalizedManyNumberField, hasLocalizedManyTextField: subHasLocalizedManyTextField, hasLocalizedRelationshipField: subHasLocalizedRelationshipField, hasManyNumberField: subHasManyNumberField, hasManyTextField: subHasManyTextField, relationsToBuild: subRelationsToBuild } = buildTable({
                                 adapter,
                                 baseColumns,
                                 baseExtraConfig,
                                 disableNotNull: disableNotNullFromHere,
+                                disableRelsTableUnique: true,
                                 disableUnique,
                                 fields: disableUnique ? idToUUID(block.fields) : block.fields,
-                                rootRelationsToBuild,
                                 rootRelationships: relationships,
+                                rootRelationsToBuild,
                                 rootTableIDColType,
                                 rootTableName,
+                                rootUniqueRelationships: uniqueRelationships,
                                 tableName: blockTableName,
-                                versions
+                                versions,
+                                withinLocalizedArrayOrBlock: isLocalized
                             });
+                            if (subHasLocalizedManyNumberField) {
+                                hasLocalizedManyNumberField = subHasLocalizedManyNumberField;
+                            }
+                            if (subHasLocalizedRelationshipField) {
+                                hasLocalizedRelationshipField = subHasLocalizedRelationshipField;
+                            }
+                            if (subHasLocalizedManyTextField) {
+                                hasLocalizedManyTextField = subHasLocalizedManyTextField;
+                            }
                             if (subHasManyTextField) {
-                                if (!hasManyTextField || subHasManyTextField === 'index') hasManyTextField = subHasManyTextField;
+                                if (!hasManyTextField || subHasManyTextField === 'index') {
+                                    hasManyTextField = subHasManyTextField;
+                                }
                             }
                             if (subHasManyNumberField) {
-                                if (!hasManyNumberField || subHasManyNumberField === 'index') hasManyNumberField = subHasManyNumberField;
+                                if (!hasManyNumberField || subHasManyNumberField === 'index') {
+                                    hasManyNumberField = subHasManyNumberField;
+                                }
                             }
                             adapter.relations[`relations_${blockTableName}`] = relations(adapter.tables[blockTableName], ({ many, one })=>{
                                 const result = {
@@ -446,19 +506,33 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             localesIndexes,
                             newTableName,
                             parentTableName,
-                            relationsToBuild,
                             relationships,
+                            relationsToBuild,
                             rootRelationsToBuild,
                             rootTableIDColType,
                             rootTableName,
-                            versions
+                            uniqueRelationships,
+                            versions,
+                            withinLocalizedArrayOrBlock
                         });
-                        if (groupHasLocalizedField) hasLocalizedField = true;
-                        if (groupHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                        if (groupHasManyTextField) hasManyTextField = true;
-                        if (groupHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                        if (groupHasManyNumberField) hasManyNumberField = true;
-                        if (groupHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                        if (groupHasLocalizedField) {
+                            hasLocalizedField = true;
+                        }
+                        if (groupHasLocalizedRelationshipField) {
+                            hasLocalizedRelationshipField = true;
+                        }
+                        if (groupHasManyTextField) {
+                            hasManyTextField = true;
+                        }
+                        if (groupHasLocalizedManyTextField) {
+                            hasLocalizedManyTextField = true;
+                        }
+                        if (groupHasManyNumberField) {
+                            hasManyNumberField = true;
+                        }
+                        if (groupHasLocalizedManyNumberField) {
+                            hasLocalizedManyNumberField = true;
+                        }
                         break;
                     }
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
@@ -476,19 +550,33 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         localesIndexes,
                         newTableName: `${parentTableName}_${columnName}`,
                         parentTableName,
-                        relationsToBuild,
                         relationships,
+                        relationsToBuild,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
-                        versions
+                        uniqueRelationships,
+                        versions,
+                        withinLocalizedArrayOrBlock: withinLocalizedArrayOrBlock || field.localized
                     });
-                    if (groupHasLocalizedField) hasLocalizedField = true;
-                    if (groupHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                    if (groupHasManyTextField) hasManyTextField = true;
-                    if (groupHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                    if (groupHasManyNumberField) hasManyNumberField = true;
-                    if (groupHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                    if (groupHasLocalizedField) {
+                        hasLocalizedField = true;
+                    }
+                    if (groupHasLocalizedRelationshipField) {
+                        hasLocalizedRelationshipField = true;
+                    }
+                    if (groupHasManyTextField) {
+                        hasManyTextField = true;
+                    }
+                    if (groupHasLocalizedManyTextField) {
+                        hasLocalizedManyTextField = true;
+                    }
+                    if (groupHasManyNumberField) {
+                        hasManyNumberField = true;
+                    }
+                    if (groupHasLocalizedManyNumberField) {
+                        hasLocalizedManyNumberField = true;
+                    }
                     break;
                 }
             case 'tabs':
@@ -511,19 +599,33 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         localesIndexes,
                         newTableName,
                         parentTableName,
-                        relationsToBuild,
                         relationships,
+                        relationsToBuild,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
-                        versions
+                        uniqueRelationships,
+                        versions,
+                        withinLocalizedArrayOrBlock
                     });
-                    if (tabHasLocalizedField) hasLocalizedField = true;
-                    if (tabHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                    if (tabHasManyTextField) hasManyTextField = true;
-                    if (tabHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                    if (tabHasManyNumberField) hasManyNumberField = true;
-                    if (tabHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                    if (tabHasLocalizedField) {
+                        hasLocalizedField = true;
+                    }
+                    if (tabHasLocalizedRelationshipField) {
+                        hasLocalizedRelationshipField = true;
+                    }
+                    if (tabHasManyTextField) {
+                        hasManyTextField = true;
+                    }
+                    if (tabHasLocalizedManyTextField) {
+                        hasLocalizedManyTextField = true;
+                    }
+                    if (tabHasManyNumberField) {
+                        hasManyNumberField = true;
+                    }
+                    if (tabHasLocalizedManyNumberField) {
+                        hasLocalizedManyNumberField = true;
+                    }
                     break;
                 }
             case 'row':
@@ -544,27 +646,49 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         localesIndexes,
                         newTableName,
                         parentTableName,
-                        relationsToBuild,
                         relationships,
+                        relationsToBuild,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
-                        versions
+                        uniqueRelationships,
+                        versions,
+                        withinLocalizedArrayOrBlock
                     });
-                    if (rowHasLocalizedField) hasLocalizedField = true;
-                    if (rowHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                    if (rowHasManyTextField) hasManyTextField = true;
-                    if (rowHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                    if (rowHasManyNumberField) hasManyNumberField = true;
-                    if (rowHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                    if (rowHasLocalizedField) {
+                        hasLocalizedField = true;
+                    }
+                    if (rowHasLocalizedRelationshipField) {
+                        hasLocalizedRelationshipField = true;
+                    }
+                    if (rowHasManyTextField) {
+                        hasManyTextField = true;
+                    }
+                    if (rowHasLocalizedManyTextField) {
+                        hasLocalizedManyTextField = true;
+                    }
+                    if (rowHasManyNumberField) {
+                        hasManyNumberField = true;
+                    }
+                    if (rowHasLocalizedManyNumberField) {
+                        hasLocalizedManyNumberField = true;
+                    }
                     break;
                 }
             case 'relationship':
             case 'upload':
                 if (Array.isArray(field.relationTo)) {
-                    field.relationTo.forEach((relation)=>relationships.add(relation));
+                    field.relationTo.forEach((relation)=>{
+                        relationships.add(relation);
+                        if (field.unique && !disableUnique && !disableRelsTableUnique) {
+                            uniqueRelationships.add(relation);
+                        }
+                    });
                 } else if (field.hasMany) {
                     relationships.add(field.relationTo);
+                    if (field.unique && !disableUnique && !disableRelsTableUnique) {
+                        uniqueRelationships.add(field.relationTo);
+                    }
                 } else {
                     // simple relationships get a column on the targetTable with a foreign key to the relationTo table
                     const relationshipConfig = adapter.payload.collections[field.relationTo].config;
@@ -572,8 +696,12 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     // get the id type of the related collection
                     let colType = adapter.idType === 'uuid' ? 'uuid' : 'integer';
                     const relatedCollectionCustomID = relationshipConfig.fields.find((field)=>fieldAffectsData(field) && field.name === 'id');
-                    if (relatedCollectionCustomID?.type === 'number') colType = 'numeric';
-                    if (relatedCollectionCustomID?.type === 'text') colType = 'varchar';
+                    if (relatedCollectionCustomID?.type === 'number') {
+                        colType = 'numeric';
+                    }
+                    if (relatedCollectionCustomID?.type === 'text') {
+                        colType = 'varchar';
+                    }
                     // make the foreign key column for relationship using the correct id column type
                     targetTable[fieldName] = parentIDColumnMap[colType](`${columnName}_id`).references(()=>adapter.tables[tableName].id, {
                         onDelete: 'set null'
@@ -581,7 +709,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     // add relationship to table
                     relationsToBuild.set(fieldName, {
                         type: 'one',
-                        localized: adapter.payload.config.localization && field.localized,
+                        localized: adapter.payload.config.localization && (field.localized || forceLocalized),
                         target: tableName
                     });
                     // add notNull when not required
@@ -590,7 +718,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     }
                     break;
                 }
-                if (adapter.payload.config.localization && field.localized) {
+                if (Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock) {
                     hasLocalizedRelationshipField = true;
                 }
                 break;