Clean and unify some test utils

packages/backend-core/tests/core/utilities/structures/index.ts

@@ -13,3 +13,4 @@ export * as userGroups from "./userGroups"
 export { generator } from "./generator"
 export * as scim from "./scim"
 export * as quotas from "./quotas"
+export * as tables from "./tables"

packages/backend-core/tests/core/utilities/structures/tables.ts

@@ -0,0 +1,68 @@
+import _ from "lodash"
+import {
+  Datasource,
+  FieldType,
+  INTERNAL_TABLE_SOURCE_ID,
+  Table,
+  TableSourceType,
+} from "@budibase/types"
+import { generator } from "./generator"
+
+export function tableForDatasource(
+  datasource?: Datasource,
+  ...extra: Partial<Table>[]
+): Table {
+  return _.merge(
+    {
+      name: generator.guid(),
+      type: "table",
+      sourceType: datasource
+        ? TableSourceType.EXTERNAL
+        : TableSourceType.INTERNAL,
+      sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
+      schema: {},
+    },
+    ...extra
+  )
+}
+
+export function basicTable(
+  datasource?: Datasource,
+  ...extra: Partial<Table>[]
+): Table {
+  return tableForDatasource(
+    datasource,
+    {
+      name: "TestTable",
+      schema: {
+        name: {
+          type: FieldType.STRING,
+          name: "name",
+          constraints: {
+            type: "string",
+          },
+        },
+        description: {
+          type: FieldType.STRING,
+          name: "description",
+          constraints: {
+            type: "string",
+          },
+        },
+      },
+    },
+    ...extra
+  )
+}
+
+export function externalTable(
+  datasource: Datasource,
+  ...extra: Partial<Table>[]
+) {
+  const baseTable = basicTable(datasource, ...extra)
+  return {
+    ...baseTable,
+    sourceId: datasource._id!,
+    sourceType: TableSourceType.EXTERNAL,
+  }
+}

packages/server/src/integration-test/mysql.spec.ts

@@ -16,7 +16,7 @@
   getDatasource,
   rawQuery,
 } from "../integrations/tests/utils"
 import { builderSocket } from "../websockets"
 import { generator } from "@budibase/backend-core/tests"
 // @ts-ignore
 fetch.mockSearch()
@@ -80,6 +80,10 @@
           name: "description",
           type: FieldType.STRING,
         },
+        date: {
+          name: "date",
+          type: FieldType.DATETIME,
+        },
         value: {
           name: "value",
           type: FieldType.NUMBER,

packages/server/src/integrations/utils.ts

@@ -4,6 +4,7 @@ import {
   Datasource,
   FieldType,
   TableSourceType,
+  FieldSchema,
 } from "@budibase/types"
 import { DocumentType, SEPARATOR } from "../db/utils"
 import { InvalidColumns, DEFAULT_BB_DATASOURCE_ID } from "../constants"
@@ -239,14 +240,15 @@ export function generateColumnDefinition(config: {
     constraints.inclusion = options
   }
 
-  const schema: any = {
+  const schema = {
     type: foundType,
     externalType,
     autocolumn,
     name,
     constraints,
-  }
-  if (foundType === FieldType.DATETIME) {
+  } as FieldSchema
+
+  if (schema.type === FieldType.DATETIME) {
     schema.dateOnly = SQL_DATE_ONLY_TYPES.includes(lowerCaseType)
     schema.timeOnly = SQL_TIME_ONLY_TYPES.includes(lowerCaseType)
   }

packages/server/src/tests/utilities/structures.ts

@@ -16,66 +16,29 @@ import {
   AutomationTrigger,
   AutomationTriggerStepId,
   Datasource,
-  FieldType,
   SourceName,
   Table,
-  INTERNAL_TABLE_SOURCE_ID,
-  TableSourceType,
   Query,
   Webhook,
   WebhookActionType,
 } from "@budibase/types"
 import { LoopInput, LoopStepType } from "../../definitions/automations"
-import { merge } from "lodash"
-import { generator } from "@budibase/backend-core/tests"
+import { structures } from "@budibase/backend-core/tests"
 
 const { BUILTIN_ROLE_IDS } = roles
 
 export function tableForDatasource(
   datasource?: Datasource,
   ...extra: Partial<Table>[]
 ): Table {
-  return merge(
-    {
-      name: generator.guid(),
-      type: "table",
-      sourceType: datasource
-        ? TableSourceType.EXTERNAL
-        : TableSourceType.INTERNAL,
-      sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
-      schema: {},
-    },
-    ...extra
-  )
+  return structures.tables.tableForDatasource(datasource, ...extra)
 }
 
 export function basicTable(
   datasource?: Datasource,
   ...extra: Partial<Table>[]
 ): Table {
-  return tableForDatasource(
-    datasource,
-    {
-      name: "TestTable",
-      schema: {
-        name: {
-          type: FieldType.STRING,
-          name: "name",
-          constraints: {
-            type: "string",
-          },
-        },
-        description: {
-          type: FieldType.STRING,
-          name: "description",
-          constraints: {
-            type: "string",
-          },
-        },
-      },
-    },
-    ...extra
-  )
+  return structures.tables.basicTable(datasource, ...extra)
 }
 
 export function basicView(tableId: string) {

packages/types/src/documents/app/table/schema.ts

@@ -90,6 +90,7 @@ export interface JsonFieldMetadata extends Omit<BaseFieldSchema, "subtype"> {
 export interface DateFieldMetadata extends Omit<BaseFieldSchema, "subtype"> {
   type: FieldType.DATETIME
   ignoreTimezones?: boolean
+  dateOnly?: boolean
   timeOnly?: boolean
   subtype?: AutoFieldSubType.CREATED_AT | AutoFieldSubType.UPDATED_AT
 }
@@ -114,6 +115,11 @@ export interface BBReferenceFieldMetadata
 
 export interface AttachmentFieldMetadata extends BaseFieldSchema {
   type: FieldType.ATTACHMENTS
+  constraints: FieldConstraints & { type: "array" }
+}
+
+export interface AttachmentSingleFieldMetadata extends BaseFieldSchema {
+  type: FieldType.ATTACHMENT_SINGLE
 }
 
 export interface FieldConstraints {
@@ -177,6 +183,7 @@ export type FieldSchema =
   | BBReferenceFieldMetadata
   | JsonFieldMetadata
   | AttachmentFieldMetadata
+  | AttachmentSingleFieldMetadata
 
 export interface TableSchema {
   [key: string]: FieldSchema
@@ -211,9 +218,3 @@ export function isBBReferenceField(
 ): field is BBReferenceFieldMetadata {
   return field.type === FieldType.BB_REFERENCE
 }
-
-export function isAttachmentField(
-  field: FieldSchema
-): field is AttachmentFieldMetadata {
-  return field.type === FieldType.ATTACHMENTS
-}