From 3e4b0e8cd663c6de21e9de8d86de90025bee8aec Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 26 Apr 2024 14:03:42 +0200
Subject: [PATCH 01/18] Handle migrations

---
 .../server/src/api/routes/tests/table.spec.ts | 20 ++++++++--------
 .../server/src/sdk/app/tables/migration.ts    | 23 +++++++++++--------
 .../types/src/documents/app/table/schema.ts   | 12 ----------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts
index 9aabffd8b9..2aa44ce64f 100644
--- a/packages/server/src/api/routes/tests/table.spec.ts
+++ b/packages/server/src/api/routes/tests/table.spec.ts
@@ -496,7 +496,7 @@ describe.each([
         oldColumn: table.schema["user relationship"],
         newColumn: {
           name: "user column",
-          type: FieldType.BB_REFERENCE,
+          type: FieldType.BB_REFERENCE_SINGLE,
           subtype: BBReferenceFieldSubType.USER,
         },
       })
@@ -515,7 +515,7 @@ describe.each([
         expect(migratedRow["user column"]).toBeDefined()
         expect(migratedRow["user relationship"]).not.toBeDefined()
         expect(row["user relationship"][0]._id).toEqual(
-          migratedRow["user column"][0]._id
+          migratedRow["user column"]._id
         )
       }
     })
@@ -562,7 +562,7 @@ describe.each([
         newColumn: {
           name: "user column",
           type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USERS,
+          subtype: BBReferenceFieldSubType.USER,
         },
       })
 
@@ -614,7 +614,7 @@ describe.each([
         newColumn: {
           name: "user column",
           type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USERS,
+          subtype: BBReferenceFieldSubType.USER,
         },
       })
 
@@ -669,7 +669,7 @@ describe.each([
         newColumn: {
           name: "user column",
           type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USERS,
+          subtype: BBReferenceFieldSubType.USER,
         },
       })
 
