@payloadcms/db-sqlite 3.0.0-canary.518fabe → 3.0.0-canary.51be7be

package/dist/schema/createIndex.d.ts

@@ -1,11 +1,10 @@
 import type { AnySQLiteColumn } from 'drizzle-orm/sqlite-core';
 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]: AnySQLiteColumn;
 }) => import("drizzle-orm/sqlite-core").IndexBuilder;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"createIndex.d.ts","sourceRoot":"","sources":["../../src/schema/createIndex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAI9D,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,eAAe,CAAA;CAAE,mDAehD,CAAA"}
+{"version":3,"file":"createIndex.d.ts","sourceRoot":"","sources":["../../src/schema/createIndex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAI9D,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,eAAe,CAAA;CAAE,mDAehD,CAAA"}

package/dist/schema/createIndex.js

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

package/dist/schema/createIndex.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/schema/createIndex.ts"],"sourcesContent":["import type { AnySQLiteColumn } from 'drizzle-orm/sqlite-core'\n\nimport { index, uniqueIndex } from 'drizzle-orm/sqlite-core'\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]: AnySQLiteColumn }) => {\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    }\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":"AAEA,SAASA,KAAK,EAAEC,WAAW,QAAQ,0BAAyB;AAS5D,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,QAAQ;YACV,OAAOL,YAAY,CAAC,EAAEI,UAAU,CAAC,EAAED,WAAW,IAAI,CAAC,EAAEU,EAAE,CAACN,OAAO,CAAC,EAAE,KAAKA,QAAQO,KAAK,CAAC;QACvF;QACA,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/schema/createIndex.ts"],"sourcesContent":["import type { AnySQLiteColumn } from 'drizzle-orm/sqlite-core'\n\nimport { index, uniqueIndex } from 'drizzle-orm/sqlite-core'\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]: AnySQLiteColumn }) => {\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":"AAEA,SAASA,KAAK,EAAEC,WAAW,QAAQ,0BAAyB;AAQ5D,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/schema/traverseFields.d.ts

@@ -1,5 +1,5 @@
 import type { IndexBuilder, SQLiteColumnBuilder } from 'drizzle-orm/sqlite-core';
-import type { Field, TabAsField } from 'payload';
+import type { Field, SanitizedJoins, TabAsField } from 'payload';
 import type { GenericColumns, IDType, SQLiteAdapter } from '../types.js';
 import type { RelationMap } from './build.js';
 type Args = {
@@ -7,11 +7,13 @@ type Args = {
     columnPrefix?: string;
     columns: Record<string, SQLiteColumnBuilder>;
     disableNotNull: boolean;
+    disableRelsTableUnique?: boolean;
     disableUnique?: boolean;
     fieldPrefix?: string;
     fields: (Field | TabAsField)[];
     forceLocalized?: boolean;
     indexes: Record<string, (cols: GenericColumns) => IndexBuilder>;
+    joins?: SanitizedJoins;
     locales: [string, ...string[]];
     localesColumns: Record<string, SQLiteColumnBuilder>;
     localesIndexes: Record<string, (cols: GenericColumns) => IndexBuilder>;
@@ -22,6 +24,7 @@ type Args = {
     rootRelationsToBuild?: RelationMap;
     rootTableIDColType: IDType;
     rootTableName: string;
+    uniqueRelationships: Set<string>;
     versions: boolean;
     /**
      * Tracks whether or not this table is built
@@ -37,6 +40,6 @@ type Result = {
     hasManyNumberField: 'index' | boolean;
     hasManyTextField: 'index' | boolean;
 };
-export declare const traverseFields: ({ adapter, columnPrefix, columns, disableNotNull, disableUnique, fieldPrefix, fields, forceLocalized, indexes, locales, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
+export declare const traverseFields: ({ adapter, columnPrefix, columns, disableNotNull, disableRelsTableUnique, disableUnique, fieldPrefix, fields, forceLocalized, indexes, joins, locales, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, uniqueRelationships, versions, withinLocalizedArrayOrBlock, }: Args) => Result;
 export {};
 //# sourceMappingURL=traverseFields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/schema/traverseFields.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAChF,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAsBhD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAmB,WAAW,EAAE,MAAM,YAAY,CAAA;AAQ9D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,aAAa,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC5C,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,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IACnD,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,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,8TAsBxB,IAAI,KAAG,MAuzBT,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/schema/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAChF,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAuBhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,KAAK,EAAmB,WAAW,EAAE,MAAM,YAAY,CAAA;AAQ9D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,aAAa,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC5C,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,KAAK,CAAC,EAAE,cAAc,CAAA;IACtB,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IACnD,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,kXAyBxB,IAAI,KAAG,MAw3BT,CAAA"}

package/dist/schema/traverseFields.js

@@ -1,15 +1,15 @@
-import { createTableName, hasLocalesTable, validateExistingBlockIsIdentical } from '@payloadcms/drizzle';
+import { buildIndexName, createTableName, hasLocalesTable, validateExistingBlockIsIdentical } from '@payloadcms/drizzle';
 import { relations } from 'drizzle-orm';
 import { foreignKey, index, integer, numeric, SQLiteIntegerBuilder, SQLiteNumericBuilder, SQLiteTextBuilder, text } from 'drizzle-orm/sqlite-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 { buildTable } from './build.js';
 import { createIndex } from './createIndex.js';
 import { getIDColumn } from './getIDColumn.js';
 import { idToUUID } from './idToUUID.js';
 import { withDefault } from './withDefault.js';
-export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull, disableUnique = false, fieldPrefix, fields, forceLocalized, indexes, locales, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, versions, withinLocalizedArrayOrBlock })=>{
+export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull, disableRelsTableUnique, disableUnique = false, fieldPrefix, fields, forceLocalized, indexes, joins, locales, localesColumns, localesIndexes, newTableName, parentTableName, relationships, relationsToBuild, rootRelationsToBuild, rootTableIDColType, rootTableName, uniqueRelationships, versions, withinLocalizedArrayOrBlock })=>{
     let hasLocalizedField = false;
     let hasLocalizedRelationshipField = false;
     let hasManyTextField = false;
@@ -30,6 +30,9 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
         if ('name' in field && field.name === 'id') {
             return;
         }
+        if (fieldIsVirtual(field)) {
+            return;
+        }
         let columnName;
         let fieldName;
         let targetTable = columns;
@@ -44,14 +47,15 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                 targetTable = localesColumns;
                 targetIndexes = localesIndexes;
             }
-            if ((field.unique || field.index) && ![
+            if ((field.unique || field.index || [
+                'relationship',
+                'upload'
+            ].includes(field.type)) && ![
                 'array',
                 'blocks',
                 'group',
-                'point',
-                'relationship',
-                'upload'
-            ].includes(field.type) && !('hasMany' in field && field.hasMany === true)) {
+                'point'
+            ].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}`;
@@ -60,10 +64,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: adapter
+                });
+                targetIndexes[indexName] = createIndex({
+                    name: field.localized ? [
+                        fieldName,
+                        '_locale'
+                    ] : fieldName,
+                    indexName,
                     unique
                 });
             }
@@ -72,7 +82,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
             case 'text':
                 {
                     if (field.hasMany) {
-                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock;
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
                         if (isLocalized) {
                             hasLocalizedManyTextField = true;
                         }
@@ -99,7 +109,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
             case 'number':
                 {
                     if (field.hasMany) {
-                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock;
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
                         if (isLocalized) {
                             hasLocalizedManyNumberField = true;
                         }
@@ -175,7 +185,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 }).onDelete('cascade'),
                             parentIdx: (cols)=>index(`${selectTableName}_parent_idx`).on(cols.parent)
                         };
-                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock;
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
                         if (isLocalized) {
                             baseColumns.locale = text('locale', {
                                 enum: locales
@@ -214,7 +224,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 })
                             }));
                     } else {
-                        targetTable[fieldName] = withDefault(text(fieldName, {
+                        targetTable[fieldName] = withDefault(text(columnName, {
                             enum: options
                         }), field);
                     }
@@ -259,7 +269,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             }).onDelete('cascade'),
                         _parentIDIdx: (cols)=>index(`${arrayTableName}_parent_id_idx`).on(cols._parentID)
                     };
-                    const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock;
+                    const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
                     if (isLocalized) {
                         baseColumns._locale = text('_locale', {
                             enum: locales
@@ -271,12 +281,14 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         baseColumns,
                         baseExtraConfig,
                         disableNotNull: disableNotNullFromHere,
+                        disableRelsTableUnique: true,
                         disableUnique,
                         fields: disableUnique ? idToUUID(field.fields) : field.fields,
                         rootRelationships: relationships,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
+                        rootUniqueRelationships: uniqueRelationships,
                         tableName: arrayTableName,
                         versions,
                         withinLocalizedArrayOrBlock: isLocalized
@@ -382,7 +394,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 _parentIDIdx: (cols)=>index(`${blockTableName}_parent_id_idx`).on(cols._parentID),
                                 _pathIdx: (cols)=>index(`${blockTableName}_path_idx`).on(cols._path)
                             };
-                            const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock;
+                            const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
                             if (isLocalized) {
                                 baseColumns._locale = text('_locale', {
                                     enum: locales
@@ -394,12 +406,14 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                                 baseColumns,
                                 baseExtraConfig,
                                 disableNotNull: disableNotNullFromHere,
+                                disableRelsTableUnique: true,
                                 disableUnique,
                                 fields: disableUnique ? idToUUID(block.fields) : block.fields,
                                 rootRelationships: relationships,
                                 rootRelationsToBuild,
                                 rootTableIDColType,
                                 rootTableName,
+                                rootUniqueRelationships: uniqueRelationships,
                                 tableName: blockTableName,
                                 versions,
                                 withinLocalizedArrayOrBlock: isLocalized
@@ -494,6 +508,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             fields: field.fields,
                             forceLocalized,
                             indexes,
+                            joins,
                             locales,
                             localesColumns,
                             localesIndexes,
@@ -504,6 +519,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             rootRelationsToBuild,
                             rootTableIDColType,
                             rootTableName,
+                            uniqueRelationships,
                             versions,
                             withinLocalizedArrayOrBlock
                         });
@@ -538,6 +554,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         fields: field.fields,
                         forceLocalized: field.localized,
                         indexes,
+                        joins,
                         locales,
                         localesColumns,
                         localesIndexes,
@@ -548,8 +565,9 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
+                        uniqueRelationships,
                         versions,
-                        withinLocalizedArrayOrBlock
+                        withinLocalizedArrayOrBlock: withinLocalizedArrayOrBlock || field.localized
                     });
                     if (groupHasLocalizedField) {
                         hasLocalizedField = true;
@@ -587,6 +605,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                             })),
                         forceLocalized,
                         indexes,
+                        joins,
                         locales,
                         localesColumns,
                         localesIndexes,
@@ -597,6 +616,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
+                        uniqueRelationships,
                         versions,
                         withinLocalizedArrayOrBlock
                     });
@@ -634,6 +654,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         fields: field.fields,
                         forceLocalized,
                         indexes,
+                        joins,
                         locales,
                         localesColumns,
                         localesIndexes,
@@ -644,6 +665,7 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                         rootRelationsToBuild,
                         rootTableIDColType,
                         rootTableName,
+                        uniqueRelationships,
                         versions,
                         withinLocalizedArrayOrBlock
                     });
@@ -670,9 +692,17 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
             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;
@@ -697,7 +727,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
@@ -710,6 +740,28 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     hasLocalizedRelationshipField = true;
                 }
                 break;
+            case 'join':
+                {
+                    // fieldName could be 'posts' or 'group_posts'
+                    // using `on` as the key for the relation
+                    const localized = adapter.payload.config.localization && field.localized;
+                    const fieldSchemaPath = `${fieldPrefix || ''}${field.name}`;
+                    let target;
+                    const joinConfig = joins[field.collection].find(({ schemaPath })=>fieldSchemaPath === schemaPath);
+                    if (joinConfig.targetField.hasMany) {
+                        target = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${adapter.relationshipsSuffix}`;
+                    } else {
+                        target = `${adapter.tableNameMap.get(toSnakeCase(field.collection))}${localized ? adapter.localesSuffix : ''}`;
+                    }
+                    relationsToBuild.set(fieldName, {
+                        type: 'many',
+                        // joins are not localized on the parent table
+                        localized: false,
+                        relationName: field.on.replaceAll('.', '_'),
+                        target
+                    });
+                    break;
+                }
             default:
                 break;
         }