@payloadcms/drizzle 3.0.0-canary.ff8c8fd → 3.0.0

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,168 +68,21 @@ 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
                 });
             }
         }
         switch(field.type){
-            case 'text':
-                {
-                    if (field.hasMany) {
-                        if (field.localized) {
-                            hasLocalizedManyTextField = true;
-                        }
-                        if (field.index) {
-                            hasManyTextField = 'index';
-                        } else if (!hasManyTextField) {
-                            hasManyTextField = true;
-                        }
-                        if (field.unique) {
-                            throw new InvalidConfiguration('Unique is not supported in Postgres for hasMany text fields.');
-                        }
-                    } else {
-                        targetTable[fieldName] = withDefault(varchar(columnName), field);
-                    }
-                    break;
-                }
-            case 'email':
-            case 'code':
-            case 'textarea':
-                {
-                    targetTable[fieldName] = withDefault(varchar(columnName), field);
-                    break;
-                }
-            case 'number':
-                {
-                    if (field.hasMany) {
-                        if (field.localized) {
-                            hasLocalizedManyNumberField = true;
-                        }
-                        if (field.index) {
-                            hasManyNumberField = 'index';
-                        } else if (!hasManyNumberField) {
-                            hasManyNumberField = true;
-                        }
-                        if (field.unique) {
-                            throw new InvalidConfiguration('Unique is not supported in Postgres for hasMany number fields.');
-                        }
-                    } else {
-                        targetTable[fieldName] = withDefault(numeric(columnName), field);
-                    }
-                    break;
-                }
-            case 'richText':
-            case 'json':
-                {
-                    targetTable[fieldName] = withDefault(jsonb(columnName), field);
-                    break;
-                }
-            case 'date':
-                {
-                    targetTable[fieldName] = withDefault(timestamp(columnName, {
-                        mode: 'string',
-                        precision: 3,
-                        withTimezone: true
-                    }), field);
-                    break;
-                }
-            case 'point':
-                {
-                    break;
-                }
-            case 'radio':
-            case 'select':
-                {
-                    const enumName = createTableName({
-                        adapter,
-                        config: field,
-                        parentTableName: newTableName,
-                        prefix: `enum_${newTableName}_`,
-                        target: 'enumName',
-                        throwValidationError
-                    });
-                    adapter.enums[enumName] = adapter.pgSchema.enum(enumName, field.options.map((option)=>{
-                        if (optionIsObject(option)) {
-                            return option.value;
-                        }
-                        return option;
-                    }));
-                    if (field.type === 'select' && field.hasMany) {
-                        const selectTableName = createTableName({
-                            adapter,
-                            config: field,
-                            parentTableName: newTableName,
-                            prefix: `${newTableName}_`,
-                            throwValidationError,
-                            versionsCustomName: versions
-                        });
-                        const baseColumns = {
-                            order: integer('order').notNull(),
-                            parent: parentIDColumnMap[parentIDColType]('parent_id').notNull(),
-                            value: adapter.enums[enumName]('value')
-                        };
-                        const baseExtraConfig = {
-                            orderIdx: (cols)=>index(`${selectTableName}_order_idx`).on(cols.order),
-                            parentFk: (cols)=>foreignKey({
-                                    name: `${selectTableName}_parent_fk`,
-                                    columns: [
-                                        cols.parent
-                                    ],
-                                    foreignColumns: [
-                                        adapter.tables[parentTableName].id
-                                    ]
-                                }).onDelete('cascade'),
-                            parentIdx: (cols)=>index(`${selectTableName}_parent_idx`).on(cols.parent)
-                        };
-                        if (field.localized) {
-                            baseColumns.locale = adapter.enums.enum__locales('locale').notNull();
-                            baseExtraConfig.localeIdx = (cols)=>index(`${selectTableName}_locale_idx`).on(cols.locale);
-                        }
-                        if (field.index) {
-                            baseExtraConfig.value = (cols)=>index(`${selectTableName}_value_idx`).on(cols.value);
-                        }
-                        buildTable({
-                            adapter,
-                            baseColumns,
-                            baseExtraConfig,
-                            disableNotNull,
-                            disableUnique,
-                            fields: [],
-                            rootTableName,
-                            tableName: selectTableName,
-                            versions
-                        });
-                        relationsToBuild.set(fieldName, {
-                            type: 'many',
-                            // selects have their own localized table, independent of the base table.
-                            localized: false,
-                            target: selectTableName
-                        });
-                        adapter.relations[`relations_${selectTableName}`] = relations(adapter.tables[selectTableName], ({ one })=>({
-                                parent: one(adapter.tables[parentTableName], {
-                                    fields: [
-                                        adapter.tables[selectTableName].parent
-                                    ],
-                                    references: [
-                                        adapter.tables[parentTableName].id
-                                    ],
-                                    relationName: fieldName
-                                })
-                            }));
-                    } else {
-                        targetTable[fieldName] = withDefault(adapter.enums[enumName](fieldName), field);
-                    }
-                    break;
-                }
-            case 'checkbox':
-                {
-                    targetTable[fieldName] = withDefault(boolean(columnName), field);
-                    break;
-                }
             case 'array':
                 {
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
@@ -245,29 +111,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 +218,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 +227,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 = {
@@ -428,8 +328,76 @@ export const traverseFields = ({ adapter, columnPrefix, columns, disableNotNull,
                     });
                     break;
                 }
-            case 'tab':
+            case 'checkbox':
+                {
+                    targetTable[fieldName] = withDefault(boolean(columnName), field);
+                    break;
+                }
+            case 'code':
+            case 'email':
+            case 'textarea':
+                {
+                    targetTable[fieldName] = withDefault(varchar(columnName), field);
+                    break;
+                }
+            case 'collapsible':
+            case 'row':
+                {
+                    const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
+                    const { hasLocalizedField: rowHasLocalizedField, hasLocalizedManyNumberField: rowHasLocalizedManyNumberField, hasLocalizedManyTextField: rowHasLocalizedManyTextField, hasLocalizedRelationshipField: rowHasLocalizedRelationshipField, hasManyNumberField: rowHasManyNumberField, hasManyTextField: rowHasManyTextField } = traverseFields({
+                        adapter,
+                        columnPrefix,
+                        columns,
+                        disableNotNull: disableNotNullFromHere,
+                        disableUnique,
+                        fieldPrefix,
+                        fields: field.fields,
+                        forceLocalized,
+                        indexes,
+                        localesColumns,
+                        localesIndexes,
+                        newTableName,
+                        parentTableName,
+                        relationships,
+                        relationsToBuild,
+                        rootRelationsToBuild,
+                        rootTableIDColType,
+                        rootTableName,
+                        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;
+                    }
+                    break;
+                }
+            case 'date':
+                {
+                    targetTable[fieldName] = withDefault(timestamp(columnName, {
+                        mode: 'string',
+                        precision: 3,
+                        withTimezone: true
+                    }), field);
+                    break;
+                }
             case 'group':
+            case 'tab':
                 {
                     if (!('name' in field)) {
                         const { hasLocalizedField: groupHasLocalizedField, hasLocalizedManyNumberField: groupHasLocalizedManyNumberField, hasLocalizedManyTextField: groupHasLocalizedManyTextField, hasLocalizedRelationshipField: groupHasLocalizedRelationshipField, hasManyNumberField: groupHasManyNumberField, hasManyTextField: groupHasManyTextField } = traverseFields({
@@ -446,19 +414,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,95 +458,168 @@ 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':
+            case 'json':
+            case 'richText':
                 {
-                    const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
-                    const { hasLocalizedField: tabHasLocalizedField, hasLocalizedManyNumberField: tabHasLocalizedManyNumberField, hasLocalizedManyTextField: tabHasLocalizedManyTextField, hasLocalizedRelationshipField: tabHasLocalizedRelationshipField, hasManyNumberField: tabHasManyNumberField, hasManyTextField: tabHasManyTextField } = traverseFields({
-                        adapter,
-                        columnPrefix,
-                        columns,
-                        disableNotNull: disableNotNullFromHere,
-                        disableUnique,
-                        fieldPrefix,
-                        fields: field.tabs.map((tab)=>({
-                                ...tab,
-                                type: 'tab'
-                            })),
-                        forceLocalized,
-                        indexes,
-                        localesColumns,
-                        localesIndexes,
-                        newTableName,
-                        parentTableName,
-                        relationsToBuild,
-                        relationships,
-                        rootRelationsToBuild,
-                        rootTableIDColType,
-                        rootTableName,
-                        versions
-                    });
-                    if (tabHasLocalizedField) hasLocalizedField = true;
-                    if (tabHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                    if (tabHasManyTextField) hasManyTextField = true;
-                    if (tabHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                    if (tabHasManyNumberField) hasManyNumberField = true;
-                    if (tabHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                    targetTable[fieldName] = withDefault(jsonb(columnName), field);
                     break;
                 }
-            case 'row':
-            case 'collapsible':
+            case 'number':
                 {
-                    const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
-                    const { hasLocalizedField: rowHasLocalizedField, hasLocalizedManyNumberField: rowHasLocalizedManyNumberField, hasLocalizedManyTextField: rowHasLocalizedManyTextField, hasLocalizedRelationshipField: rowHasLocalizedRelationshipField, hasManyNumberField: rowHasManyNumberField, hasManyTextField: rowHasManyTextField } = traverseFields({
+                    if (field.hasMany) {
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                        if (isLocalized) {
+                            hasLocalizedManyNumberField = true;
+                        }
+                        if (field.index) {
+                            hasManyNumberField = 'index';
+                        } else if (!hasManyNumberField) {
+                            hasManyNumberField = true;
+                        }
+                        if (field.unique) {
+                            throw new InvalidConfiguration('Unique is not supported in Postgres for hasMany number fields.');
+                        }
+                    } else {
+                        targetTable[fieldName] = withDefault(numeric(columnName), field);
+                    }
+                    break;
+                }
+            case 'point':
+                {
+                    targetTable[fieldName] = withDefault(geometryColumn(columnName), field);
+                    if (!adapter.extensions.postgis) {
+                        adapter.extensions.postgis = true;
+                    }
+                    break;
+                }
+            case 'radio':
+            case 'select':
+                {
+                    const enumName = createTableName({
                         adapter,
-                        columnPrefix,
-                        columns,
-                        disableNotNull: disableNotNullFromHere,
-                        disableUnique,
-                        fieldPrefix,
-                        fields: field.fields,
-                        forceLocalized,
-                        indexes,
-                        localesColumns,
-                        localesIndexes,
-                        newTableName,
-                        parentTableName,
-                        relationsToBuild,
-                        relationships,
-                        rootRelationsToBuild,
-                        rootTableIDColType,
-                        rootTableName,
-                        versions
+                        config: field,
+                        parentTableName: newTableName,
+                        prefix: `enum_${newTableName}_`,
+                        target: 'enumName',
+                        throwValidationError
                     });
-                    if (rowHasLocalizedField) hasLocalizedField = true;
-                    if (rowHasLocalizedRelationshipField) hasLocalizedRelationshipField = true;
-                    if (rowHasManyTextField) hasManyTextField = true;
-                    if (rowHasLocalizedManyTextField) hasLocalizedManyTextField = true;
-                    if (rowHasManyNumberField) hasManyNumberField = true;
-                    if (rowHasLocalizedManyNumberField) hasLocalizedManyNumberField = true;
+                    adapter.enums[enumName] = adapter.pgSchema.enum(enumName, field.options.map((option)=>{
+                        if (optionIsObject(option)) {
+                            return option.value;
+                        }
+                        return option;
+                    }));
+                    if (field.type === 'select' && field.hasMany) {
+                        const selectTableName = createTableName({
+                            adapter,
+                            config: field,
+                            parentTableName: newTableName,
+                            prefix: `${newTableName}_`,
+                            throwValidationError,
+                            versionsCustomName: versions
+                        });
+                        const baseColumns = {
+                            order: integer('order').notNull(),
+                            parent: parentIDColumnMap[parentIDColType]('parent_id').notNull(),
+                            value: adapter.enums[enumName]('value')
+                        };
+                        const baseExtraConfig = {
+                            orderIdx: (cols)=>index(`${selectTableName}_order_idx`).on(cols.order),
+                            parentFk: (cols)=>foreignKey({
+                                    name: `${selectTableName}_parent_fk`,
+                                    columns: [
+                                        cols.parent
+                                    ],
+                                    foreignColumns: [
+                                        adapter.tables[parentTableName].id
+                                    ]
+                                }).onDelete('cascade'),
+                            parentIdx: (cols)=>index(`${selectTableName}_parent_idx`).on(cols.parent)
+                        };
+                        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);
+                        }
+                        if (field.index) {
+                            baseExtraConfig.value = (cols)=>index(`${selectTableName}_value_idx`).on(cols.value);
+                        }
+                        buildTable({
+                            adapter,
+                            baseColumns,
+                            baseExtraConfig,
+                            disableNotNull,
+                            disableUnique,
+                            fields: [],
+                            rootTableName,
+                            tableName: selectTableName,
+                            versions
+                        });
+                        relationsToBuild.set(fieldName, {
+                            type: 'many',
+                            // selects have their own localized table, independent of the base table.
+                            localized: false,
+                            target: selectTableName
+                        });
+                        adapter.relations[`relations_${selectTableName}`] = relations(adapter.tables[selectTableName], ({ one })=>({
+                                parent: one(adapter.tables[parentTableName], {
+                                    fields: [
+                                        adapter.tables[selectTableName].parent
+                                    ],
+                                    references: [
+                                        adapter.tables[parentTableName].id
+                                    ],
+                                    relationName: fieldName
+                                })
+                            }));
+                    } else {
+                        targetTable[fieldName] = withDefault(adapter.enums[enumName](columnName), field);
+                    }
                     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 +627,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 +640,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,10 +649,79 @@ 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;
+            case 'tabs':
+                {
+                    const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
+                    const { hasLocalizedField: tabHasLocalizedField, hasLocalizedManyNumberField: tabHasLocalizedManyNumberField, hasLocalizedManyTextField: tabHasLocalizedManyTextField, hasLocalizedRelationshipField: tabHasLocalizedRelationshipField, hasManyNumberField: tabHasManyNumberField, hasManyTextField: tabHasManyTextField } = traverseFields({
+                        adapter,
+                        columnPrefix,
+                        columns,
+                        disableNotNull: disableNotNullFromHere,
+                        disableUnique,
+                        fieldPrefix,
+                        fields: field.tabs.map((tab)=>({
+                                ...tab,
+                                type: 'tab'
+                            })),
+                        forceLocalized,
+                        indexes,
+                        localesColumns,
+                        localesIndexes,
+                        newTableName,
+                        parentTableName,
+                        relationships,
+                        relationsToBuild,
+                        rootRelationsToBuild,
+                        rootTableIDColType,
+                        rootTableName,
+                        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;
+                    }
+                    break;
+                }
+            case 'text':
+                {
+                    if (field.hasMany) {
+                        const isLocalized = Boolean(field.localized && adapter.payload.config.localization) || withinLocalizedArrayOrBlock || forceLocalized;
+                        if (isLocalized) {
+                            hasLocalizedManyTextField = true;
+                        }
+                        if (field.index) {
+                            hasManyTextField = 'index';
+                        } else if (!hasManyTextField) {
+                            hasManyTextField = true;
+                        }
+                        if (field.unique) {
+                            throw new InvalidConfiguration('Unique is not supported in Postgres for hasMany text fields.');
+                        }
+                    } else {
+                        targetTable[fieldName] = withDefault(varchar(columnName), field);
+                    }
+                    break;
+                }
             default:
                 break;
         }