@payloadcms/db-postgres 3.0.0-beta.7 → 3.0.0-beta.70

package/dist/schema/setColumnID.js

@@ -1,6 +1,6 @@
 import { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core';
-import { fieldAffectsData } from 'payload/types';
-import { flattenTopLevelFields } from 'payload/utilities';
+import { flattenTopLevelFields } from 'payload';
+import { fieldAffectsData } from 'payload/shared';
 export const setColumnID = ({ adapter, columns, fields })=>{
     const idField = flattenTopLevelFields(fields).find((field)=>fieldAffectsData(field) && field.name === 'id');
     if (idField) {

package/dist/schema/setColumnID.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/schema/setColumnID.ts"],"sourcesContent":["import type { PgColumnBuilder } from 'drizzle-orm/pg-core'\n\nimport { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core'\nimport { type Field, fieldAffectsData } from 'payload/types'\nimport { flattenTopLevelFields } from 'payload/utilities'\n\nimport type { IDType, PostgresAdapter } from '../types.js'\n\ntype Args = { adapter: PostgresAdapter; columns: Record<string, PgColumnBuilder>; fields: Field[] }\nexport const setColumnID = ({ adapter, columns, fields }: Args): IDType => {\n  const idField = flattenTopLevelFields(fields).find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n  if (idField) {\n    if (idField.type === 'number') {\n      columns.id = numeric('id').primaryKey()\n      return 'numeric'\n    }\n\n    if (idField.type === 'text') {\n      columns.id = varchar('id').primaryKey()\n      return 'varchar'\n    }\n  }\n\n  if (adapter.idType === 'uuid') {\n    columns.id = uuid('id').defaultRandom().primaryKey()\n    return 'uuid'\n  }\n\n  columns.id = serial('id').primaryKey()\n  return 'integer'\n}\n"],"names":["numeric","serial","uuid","varchar","fieldAffectsData","flattenTopLevelFields","setColumnID","adapter","columns","fields","idField","find","field","name","type","id","primaryKey","idType","defaultRandom"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,OAAO,EAAEC,MAAM,EAAEC,IAAI,EAAEC,OAAO,QAAQ,sBAAqB;AACpE,SAAqBC,gBAAgB,QAAQ,gBAAe;AAC5D,SAASC,qBAAqB,QAAQ,oBAAmB;AAKzD,OAAO,MAAMC,cAAc,CAAC,EAAEC,OAAO,EAAEC,OAAO,EAAEC,MAAM,EAAQ;IAC5D,MAAMC,UAAUL,sBAAsBI,QAAQE,IAAI,CAChD,CAACC,QAAUR,iBAAiBQ,UAAUA,MAAMC,IAAI,KAAK;IAEvD,IAAIH,SAAS;QACX,IAAIA,QAAQI,IAAI,KAAK,UAAU;YAC7BN,QAAQO,EAAE,GAAGf,QAAQ,MAAMgB,UAAU;YACrC,OAAO;QACT;QAEA,IAAIN,QAAQI,IAAI,KAAK,QAAQ;YAC3BN,QAAQO,EAAE,GAAGZ,QAAQ,MAAMa,UAAU;YACrC,OAAO;QACT;IACF;IAEA,IAAIT,QAAQU,MAAM,KAAK,QAAQ;QAC7BT,QAAQO,EAAE,GAAGb,KAAK,MAAMgB,aAAa,GAAGF,UAAU;QAClD,OAAO;IACT;IAEAR,QAAQO,EAAE,GAAGd,OAAO,MAAMe,UAAU;IACpC,OAAO;AACT,EAAC"}
+{"version":3,"sources":["../../src/schema/setColumnID.ts"],"sourcesContent":["import type { PgColumnBuilder } from 'drizzle-orm/pg-core'\n\nimport { numeric, serial, uuid, varchar } from 'drizzle-orm/pg-core'\nimport { type Field, flattenTopLevelFields } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\nimport type { IDType, PostgresAdapter } from '../types.js'\n\ntype Args = { adapter: PostgresAdapter; columns: Record<string, PgColumnBuilder>; fields: Field[] }\nexport const setColumnID = ({ adapter, columns, fields }: Args): IDType => {\n  const idField = flattenTopLevelFields(fields).find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n  if (idField) {\n    if (idField.type === 'number') {\n      columns.id = numeric('id').primaryKey()\n      return 'numeric'\n    }\n\n    if (idField.type === 'text') {\n      columns.id = varchar('id').primaryKey()\n      return 'varchar'\n    }\n  }\n\n  if (adapter.idType === 'uuid') {\n    columns.id = uuid('id').defaultRandom().primaryKey()\n    return 'uuid'\n  }\n\n  columns.id = serial('id').primaryKey()\n  return 'integer'\n}\n"],"names":["numeric","serial","uuid","varchar","flattenTopLevelFields","fieldAffectsData","setColumnID","adapter","columns","fields","idField","find","field","name","type","id","primaryKey","idType","defaultRandom"],"mappings":"AAEA,SAASA,OAAO,EAAEC,MAAM,EAAEC,IAAI,EAAEC,OAAO,QAAQ,sBAAqB;AACpE,SAAqBC,qBAAqB,QAAQ,UAAS;AAC3D,SAASC,gBAAgB,QAAQ,iBAAgB;AAKjD,OAAO,MAAMC,cAAc,CAAC,EAAEC,OAAO,EAAEC,OAAO,EAAEC,MAAM,EAAQ;IAC5D,MAAMC,UAAUN,sBAAsBK,QAAQE,IAAI,CAChD,CAACC,QAAUP,iBAAiBO,UAAUA,MAAMC,IAAI,KAAK;IAEvD,IAAIH,SAAS;QACX,IAAIA,QAAQI,IAAI,KAAK,UAAU;YAC7BN,QAAQO,EAAE,GAAGf,QAAQ,MAAMgB,UAAU;YACrC,OAAO;QACT;QAEA,IAAIN,QAAQI,IAAI,KAAK,QAAQ;YAC3BN,QAAQO,EAAE,GAAGZ,QAAQ,MAAMa,UAAU;YACrC,OAAO;QACT;IACF;IAEA,IAAIT,QAAQU,MAAM,KAAK,QAAQ;QAC7BT,QAAQO,EAAE,GAAGb,KAAK,MAAMgB,aAAa,GAAGF,UAAU;QAClD,OAAO;IACT;IAEAR,QAAQO,EAAE,GAAGd,OAAO,MAAMe,UAAU;IACpC,OAAO;AACT,EAAC"}

package/dist/schema/traverseFields.d.ts

@@ -1,11 +1,9 @@
 import type { IndexBuilder, PgColumnBuilder } from 'drizzle-orm/pg-core';
-import type { Field, TabAsField } from 'payload/types';
+import type { Field, TabAsField } from 'payload';
 import type { GenericColumns, PostgresAdapter } from '../types.js';
+import type { RelationMap } from './build.js';
 type Args = {
     adapter: PostgresAdapter;
-    buildNumbers: boolean;
-    buildRelationships: boolean;
-    buildTexts: boolean;
     columnPrefix?: string;
     columns: Record<string, PgColumnBuilder>;
     disableNotNull: boolean;
@@ -18,9 +16,9 @@ type Args = {
     localesIndexes: Record<string, (cols: GenericColumns) => IndexBuilder>;
     newTableName: string;
     parentTableName: string;
-    relationsToBuild: Map<string, string>;
+    relationsToBuild: RelationMap;
     relationships: Set<string>;
-    rootRelationsToBuild?: Map<string, string>;
+    rootRelationsToBuild?: RelationMap;
     rootTableIDColType: string;
     rootTableName: string;
     versions: boolean;
@@ -33,6 +31,6 @@ type Result = {
     hasManyNumberField: 'index' | boolean;
     hasManyTextField: 'index' | boolean;
 };
-export declare const traverseFields: ({ adapter, buildNumbers, buildRelationships, buildTexts, 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, disableUnique, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationsToBuild, relationships, rootRelationsToBuild, rootTableIDColType, rootTableName, versions, }: 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":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAA2B,MAAM,qBAAqB,CAAA;AACjG,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAqBtD,OAAO,KAAK,EAAE,cAAc,EAAU,eAAe,EAAE,MAAM,aAAa,CAAA;AAU1E,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,YAAY,EAAE,OAAO,CAAA;IACrB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,UAAU,EAAE,OAAO,CAAA;IACnB,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,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1C,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,sUAuBxB,IAAI,KAAG,MAknBT,CAAA"}
+{"version":3,"file":"traverseFields.d.ts","sourceRoot":"","sources":["../../src/schema/traverseFields.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AA2BhD,OAAO,KAAK,EAAE,cAAc,EAAU,eAAe,EAAE,MAAM,aAAa,CAAA;AAC1E,OAAO,KAAK,EAAmB,WAAW,EAAE,MAAM,YAAY,CAAA;AAO9D,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,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,MA4rBT,CAAA"}

package/dist/schema/traverseFields.js

@@ -1,16 +1,14 @@
-/* eslint-disable no-param-reassign */ import { relations } from 'drizzle-orm';
-import { PgNumericBuilder, PgUUIDBuilder, PgVarcharBuilder, boolean, index, integer, jsonb, numeric, pgEnum, text, timestamp, varchar } from 'drizzle-orm/pg-core';
-import { InvalidConfiguration } from 'payload/errors';
-import { fieldAffectsData, optionIsObject } from 'payload/types';
+/* eslint-disable no-param-reassign */ import { createTableName, hasLocalesTable, validateExistingBlockIsIdentical } from '@payloadcms/drizzle';
+import { relations } from 'drizzle-orm';
+import { PgNumericBuilder, PgUUIDBuilder, PgVarcharBuilder, boolean, foreignKey, index, integer, jsonb, numeric, pgEnum, text, timestamp, varchar } from 'drizzle-orm/pg-core';
+import { InvalidConfiguration } from 'payload';
+import { fieldAffectsData, optionIsObject } from 'payload/shared';
 import toSnakeCase from 'to-snake-case';
-import { hasLocalesTable } from '../utilities/hasLocalesTable.js';
 import { buildTable } from './build.js';
 import { createIndex } from './createIndex.js';
-import { getTableName } from './getTableName.js';
 import { idToUUID } from './idToUUID.js';
 import { parentIDColumnMap } from './parentIDColumnMap.js';
-import { validateExistingBlockIsIdentical } from './validateExistingBlockIsIdentical.js';
-export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buildTexts, 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, disableUnique = false, fieldPrefix, fields, forceLocalized, indexes, localesColumns, localesIndexes, newTableName, parentTableName, relationsToBuild, relationships, rootRelationsToBuild, rootTableIDColType, rootTableName, versions })=>{
     const throwValidationError = true;
     let hasLocalizedField = false;
     let hasLocalizedRelationshipField = false;
@@ -33,7 +31,7 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
             fieldName = `${fieldPrefix?.replace('.', '_') || ''}${field.name}`;
             // If field is localized,
             // add the column to the locale table instead of main table
-            if (adapter.payload.config.localization && (field.localized || forceLocalized)) {
+            if (adapter.payload.config.localization && (field.localized || forceLocalized) && field.type !== 'array' && field.type !== 'blocks' && ('hasMany' in field && field.hasMany !== true || !('hasMany' in field))) {
                 hasLocalizedField = true;
                 targetTable = localesColumns;
                 targetIndexes = localesIndexes;
@@ -130,14 +128,13 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
             case 'radio':
             case 'select':
                 {
-                    const enumName = getTableName({
+                    const enumName = createTableName({
                         adapter,
                         config: field,
                         parentTableName: newTableName,
                         prefix: `enum_${newTableName}_`,
                         target: 'enumName',
-                        throwValidationError,
-                        versions
+                        throwValidationError
                     });
                     adapter.enums[enumName] = pgEnum(enumName, field.options.map((option)=>{
                         if (optionIsObject(option)) {
@@ -146,23 +143,30 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                         return option;
                     }));
                     if (field.type === 'select' && field.hasMany) {
-                        const selectTableName = getTableName({
+                        const selectTableName = createTableName({
                             adapter,
                             config: field,
                             parentTableName: newTableName,
                             prefix: `${newTableName}_`,
                             throwValidationError,
-                            versions
+                            versionsCustomName: versions
                         });
                         const baseColumns = {
                             order: integer('order').notNull(),
-                            parent: parentIDColumnMap[parentIDColType]('parent_id').references(()=>adapter.tables[parentTableName].id, {
-                                onDelete: 'cascade'
-                            }).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) {
@@ -179,24 +183,27 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                             disableNotNull,
                             disableUnique,
                             fields: [],
+                            rootTableName,
                             tableName: selectTableName,
                             versions
                         });
-                        relationsToBuild.set(fieldName, selectTableName);
-                        const selectTableRelations = relations(adapter.tables[selectTableName], ({ one })=>{
-                            const result = {
+                        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
                                 })
-                            };
-                            return result;
-                        });
-                        adapter.relations[`relation_${selectTableName}`] = selectTableRelations;
+                            }));
                     } else {
                         targetTable[fieldName] = adapter.enums[enumName](fieldName);
                     }
@@ -210,21 +217,29 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
             case 'array':
                 {
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
-                    const arrayTableName = getTableName({
+                    const arrayTableName = createTableName({
                         adapter,
                         config: field,
                         parentTableName: newTableName,
                         prefix: `${newTableName}_`,
-                        throwValidationError
+                        throwValidationError,
+                        versionsCustomName: versions
                     });
                     const baseColumns = {
                         _order: integer('_order').notNull(),
-                        _parentID: parentIDColumnMap[parentIDColType]('_parent_id').references(()=>adapter.tables[parentTableName].id, {
-                            onDelete: 'cascade'
-                        }).notNull()
+                        _parentID: parentIDColumnMap[parentIDColType]('_parent_id').notNull()
                     };
                     const baseExtraConfig = {
                         _orderIdx: (cols)=>index(`${arrayTableName}_order_idx`).on(cols._order),
+                        _parentIDFk: (cols)=>foreignKey({
+                                name: `${arrayTableName}_parent_id_fk`,
+                                columns: [
+                                    cols['_parentID']
+                                ],
+                                foreignColumns: [
+                                    adapter.tables[parentTableName].id
+                                ]
+                            }).onDelete('cascade'),
                         _parentIDIdx: (cols)=>index(`${arrayTableName}_parent_id_idx`).on(cols._parentID)
                     };
                     if (field.localized && adapter.payload.config.localization) {
@@ -251,8 +266,13 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                     if (subHasManyNumberField) {
                         if (!hasManyNumberField || subHasManyNumberField === 'index') hasManyNumberField = subHasManyNumberField;
                     }
-                    relationsToBuild.set(fieldName, arrayTableName);
-                    const arrayTableRelations = relations(adapter.tables[arrayTableName], ({ many, one })=>{
+                    relationsToBuild.set(fieldName, {
+                        type: 'many',
+                        // arrays have their own localized table, independent of the base table.
+                        localized: false,
+                        target: arrayTableName
+                    });
+                    adapter.relations[`relations_${arrayTableName}`] = relations(adapter.tables[arrayTableName], ({ many, one })=>{
                         const result = {
                             _parentID: one(adapter.tables[parentTableName], {
                                 fields: [
@@ -260,42 +280,68 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                                 ],
                                 references: [
                                     adapter.tables[parentTableName].id
-                                ]
+                                ],
+                                relationName: fieldName
                             })
                         };
                         if (hasLocalesTable(field.fields)) {
-                            result._locales = many(adapter.tables[`${arrayTableName}${adapter.localesSuffix}`]);
+                            result._locales = many(adapter.tables[`${arrayTableName}${adapter.localesSuffix}`], {
+                                relationName: '_locales'
+                            });
                         }
-                        subRelationsToBuild.forEach((val, key)=>{
-                            result[key] = many(adapter.tables[val]);
+                        subRelationsToBuild.forEach(({ type, localized, target }, key)=>{
+                            if (type === 'one') {
+                                const arrayWithLocalized = localized ? `${arrayTableName}${adapter.localesSuffix}` : arrayTableName;
+                                result[key] = one(adapter.tables[target], {
+                                    fields: [
+                                        adapter.tables[arrayWithLocalized][key]
+                                    ],
+                                    references: [
+                                        adapter.tables[target].id
+                                    ],
+                                    relationName: key
+                                });
+                            }
+                            if (type === 'many') {
+                                result[key] = many(adapter.tables[target], {
+                                    relationName: key
+                                });
+                            }
                         });
                         return result;
                     });
-                    adapter.relations[`relations_${arrayTableName}`] = arrayTableRelations;
                     break;
                 }
             case 'blocks':
                 {
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
                     field.blocks.forEach((block)=>{
-                        const blockTableName = getTableName({
+                        const blockTableName = createTableName({
                             adapter,
                             config: block,
                             parentTableName: rootTableName,
                             prefix: `${rootTableName}_blocks_`,
-                            throwValidationError
+                            throwValidationError,
+                            versionsCustomName: versions
                         });
                         if (!adapter.tables[blockTableName]) {
                             const baseColumns = {
                                 _order: integer('_order').notNull(),
-                                _parentID: parentIDColumnMap[rootTableIDColType]('_parent_id').references(()=>adapter.tables[rootTableName].id, {
-                                    onDelete: 'cascade'
-                                }).notNull(),
+                                _parentID: parentIDColumnMap[rootTableIDColType]('_parent_id').notNull(),
                                 _path: text('_path').notNull()
                             };
                             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: [
+                                            cols._parentID
+                                        ],
+                                        foreignColumns: [
+                                            adapter.tables[rootTableName].id
+                                        ]
+                                    }).onDelete('cascade'),
                                 _pathIdx: (cols)=>index(`${blockTableName}_path_idx`).on(cols._path)
                             };
                             if (field.localized && adapter.payload.config.localization) {
@@ -322,7 +368,7 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                             if (subHasManyNumberField) {
                                 if (!hasManyNumberField || subHasManyNumberField === 'index') hasManyNumberField = subHasManyNumberField;
                             }
-                            const blockTableRelations = relations(adapter.tables[blockTableName], ({ many, one })=>{
+                            adapter.relations[`relations_${blockTableName}`] = relations(adapter.tables[blockTableName], ({ many, one })=>{
                                 const result = {
                                     _parentID: one(adapter.tables[rootTableName], {
                                         fields: [
@@ -330,28 +376,52 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                                         ],
                                         references: [
                                             adapter.tables[rootTableName].id
-                                        ]
+                                        ],
+                                        relationName: `_blocks_${block.slug}`
                                     })
                                 };
                                 if (hasLocalesTable(block.fields)) {
-                                    result._locales = many(adapter.tables[`${blockTableName}${adapter.localesSuffix}`]);
+                                    result._locales = many(adapter.tables[`${blockTableName}${adapter.localesSuffix}`], {
+                                        relationName: '_locales'
+                                    });
                                 }
-                                subRelationsToBuild.forEach((val, key)=>{
-                                    result[key] = many(adapter.tables[val]);
+                                subRelationsToBuild.forEach(({ type, localized, target }, key)=>{
+                                    if (type === 'one') {
+                                        const blockWithLocalized = localized ? `${blockTableName}${adapter.localesSuffix}` : blockTableName;
+                                        result[key] = one(adapter.tables[target], {
+                                            fields: [
+                                                adapter.tables[blockWithLocalized][key]
+                                            ],
+                                            references: [
+                                                adapter.tables[target].id
+                                            ],
+                                            relationName: key
+                                        });
+                                    }
+                                    if (type === 'many') {
+                                        result[key] = many(adapter.tables[target], {
+                                            relationName: key
+                                        });
+                                    }
                                 });
                                 return result;
                             });
-                            adapter.relations[`relations_${blockTableName}`] = blockTableRelations;
                         } else if (process.env.NODE_ENV !== 'production' && !versions) {
                             validateExistingBlockIsIdentical({
                                 block,
                                 localized: field.localized,
                                 rootTableName,
-                                table: adapter.tables[blockTableName]
+                                table: adapter.tables[blockTableName],
+                                tableLocales: adapter.tables[`${blockTableName}${adapter.localesSuffix}`]
                             });
                         }
-                        adapter.blockTableNames[`${rootTableName}.${toSnakeCase(block.slug)}`] = blockTableName;
-                        rootRelationsToBuild.set(`_blocks_${block.slug}`, blockTableName);
+                        // blocks relationships are defined from the collection or globals table down to the block, bypassing any subBlocks
+                        rootRelationsToBuild.set(`_blocks_${block.slug}`, {
+                            type: 'many',
+                            // blocks are not localized on the parent table
+                            localized: false,
+                            target: blockTableName
+                        });
                     });
                     break;
                 }
@@ -361,9 +431,6 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                     if (!('name' in field)) {
                         const { hasLocalizedField: groupHasLocalizedField, hasLocalizedManyNumberField: groupHasLocalizedManyNumberField, hasLocalizedManyTextField: groupHasLocalizedManyTextField, hasLocalizedRelationshipField: groupHasLocalizedRelationshipField, hasManyNumberField: groupHasManyNumberField, hasManyTextField: groupHasManyTextField } = traverseFields({
                             adapter,
-                            buildNumbers,
-                            buildRelationships,
-                            buildTexts,
                             columnPrefix,
                             columns,
                             disableNotNull,
@@ -394,9 +461,6 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
                     const { hasLocalizedField: groupHasLocalizedField, hasLocalizedManyNumberField: groupHasLocalizedManyNumberField, hasLocalizedManyTextField: groupHasLocalizedManyTextField, hasLocalizedRelationshipField: groupHasLocalizedRelationshipField, hasManyNumberField: groupHasManyNumberField, hasManyTextField: groupHasManyTextField } = traverseFields({
                         adapter,
-                        buildNumbers,
-                        buildRelationships,
-                        buildTexts,
                         columnPrefix: `${columnName}_`,
                         columns,
                         disableNotNull: disableNotNullFromHere,
@@ -429,9 +493,6 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
                     const { hasLocalizedField: tabHasLocalizedField, hasLocalizedManyNumberField: tabHasLocalizedManyNumberField, hasLocalizedManyTextField: tabHasLocalizedManyTextField, hasLocalizedRelationshipField: tabHasLocalizedRelationshipField, hasManyNumberField: tabHasManyNumberField, hasManyTextField: tabHasManyTextField } = traverseFields({
                         adapter,
-                        buildNumbers,
-                        buildRelationships,
-                        buildTexts,
                         columnPrefix,
                         columns,
                         disableNotNull: disableNotNullFromHere,
@@ -468,9 +529,6 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                     const disableNotNullFromHere = Boolean(field.admin?.condition) || disableNotNull;
                     const { hasLocalizedField: rowHasLocalizedField, hasLocalizedManyNumberField: rowHasLocalizedManyNumberField, hasLocalizedManyTextField: rowHasLocalizedManyTextField, hasLocalizedRelationshipField: rowHasLocalizedRelationshipField, hasManyNumberField: rowHasManyNumberField, hasManyTextField: rowHasManyTextField } = traverseFields({
                         adapter,
-                        buildNumbers,
-                        buildRelationships,
-                        buildTexts,
                         columnPrefix,
                         columns,
                         disableNotNull: disableNotNullFromHere,
@@ -481,7 +539,7 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
                         indexes,
                         localesColumns,
                         localesIndexes,
-                        newTableName: parentTableName,
+                        newTableName,
                         parentTableName,
                         relationsToBuild,
                         relationships,
@@ -502,10 +560,34 @@ export const traverseFields = ({ adapter, buildNumbers, buildRelationships, buil
             case 'upload':
                 if (Array.isArray(field.relationTo)) {
                     field.relationTo.forEach((relation)=>relationships.add(relation));
-                } else {
+                } else if (field.type === 'relationship' && field.hasMany) {
                     relationships.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;
+                    const tableName = adapter.tableNameMap.get(toSnakeCase(field.relationTo));
+                    // 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';
+                    // 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'
+                    });
+                    // add relationship to table
+                    relationsToBuild.set(fieldName, {
+                        type: 'one',
+                        localized: adapter.payload.config.localization && field.localized,
+                        target: tableName
+                    });
+                    // add notNull when not required
+                    if (!disableNotNull && field.required && !field.admin?.condition) {
+                        targetTable[fieldName].notNull();
+                    }
+                    break;
                 }
-                if (field.localized && adapter.payload.config.localization) {
+                if (adapter.payload.config.localization && field.localized) {
                     hasLocalizedRelationshipField = true;
                 }
                 break;