@@ -728,7 +728,7 @@ describe.each([
             newColumn: {
               name: "",
               type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USERS,
+              subtype: BBReferenceFieldSubType.USER,
             },
           },
           { status: 400 }
@@ -743,7 +743,7 @@ describe.each([
             newColumn: {
               name: "_id",
               type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USERS,
+              subtype: BBReferenceFieldSubType.USER,
             },
           },
           { status: 400 }
@@ -758,7 +758,7 @@ describe.each([
             newColumn: {
               name: "num",
               type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USERS,
+              subtype: BBReferenceFieldSubType.USER,
             },
           },
           { status: 400 }
@@ -772,12 +772,12 @@ describe.each([
             oldColumn: {
               name: "not a column",
               type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USERS,
+              subtype: BBReferenceFieldSubType.USER,
             },
             newColumn: {
               name: "new column",
               type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USERS,
+              subtype: BBReferenceFieldSubType.USER,
             },
           },
           { status: 400 }
diff --git a/packages/server/src/sdk/app/tables/migration.ts b/packages/server/src/sdk/app/tables/migration.ts
index ae47897289..732773f164 100644
--- a/packages/server/src/sdk/app/tables/migration.ts
+++ b/packages/server/src/sdk/app/tables/migration.ts
@@ -4,7 +4,6 @@ import {
   FieldSchema,
   BBReferenceFieldSubType,
   InternalTable,
-  isBBReferenceField,
   isRelationshipField,
   LinkDocument,
   LinkInfo,
@@ -12,6 +11,8 @@ import {
   RelationshipType,
   Row,
   Table,
+  FieldType,
+  BBReferenceSingleFieldMetadata,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 import { isExternalTableID } from "../../../integrations/utils"
@@ -75,11 +76,14 @@ function getColumnMigrator(
     throw new BadRequestError(`Column "${oldColumn.name}" does not exist`)
   }
 
-  if (!isBBReferenceField(newColumn)) {
+  if (
+    newColumn.type !== FieldType.BB_REFERENCE_SINGLE &&
+    newColumn.type !== FieldType.BB_REFERENCE
+  ) {
     throw new BadRequestError(`Column "${newColumn.name}" is not a user column`)
   }
 
-  if (newColumn.subtype !== "user" && newColumn.subtype !== "users") {
+  if (newColumn.subtype !== BBReferenceFieldSubType.USER) {
     throw new BadRequestError(`Column "${newColumn.name}" is not a user column`)
   }
 
@@ -96,7 +100,7 @@ function getColumnMigrator(
   }
 
   if (oldColumn.relationshipType === RelationshipType.ONE_TO_MANY) {
-    if (newColumn.subtype !== BBReferenceFieldSubType.USER) {
+    if (newColumn.type !== FieldType.BB_REFERENCE_SINGLE) {
       throw new BadRequestError(
         `Column "${oldColumn.name}" is a one-to-many column but "${newColumn.name}" is not a single user column`
       )
@@ -107,22 +111,23 @@ function getColumnMigrator(
     oldColumn.relationshipType === RelationshipType.MANY_TO_MANY ||
     oldColumn.relationshipType === RelationshipType.MANY_TO_ONE
   ) {
-    if (newColumn.subtype !== BBReferenceFieldSubType.USERS) {
+    if (newColumn.type !== FieldType.BB_REFERENCE) {
       throw new BadRequestError(
         `Column "${oldColumn.name}" is a ${oldColumn.relationshipType} column but "${newColumn.name}" is not a multi user column`
       )
     }
+
     return new MultiUserColumnMigrator(table, oldColumn, newColumn)
   }
 
   throw new BadRequestError(`Unknown migration type`)
 }
 
-abstract class UserColumnMigrator implements ColumnMigrator {
+abstract class UserColumnMigrator<T> implements ColumnMigrator {
   constructor(
     protected table: Table,
     protected oldColumn: RelationshipFieldMetadata,
-    protected newColumn: BBReferenceFieldMetadata
+    protected newColumn: T
   ) {}
 
   abstract updateRow(row: Row, linkInfo: LinkInfo): void
@@ -192,7 +197,7 @@ abstract class UserColumnMigrator implements ColumnMigrator {
   }
 }
 
-class SingleUserColumnMigrator extends UserColumnMigrator {
+class SingleUserColumnMigrator extends UserColumnMigrator<BBReferenceSingleFieldMetadata> {
   updateRow(row: Row, linkInfo: LinkInfo): void {
     row[this.newColumn.name] = dbCore.getGlobalIDFromUserMetadataID(
       linkInfo.rowId
@@ -200,7 +205,7 @@ class SingleUserColumnMigrator extends UserColumnMigrator {
   }
 }
 
-class MultiUserColumnMigrator extends UserColumnMigrator {
+class MultiUserColumnMigrator extends UserColumnMigrator<BBReferenceFieldMetadata> {
   updateRow(row: Row, linkInfo: LinkInfo): void {
     if (!row[this.newColumn.name]) {
       row[this.newColumn.name] = []
diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts
index 03d57aced8..38424b26b6 100644
--- a/packages/types/src/documents/app/table/schema.ts
+++ b/packages/types/src/documents/app/table/schema.ts
@@ -214,15 +214,3 @@ export function isManyToOne(
 ): field is ManyToOneRelationshipFieldMetadata {
   return field.relationshipType === RelationshipType.MANY_TO_ONE
 }
-
-export function isBBReferenceField(
-  field: FieldSchema
-): field is BBReferenceFieldMetadata {
-  return field.type === FieldType.BB_REFERENCE
-}
-
-export function isAttachmentField(
-  field: FieldSchema
-): field is AttachmentFieldMetadata {
-  return field.type === FieldType.ATTACHMENTS
-}

From d39c9bd3dd3817d2289ebbec30863ab854a6ccd9 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 26 Apr 2024 15:34:39 +0200
Subject: [PATCH 02/18] Fix user migration

---
 .../components/grid/controls/MigrationModal.svelte   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
index f0cdd7deab..5613598a26 100644
--- a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
+++ b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
@@ -33,10 +33,10 @@
   }
 
   const migrateUserColumn = async () => {
-    let subtype = BBReferenceFieldSubType.USERS
-    if (column.schema.relationshipType === RelationshipType.ONE_TO_MANY) {
-      subtype = BBReferenceFieldSubType.USER
-    }
+    const type =
+      column.schema.relationshipType === RelationshipType.ONE_TO_MANY
+        ? FieldType.BB_REFERENCE_SINGLE
+        : FieldType.BB_REFERENCE
 
     try {
       await API.migrateColumn({
@@ -44,8 +44,8 @@
         oldColumn: column.schema,
         newColumn: {
           name: newColumnName,
-          type: FieldType.BB_REFERENCE,
-          subtype,
+          type,
+          subtype: BBReferenceFieldSubType.USER,
         },
       })
       notifications.success("Column migrated")

From 569488deeea8cfa59f561e29d45579f21ff39bef Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 May 2024 11:50:11 +0100
Subject: [PATCH 03/18] Move migration logic to backend

---
 .../server/src/api/controllers/table/index.ts |   2 +-
 .../server/src/api/routes/tests/table.spec.ts | 103 ++++++++----------
 .../server/src/sdk/app/tables/migration.ts    |  47 ++++++--
 packages/types/src/api/web/app/table.ts       |   4 +-
 4 files changed, 89 insertions(+), 67 deletions(-)

diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index 63ce00c5ef..eae5204c7e 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -180,5 +180,5 @@ export async function migrate(ctx: UserCtx<MigrateRequest, MigrateResponse>) {
   }
 
   ctx.status = 200
-  ctx.body = { message: `Column ${oldColumn.name} migrated.` }
+  ctx.body = { message: `Column ${oldColumn} migrated.` }
 }
diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts
index 2aa44ce64f..33bd3dba5c 100644
--- a/packages/server/src/api/routes/tests/table.spec.ts
+++ b/packages/server/src/api/routes/tests/table.spec.ts
@@ -493,16 +493,16 @@ describe.each([
       )
 
       await config.api.table.migrate(table._id!, {
-        oldColumn: table.schema["user relationship"],
-        newColumn: {
-          name: "user column",
-          type: FieldType.BB_REFERENCE_SINGLE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
+        oldColumn: "user relationship",
+        newColumn: "user column",
       })
 
       const migratedTable = await config.api.table.get(table._id!)
-      expect(migratedTable.schema["user column"]).toBeDefined()
+      expect(migratedTable.schema["user column"]).toEqual({
+        name: "user column",
+        type: FieldType.BB_REFERENCE_SINGLE,
+        subtype: BBReferenceFieldSubType.USER,
+      })
       expect(migratedTable.schema["user relationship"]).not.toBeDefined()
 
       const migratedRows = await config.api.row.fetch(table._id!)
@@ -558,16 +558,19 @@ describe.each([
       )
 
       await config.api.table.migrate(table._id!, {
-        oldColumn: table.schema["user relationship"],
-        newColumn: {
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
+        oldColumn: "user relationship",
+        newColumn: "user column",
       })
 
       const migratedTable = await config.api.table.get(table._id!)
-      expect(migratedTable.schema["user column"]).toBeDefined()
+      expect(migratedTable.schema["user column"]).toEqual({
+        name: "user column",
+        type: FieldType.BB_REFERENCE,
+        subtype: BBReferenceFieldSubType.USER,
+        constraints: {
+          type: "array",
+        },
+      })
       expect(migratedTable.schema["user relationship"]).not.toBeDefined()
 
       const migratedRow = await config.api.row.get(table._id!, testRow._id!)
@@ -610,16 +613,19 @@ describe.each([
       })
 
       await config.api.table.migrate(table._id!, {
-        oldColumn: table.schema["user relationship"],
-        newColumn: {
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
+        oldColumn: "user relationship",
+        newColumn: "user column",
       })
 
       const migratedTable = await config.api.table.get(table._id!)
-      expect(migratedTable.schema["user column"]).toBeDefined()
+      expect(migratedTable.schema["user column"]).toEqual({
+        name: "user column",
+        type: FieldType.BB_REFERENCE,
+        subtype: BBReferenceFieldSubType.USER,
+        constraints: {
+          type: "array",
+        },
+      })
       expect(migratedTable.schema["user relationship"]).not.toBeDefined()
 
       const row1Migrated = await config.api.row.get(table._id!, row1._id!)
@@ -665,16 +671,19 @@ describe.each([
       })
 
       await config.api.table.migrate(table._id!, {
-        oldColumn: table.schema["user relationship"],
-        newColumn: {
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-        },
+        oldColumn: "user relationship",
+        newColumn: "user column",
       })
 
       const migratedTable = await config.api.table.get(table._id!)
-      expect(migratedTable.schema["user column"]).toBeDefined()
+      expect(migratedTable.schema["user column"]).toEqual({
+        name: "user column",
+        type: FieldType.BB_REFERENCE,
+        subtype: BBReferenceFieldSubType.USER,
+        constraints: {
+          type: "array",
+        },
+      })
       expect(migratedTable.schema["user relationship"]).not.toBeDefined()
 
       const row1Migrated = await config.api.row.get(table._id!, row1._id!)
@@ -690,7 +699,7 @@ describe.each([
       ])
     })
 
-    describe("unhappy paths", () => {
+    describe.only("unhappy paths", () => {
       let table: Table
       beforeAll(async () => {
         table = await config.api.table.save(
@@ -724,12 +733,8 @@ describe.each([
         await config.api.table.migrate(
           table._id!,
           {
-            oldColumn: table.schema["user relationship"],
-            newColumn: {
-              name: "",
-              type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USER,
-            },
+            oldColumn: "user relationship",
+            newColumn: "",
           },
           { status: 400 }
         )
@@ -739,12 +744,8 @@ describe.each([
         await config.api.table.migrate(
           table._id!,
           {
-            oldColumn: table.schema["user relationship"],
-            newColumn: {
-              name: "_id",
-              type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USER,
-            },
+            oldColumn: "user relationship",
+            newColumn: "_id",
           },
           { status: 400 }
         )
@@ -754,12 +755,8 @@ describe.each([
         await config.api.table.migrate(
           table._id!,
           {
-            oldColumn: table.schema["user relationship"],
-            newColumn: {
-              name: "num",
-              type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USER,
-            },
+            oldColumn: "user relationship",
+            newColumn: "num",
           },
           { status: 400 }
         )
@@ -769,16 +766,8 @@ describe.each([
         await config.api.table.migrate(
           table._id!,
           {
-            oldColumn: {
-              name: "not a column",
-              type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USER,
-            },
-            newColumn: {
-              name: "new column",
-              type: FieldType.BB_REFERENCE,
-              subtype: BBReferenceFieldSubType.USER,
-            },
+            oldColumn: "not a column",
+            newColumn: "new column",
           },
           { status: 400 }
         )
diff --git a/packages/server/src/sdk/app/tables/migration.ts b/packages/server/src/sdk/app/tables/migration.ts
index 732773f164..d0decf01f6 100644
--- a/packages/server/src/sdk/app/tables/migration.ts
+++ b/packages/server/src/sdk/app/tables/migration.ts
@@ -25,25 +25,58 @@ export interface MigrationResult {
 
 export async function migrate(
   table: Table,
-  oldColumn: FieldSchema,
-  newColumn: FieldSchema
+  oldColumnName: string,
+  newColumnName: string
 ): Promise<MigrationResult> {
-  if (newColumn.name in table.schema) {
-    throw new BadRequestError(`Column "${newColumn.name}" already exists`)
+  if (newColumnName in table.schema) {
+    throw new BadRequestError(`Column "${newColumnName}" already exists`)
   }
 
-  if (newColumn.name === "") {
+  if (newColumnName === "") {
     throw new BadRequestError(`Column name cannot be empty`)
   }
 
-  if (dbCore.isInternalColumnName(newColumn.name)) {
+  if (dbCore.isInternalColumnName(newColumnName)) {
     throw new BadRequestError(`Column name cannot be a reserved column name`)
   }
 
+  const oldColumn = table.schema[oldColumnName]
+
+  if (!oldColumn) {
+    throw new BadRequestError(
+      `Column "${oldColumnName}" does not exist on table "${table.name}"`
+    )
+  }
+
+  if (
+    oldColumn.type !== FieldType.LINK ||
+    oldColumn.tableId !== InternalTable.USER_METADATA
+  ) {
+    throw new BadRequestError(
+      `Only user relationship migration columns is currently supported`
+    )
+  }
+
+  const type =
+    oldColumn.relationshipType === RelationshipType.ONE_TO_MANY
+      ? FieldType.BB_REFERENCE_SINGLE
+      : FieldType.BB_REFERENCE
+  const newColumn: FieldSchema = {
+    name: newColumnName,
+    type,
+    subtype: BBReferenceFieldSubType.USER,
+  }
+
+  if (newColumn.type === FieldType.BB_REFERENCE) {
+    newColumn.constraints = {
+      type: "array",
+    }
+  }
+
   table.schema[newColumn.name] = newColumn
   table = await sdk.tables.saveTable(table)
 
-  let migrator = getColumnMigrator(table, oldColumn, newColumn)
+  const migrator = getColumnMigrator(table, oldColumn, newColumn)
   try {
     return await migrator.doMigration()
   } catch (e) {
diff --git a/packages/types/src/api/web/app/table.ts b/packages/types/src/api/web/app/table.ts
index ffe59ae395..4e2e84baa0 100644
--- a/packages/types/src/api/web/app/table.ts
+++ b/packages/types/src/api/web/app/table.ts
@@ -31,8 +31,8 @@ export interface BulkImportResponse {
 }
 
 export interface MigrateRequest {
-  oldColumn: FieldSchema
-  newColumn: FieldSchema
+  oldColumn: string
+  newColumn: string
 }
 
 export interface MigrateResponse {

From 95a9641c087103c2486ee132309cca8b22c5ba1a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 May 2024 11:55:15 +0100
Subject: [PATCH 04/18] Remove logic from frontend

---
 .../grid/controls/MigrationModal.svelte        | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
index 5613598a26..8ecec03e0e 100644
--- a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
+++ b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
@@ -7,11 +7,6 @@
   } from "@budibase/bbui"
   import { getContext } from "svelte"
   import { ValidColumnNameRegex } from "@budibase/shared-core"
-  import {
-    BBReferenceFieldSubType,
-    FieldType,
-    RelationshipType,
-  } from "@budibase/types"
 
   const { API, definition, rows } = getContext("grid")
 
@@ -33,20 +28,11 @@
   }
 
   const migrateUserColumn = async () => {
-    const type =
-      column.schema.relationshipType === RelationshipType.ONE_TO_MANY
-        ? FieldType.BB_REFERENCE_SINGLE
-        : FieldType.BB_REFERENCE
-
     try {
       await API.migrateColumn({
         tableId: $definition._id,
-        oldColumn: column.schema,
-        newColumn: {
-          name: newColumnName,
-          type,
-          subtype: BBReferenceFieldSubType.USER,
-        },
+        oldColumn: column.schema.name,
+        newColumn: newColumnName,
       })
       notifications.success("Column migrated")
     } catch (e) {

From b36d7868a47a791b7950415894843e39791ded66 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 2 May 2024 13:39:20 +0100
Subject: [PATCH 05/18] Lint

---
 packages/server/src/api/routes/tests/table.spec.ts | 2 +-
 packages/types/src/api/web/app/table.ts            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts
index 33bd3dba5c..cca2f0d908 100644
--- a/packages/server/src/api/routes/tests/table.spec.ts
+++ b/packages/server/src/api/routes/tests/table.spec.ts
@@ -699,7 +699,7 @@ describe.each([
       ])
     })
 
-    describe.only("unhappy paths", () => {
+    describe("unhappy paths", () => {
       let table: Table
       beforeAll(async () => {
         table = await config.api.table.save(
diff --git a/packages/types/src/api/web/app/table.ts b/packages/types/src/api/web/app/table.ts
index 4e2e84baa0..c9d63feaab 100644
--- a/packages/types/src/api/web/app/table.ts
+++ b/packages/types/src/api/web/app/table.ts
@@ -1,5 +1,4 @@
 import {
-  FieldSchema,
   Row,
   Table,
   TableRequest,

From 457eebbcb43ec0f7fdf63d6978ed77e9b3abb93b Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 17:29:47 +0200
Subject: [PATCH 06/18] Fix types

---
 packages/builder/src/constants/backend/index.js | 13 ++-----------
 packages/frontend-core/src/constants.js         |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index 491d7f0e99..75f6a053b5 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -165,20 +165,11 @@ export const FIELDS = {
       BBReferenceFieldSubType.USER
     ],
   },
-  // Used for display of editing existing columns
-  DEPRECATED_USER: {
-    name: "User",
-    type: FieldType.BB_REFERENCE,
-    subtype: BBReferenceFieldSubType.USER,
-    icon: TypeIconMap[FieldType.BB_REFERENCE_SINGLE][
-      BBReferenceFieldSubType.USER
-    ],
-  },
   USERS: {
     name: "User List",
     type: FieldType.BB_REFERENCE,
-    subtype: BBReferenceFieldSubType.USERS,
-    icon: TypeIconMap[FieldType.BB_REFERENCE][BBReferenceFieldSubType.USERS],
+    subtype: BBReferenceFieldSubType.USER,
+    icon: TypeIconMap[FieldType.BB_REFERENCE][BBReferenceFieldSubType.USER],
     constraints: {
       type: "array",
     },
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 9915e2e0b2..d9e3509a96 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -132,7 +132,7 @@ export const TypeIconMap = {
   [FieldType.BIGINT]: "TagBold",
   [FieldType.AUTO]: "MagicWand",
   [FieldType.BB_REFERENCE]: {
-    [BBReferenceFieldSubType.USER]: "User",
+    [BBReferenceFieldSubType.USER]: "UserGroup",
     [BBReferenceFieldSubType.USERS]: "UserGroup",
   },
   [FieldType.BB_REFERENCE_SINGLE]: {

From 9a6e6ed1158e45e456f7f713bc6d6a3f520c7ebc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 17:53:59 +0200
Subject: [PATCH 07/18] Fix data between old and new

---
 .../grid/cells/BBReferenceCell.svelte         | 27 ++++++++++++++-----
 packages/server/src/integrations/base/sql.ts  |  4 +--
 .../server/src/integrations/base/sqlTable.ts  | 15 +----------
 .../server/src/sdk/app/rows/search/utils.ts   | 10 +------
 packages/server/src/utilities/schema.ts       | 18 +++----------
 packages/shared-core/src/filters.ts           | 11 ++------
 6 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index ebfb33d884..743b6695bf 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -1,22 +1,35 @@
 <script>
   import { getContext } from "svelte"
   import RelationshipCell from "./RelationshipCell.svelte"
-  import { BBReferenceFieldSubType, RelationshipType } from "@budibase/types"
+  import {
+    BBReferenceFieldSubType,
+    FieldType,
+    RelationshipType,
+  } from "@budibase/types"
 
   export let api
   export let hideCounter = false
 
   const { API } = getContext("grid")
-  const { subtype } = $$props.schema
+  const { type, subtype, constraints } = $$props.schema
 
-  const schema = {
+  let relationshipType
+
+  $: {
+    if (type === FieldType.BB_REFERENCE_SINGLE) {
+      relationshipType = RelationshipType.ONE_TO_MANY
+    } else if (constraints?.type === "array") {
+      relationshipType = RelationshipType.MANY_TO_MANY
+    } else {
+      relationshipType = RelationshipType.ONE_TO_MANY
+    }
+  }
+
+  $: schema = {
     ...$$props.schema,
     // This is not really used, just adding some content to be able to render the relationship cell
     tableId: "external",
-    relationshipType:
-      subtype === BBReferenceFieldSubType.USER
-        ? RelationshipType.ONE_TO_MANY
-        : RelationshipType.MANY_TO_MANY,
+    relationshipType,
   }
 
   async function searchFunction(searchParams) {
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index ae3e8e8aea..d45ed61c41 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -765,9 +765,7 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
     field: FieldSchema
   ): field is JsonFieldMetadata | BBReferenceFieldMetadata {
     return (
-      field.type === FieldType.JSON ||
-      (field.type === FieldType.BB_REFERENCE &&
-        field.subtype === BBReferenceFieldSubType.USERS)
+      field.type === FieldType.JSON || field.type === FieldType.BB_REFERENCE
     )
   }
 
diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts
index 720a61805f..8cf4e62784 100644
--- a/packages/server/src/integrations/base/sqlTable.ts
+++ b/packages/server/src/integrations/base/sqlTable.ts
@@ -63,20 +63,6 @@ function generateSchema(
       case FieldType.BB_REFERENCE_SINGLE:
         schema.text(key)
         break
-      case FieldType.BB_REFERENCE: {
-        const subtype = column.subtype
-        switch (subtype) {
-          case BBReferenceFieldSubType.USER:
-            schema.text(key)
-            break
-          case BBReferenceFieldSubType.USERS:
-            schema.json(key)
-            break
-          default:
-            throw utils.unreachable(subtype)
-        }
-        break
-      }
       case FieldType.NUMBER:
         // if meta is specified then this is a junction table entry
         if (column.meta && column.meta.toKey && column.meta.toTable) {
@@ -99,6 +85,7 @@ function generateSchema(
         })
         break
       case FieldType.ARRAY:
+      case FieldType.BB_REFERENCE:
         schema.json(key)
         break
       case FieldType.LINK:
diff --git a/packages/server/src/sdk/app/rows/search/utils.ts b/packages/server/src/sdk/app/rows/search/utils.ts
index 63b5616eff..75f5d4e0ae 100644
--- a/packages/server/src/sdk/app/rows/search/utils.ts
+++ b/packages/server/src/sdk/app/rows/search/utils.ts
@@ -99,15 +99,7 @@ export function searchInputMapping(table: Table, options: RowSearchParams) {
         break
       }
       case FieldType.BB_REFERENCE: {
-        const subtype = column.subtype
-        switch (subtype) {
-          case BBReferenceFieldSubType.USER:
-          case BBReferenceFieldSubType.USERS:
-            userColumnMapping(key, options)
-            break
-          default:
-            utils.unreachable(subtype)
-        }
+        userColumnMapping(key, options)
         break
       }
     }
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index 51f67813ed..f6b254211d 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -140,21 +140,9 @@ export function parse(rows: Rows, schema: TableSchema): Rows {
           : columnData
       } else if (columnType === FieldType.BB_REFERENCE) {
         const parsedValues =
-          !!columnData && parseCsvExport<{ _id: string }[]>(columnData)
-        if (!parsedValues) {
-          parsedRow[columnName] = undefined
-        } else {
-          switch (columnSubtype) {
-            case BBReferenceFieldSubType.USER:
-              parsedRow[columnName] = parsedValues[0]?._id
-              break
-            case BBReferenceFieldSubType.USERS:
-              parsedRow[columnName] = parsedValues.map(u => u._id)
-              break
-            default:
-              utils.unreachable(columnSubtype)
-          }
-        }
+          (!!columnData && parseCsvExport<{ _id: string }[]>(columnData)) || []
+
+        parsedRow[columnName] = parsedValues?.map(u => u._id)
       } else if (columnType === FieldType.BB_REFERENCE_SINGLE) {
         const parsedValue =
           columnData && parseCsvExport<{ _id: string }>(columnData)
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 33e6a06f97..3a5a3e4af0 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -68,16 +68,9 @@ export const getValidOperatorsForType = (
     ops = numOps
   } else if (type === FieldType.FORMULA && formulaType === FormulaType.STATIC) {
     ops = stringOps.concat([Op.MoreThan, Op.LessThan])
-  } else if (
-    (type === FieldType.BB_REFERENCE_SINGLE ||
-      type === FieldType.BB_REFERENCE) &&
-    subtype == BBReferenceFieldSubType.USER
-  ) {
+  } else if (type === FieldType.BB_REFERENCE_SINGLE) {
     ops = [Op.Equals, Op.NotEquals, Op.Empty, Op.NotEmpty, Op.In]
-  } else if (
-    type === FieldType.BB_REFERENCE &&
-    subtype == BBReferenceFieldSubType.USERS
-  ) {
+  } else if (type === FieldType.BB_REFERENCE) {
     ops = [Op.Contains, Op.NotContains, Op.ContainsAny, Op.Empty, Op.NotEmpty]
   }
 

From dcc357f00a7ec9b1d2d3d797f691ce1265c2aac3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 18:10:18 +0200
Subject: [PATCH 08/18] Fix header icon

---
 .../frontend-core/src/components/grid/lib/utils.js   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index 02e6d66e0e..096409b925 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -1,3 +1,4 @@
+import { BBReferenceFieldSubType, FieldType } from "@budibase/types"
 import { TypeIconMap } from "../../../constants"
 
 export const getColor = (idx, opacity = 0.3) => {
@@ -11,7 +12,16 @@ export const getColumnIcon = column => {
   if (column.schema.autocolumn) {
     return "MagicWand"
   }
-  const { type, subtype } = column.schema
+
+  const { type, subtype, constraints } = column.schema
+  if (
+    type === FieldType.BB_REFERENCE &&
+    subtype === BBReferenceFieldSubType.USER &&
+    constraints?.type !== "array"
+  ) {
+    // This will handle old single users columns
+    return "User"
+  }
 
   const result =
     typeof TypeIconMap[type] === "object" && subtype

From e39a65cad2cc8877b926df4bac57f017d4f6bbbf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 18:22:06 +0200
Subject: [PATCH 09/18] Fix edit old

---
 .../DataTable/modals/CreateEditColumn.svelte  | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 643d7710f5..b06e62613d 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -29,7 +29,11 @@
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
   import { getBindings } from "components/backend/DataTable/formula"
   import JSONSchemaModal from "./JSONSchemaModal.svelte"
-  import { FieldType, SourceName } from "@budibase/types"
+  import {
+    BBReferenceFieldSubType,
+    FieldType,
+    SourceName,
+  } from "@budibase/types"
   import RelationshipSelector from "components/common/RelationshipSelector.svelte"
   import { RowUtils } from "@budibase/frontend-core"
   import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
@@ -356,9 +360,33 @@
 
   function getAllowedTypes(datasource) {
     if (originalName) {
-      const possibleTypes = SWITCHABLE_TYPES[field.type] || [
-        editableColumn.type,
-      ]
+      let possibleTypes = SWITCHABLE_TYPES[field.type] || [editableColumn.type]
+      if (
+        editableColumn.type === FieldType.BB_REFERENCE &&
+        editableColumn.subtype === BBReferenceFieldSubType.USER &&
+        editableColumn.constraints?.type !== "array"
+      ) {
+        // This will handle old single users columns
+        return [
+          {
+            ...FIELDS.USER,
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+          },
+        ]
+      } else if (
+        editableColumn.type === FieldType.BB_REFERENCE &&
+        editableColumn.subtype === BBReferenceFieldSubType.USERS
+      ) {
+        // This will handle old multi users columns
+        return [
+          {
+            ...FIELDS.USERS,
+            subtype: BBReferenceFieldSubType.USERS,
+          },
+        ]
+      }
+
       return Object.entries(FIELDS)
         .filter(([_, field]) => possibleTypes.includes(field.type))
         .map(([_, fieldDefinition]) => fieldDefinition)

From 04ed10b06e067441377df83cd0d60e4e416f1ac3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 18:27:56 +0200
Subject: [PATCH 10/18] Lint

---
 packages/server/src/integrations/base/sql.ts      | 1 -
 packages/server/src/integrations/base/sqlTable.ts | 1 -
 packages/server/src/utilities/schema.ts           | 2 +-
 packages/shared-core/src/filters.ts               | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index d45ed61c41..e61089ef2c 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -12,7 +12,6 @@ import SqlTableQueryBuilder from "./sqlTable"
 import {
   BBReferenceFieldMetadata,
   FieldSchema,
-  BBReferenceFieldSubType,
   FieldType,
   JsonFieldMetadata,
   Operation,
diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts
index 8cf4e62784..2af3fb096e 100644
--- a/packages/server/src/integrations/base/sqlTable.ts
+++ b/packages/server/src/integrations/base/sqlTable.ts
@@ -1,6 +1,5 @@
 import { Knex, knex } from "knex"
 import {
-  BBReferenceFieldSubType,
   FieldType,
   NumberFieldMetadata,
   Operation,
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index f6b254211d..7c77d1f667 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -129,7 +129,7 @@ export function parse(rows: Rows, schema: TableSchema): Rows {
         return
       }
 
-      const { type: columnType, subtype: columnSubtype } = schema[columnName]
+      const { type: columnType } = schema[columnName]
       if (columnType === FieldType.NUMBER) {
         // If provided must be a valid number
         parsedRow[columnName] = columnData ? Number(columnData) : columnData
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 3a5a3e4af0..2438e7f840 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -51,7 +51,7 @@ export const getValidOperatorsForType = (
     value: string
     label: string
   }[] = []
-  const { type, subtype, formulaType } = fieldType
+  const { type, formulaType } = fieldType
   if (type === FieldType.STRING) {
     ops = stringOps
   } else if (type === FieldType.NUMBER || type === FieldType.BIGINT) {

From 86e129cae00b98186d809dcf7acfeedf2b3a2197 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 18:37:17 +0200
Subject: [PATCH 11/18] Fix

---
 .../backend/TableNavigator/ExistingTableDataImport.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
index e79725c447..318f459f46 100644
--- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
@@ -59,7 +59,7 @@
       value: FieldType.ATTACHMENTS,
     },
     {
-      label: "User",
+      label: "Users",
       value: `${FieldType.BB_REFERENCE}${BBReferenceFieldSubType.USER}`,
     },
     {

From 84cfbf01eafe4e24263998e7ea0f69c8911b56f5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 18:42:44 +0200
Subject: [PATCH 12/18] Fix import

---
 packages/server/src/utilities/schema.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index 7c77d1f667..2dff1acb5c 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -188,10 +188,6 @@ function isValidBBReference(
         return false
       }
 
-      if (subtype === BBReferenceFieldSubType.USER && userArray.length > 1) {
-        return false
-      }
-
       const constainsWrongId = userArray.find(
         user => !db.isGlobalUserID(user._id)
       )

From 823b5bdb7a958ed4cdd0bc7f94d8ce0870aaab31 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 19:58:27 +0200
Subject: [PATCH 13/18] Fix

---
 .../src/components/grid/cells/BBReferenceCell.svelte         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index 743b6695bf..b239b42dbe 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -9,9 +9,10 @@
 
   export let api
   export let hideCounter = false
+  export let schema
 
   const { API } = getContext("grid")
-  const { type, subtype, constraints } = $$props.schema
+  const { type, subtype, constraints } = schema
 
   let relationshipType
 
@@ -58,7 +59,7 @@
 
 <RelationshipCell
   bind:api
-  {...$$props}
+  {...$$restProps}
   {schema}
   {searchFunction}
   primaryDisplay={"email"}

From a86d23584e4e34503cfaed3af97661e9984e236a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 May 2024 19:50:04 +0200
Subject: [PATCH 14/18] Clean

---
 .../src/components/grid/cells/BBReferenceCell.svelte     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index b239b42dbe..138ad68834 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -17,12 +17,13 @@
   let relationshipType
 
   $: {
-    if (type === FieldType.BB_REFERENCE_SINGLE) {
+    if (
+      type === FieldType.BB_REFERENCE_SINGLE ||
+      constraints?.type !== "array" // Handle deprecated "single" user references
+    ) {
       relationshipType = RelationshipType.ONE_TO_MANY
-    } else if (constraints?.type === "array") {
-      relationshipType = RelationshipType.MANY_TO_MANY
     } else {
-      relationshipType = RelationshipType.ONE_TO_MANY
+      relationshipType = RelationshipType.MANY_TO_MANY
     }
   }
 

From fbc969eda4f9785e24d2d8a3c75216f1a9a5abc5 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 6 May 2024 08:20:36 +0200
Subject: [PATCH 15/18] Fix cast

---
 .../client/src/components/app/forms/RelationshipField.svelte    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index f8a84a00cb..a6d0564f7f 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -60,7 +60,7 @@
       // Persist the initial values as options, allowing them to be present in the dropdown,
       // even if they are not in the inital fetch results
       let valueAsSafeArray = fieldState.value || []
-      if (!Array.isArray(fieldState.value)) {
+      if (!Array.isArray(valueAsSafeArray)) {
         valueAsSafeArray = [fieldState.value]
       }
       optionsObj = valueAsSafeArray.reduce((accumulator, value) => {

From aabed795ecfc3991ccd3ac052b0b8c7cc60a8425 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 6 May 2024 08:27:21 +0200
Subject: [PATCH 16/18] Fix mappings

---
 packages/server/src/api/controllers/row/utils/basic.ts | 5 +++++
 packages/server/src/integrations/base/sql.ts           | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index 02f92e15e9..aed0ba3232 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -108,6 +108,11 @@ export function fixArrayTypes(row: Row, table: Table) {
       [FieldType.ARRAY, FieldType.BB_REFERENCE].includes(schema.type) &&
       typeof row[fieldName] === "string"
     ) {
+      // Handling old single user type
+      if (schema.constraints?.type !== "array") {
+        continue
+      }
+
       try {
         row[fieldName] = JSON.parse(row[fieldName])
       } catch (err) {
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index e61089ef2c..5ae09d44f2 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -764,7 +764,10 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
     field: FieldSchema
   ): field is JsonFieldMetadata | BBReferenceFieldMetadata {
     return (
-      field.type === FieldType.JSON || field.type === FieldType.BB_REFERENCE
+      field.type === FieldType.JSON ||
+      (field.type === FieldType.BB_REFERENCE &&
+        // Handling old single user type
+        field.constraints?.type === "array")
     )
   }
 

From 9ae1928e55552b3c0609a9efb1a2d373dd0f55d3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 6 May 2024 08:45:34 +0200
Subject: [PATCH 17/18] Fix

---
 .../src/api/controllers/row/utils/basic.ts     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index aed0ba3232..6962c13fff 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -1,5 +1,5 @@
 // need to handle table name + field or just field, depending on if relationships used
-import { FieldType, Row, Table } from "@budibase/types"
+import { BBReferenceFieldSubType, FieldType, Row, Table } from "@budibase/types"
 import { generateRowIdField } from "../../../../integrations/utils"
 import { CONSTANT_INTERNAL_ROW_COLS } from "../../../../db/utils"
 
@@ -108,16 +108,18 @@ export function fixArrayTypes(row: Row, table: Table) {
       [FieldType.ARRAY, FieldType.BB_REFERENCE].includes(schema.type) &&
       typeof row[fieldName] === "string"
     ) {
-      // Handling old single user type
-      if (schema.constraints?.type !== "array") {
-        continue
-      }
-
       try {
         row[fieldName] = JSON.parse(row[fieldName])
       } catch (err) {
-        // couldn't convert back to array, ignore
-        delete row[fieldName]
+        // Handling deprecated  single user type
+        const isDeprecatedSingleUser =
+          schema.type === FieldType.BB_REFERENCE &&
+          schema.subtype === BBReferenceFieldSubType.USER &&
+          schema.constraints?.type !== "array"
+        if (!isDeprecatedSingleUser) {
+          // couldn't convert back to array, ignore
+          delete row[fieldName]
+        }
       }
     }
   }

From 95faefcb87d9a6fd7a214abd30a9a760407348bd Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 9 May 2024 12:28:44 +0200
Subject: [PATCH 18/18] DRY

---
 .../DataTable/modals/CreateEditColumn.svelte  | 12 +++++-----
 .../grid/cells/BBReferenceCell.svelte         | 22 ++++++-------------
 .../src/components/grid/lib/utils.js          | 11 +++-------
 .../src/api/controllers/row/utils/basic.ts    | 10 +++------
 packages/shared-core/src/helpers/index.ts     |  1 +
 packages/shared-core/src/helpers/schema.ts    | 13 +++++++++++
 6 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 packages/shared-core/src/helpers/schema.ts

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index b06e62613d..69aaa4cd88 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -13,7 +13,11 @@
     Layout,
     AbsTooltip,
   } from "@budibase/bbui"
-  import { SWITCHABLE_TYPES, ValidColumnNameRegex } from "@budibase/shared-core"
+  import {
+    SWITCHABLE_TYPES,
+    ValidColumnNameRegex,
+    helpers,
+  } from "@budibase/shared-core"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
   import { tables, datasources } from "stores/builder"
@@ -361,11 +365,7 @@
   function getAllowedTypes(datasource) {
     if (originalName) {
       let possibleTypes = SWITCHABLE_TYPES[field.type] || [editableColumn.type]
-      if (
-        editableColumn.type === FieldType.BB_REFERENCE &&
-        editableColumn.subtype === BBReferenceFieldSubType.USER &&
-        editableColumn.constraints?.type !== "array"
-      ) {
+      if (helpers.schema.isDeprecatedSingleUserColumn(editableColumn)) {
         // This will handle old single users columns
         return [
           {
diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index 138ad68834..5d98ba903b 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -1,5 +1,6 @@
 <script>
   import { getContext } from "svelte"
+  import { helpers } from "@budibase/shared-core"
   import RelationshipCell from "./RelationshipCell.svelte"
   import {
     BBReferenceFieldSubType,
@@ -12,26 +13,17 @@
   export let schema
 
   const { API } = getContext("grid")
-  const { type, subtype, constraints } = schema
-
-  let relationshipType
-
-  $: {
-    if (
-      type === FieldType.BB_REFERENCE_SINGLE ||
-      constraints?.type !== "array" // Handle deprecated "single" user references
-    ) {
-      relationshipType = RelationshipType.ONE_TO_MANY
-    } else {
-      relationshipType = RelationshipType.MANY_TO_MANY
-    }
-  }
+  const { type, subtype } = schema
 
   $: schema = {
     ...$$props.schema,
     // This is not really used, just adding some content to be able to render the relationship cell
     tableId: "external",
-    relationshipType,
+    relationshipType:
+      type === FieldType.BB_REFERENCE_SINGLE ||
+      helpers.schema.isDeprecatedSingleUserColumn(schema)
+        ? RelationshipType.ONE_TO_MANY
+        : RelationshipType.MANY_TO_MANY,
   }
 
   async function searchFunction(searchParams) {
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js
index 096409b925..db7a104653 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.js
@@ -1,4 +1,4 @@
-import { BBReferenceFieldSubType, FieldType } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
 import { TypeIconMap } from "../../../constants"
 
 export const getColor = (idx, opacity = 0.3) => {
@@ -13,16 +13,11 @@ export const getColumnIcon = column => {
     return "MagicWand"
   }
 
-  const { type, subtype, constraints } = column.schema
-  if (
-    type === FieldType.BB_REFERENCE &&
-    subtype === BBReferenceFieldSubType.USER &&
-    constraints?.type !== "array"
-  ) {
-    // This will handle old single users columns
+  if (helpers.schema.isDeprecatedSingleUserColumn(column.schema)) {
     return "User"
   }
 
+  const { type, subtype } = column.schema
   const result =
     typeof TypeIconMap[type] === "object" && subtype
       ? TypeIconMap[type][subtype]
diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index 6962c13fff..0704e7db8c 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -1,5 +1,6 @@
 // need to handle table name + field or just field, depending on if relationships used
-import { BBReferenceFieldSubType, FieldType, Row, Table } from "@budibase/types"
+import { FieldType, Row, Table } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
 import { generateRowIdField } from "../../../../integrations/utils"
 import { CONSTANT_INTERNAL_ROW_COLS } from "../../../../db/utils"
 
@@ -111,12 +112,7 @@ export function fixArrayTypes(row: Row, table: Table) {
       try {
         row[fieldName] = JSON.parse(row[fieldName])
       } catch (err) {
-        // Handling deprecated  single user type
-        const isDeprecatedSingleUser =
-          schema.type === FieldType.BB_REFERENCE &&
-          schema.subtype === BBReferenceFieldSubType.USER &&
-          schema.constraints?.type !== "array"
-        if (!isDeprecatedSingleUser) {
+        if (!helpers.schema.isDeprecatedSingleUserColumn(schema)) {
           // couldn't convert back to array, ignore
           delete row[fieldName]
         }
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
index e76022b14b..c33ff2ab1e 100644
--- a/packages/shared-core/src/helpers/index.ts
+++ b/packages/shared-core/src/helpers/index.ts
@@ -1,3 +1,4 @@
 export * from "./helpers"
 export * from "./integrations"
 export * as cron from "./cron"
+export * as schema from "./schema"
diff --git a/packages/shared-core/src/helpers/schema.ts b/packages/shared-core/src/helpers/schema.ts
new file mode 100644
index 0000000000..548a5c9766
--- /dev/null
+++ b/packages/shared-core/src/helpers/schema.ts
@@ -0,0 +1,13 @@
+import {
+  BBReferenceFieldSubType,
+  FieldSchema,
+  FieldType,
+} from "@budibase/types"
+
+export function isDeprecatedSingleUserColumn(schema: FieldSchema) {
+  const result =
+    schema.type === FieldType.BB_REFERENCE &&
+    schema.subtype === BBReferenceFieldSubType.USER &&
+    schema.constraints?.type !== "array"
+  return result
+}