Browse Source

Fixes based on re-trying everything with the new type structures (some empty structures being filled out affected things).

pull/7227/head
mike12345567 4 years ago
parent
commit
f48fcfd0c8
  1. 1
      packages/server/src/definitions/common.ts
  2. 5
      packages/server/src/migrations/functions/backfill/app/queries.ts
  3. 6
      packages/types/src/documents/app/datasource.ts
  4. 1
      packages/types/src/sdk/datasources.ts

1
packages/server/src/definitions/common.ts

@ -2,6 +2,7 @@ export { Query, Datasource } from "./datasource"
export { FieldSchema, TableSchema, Table, Document, Row } from "@budibase/types"
export interface Application extends Document {
_id: string
appId?: string
}

5
packages/server/src/migrations/functions/backfill/app/queries.ts

@ -1,6 +1,6 @@
import { events } from "@budibase/backend-core"
import { getQueryParams } from "../../../../db/utils"
import { Query, Datasource } from "@budibase/types"
import { Query, Datasource, SourceNames } from "@budibase/types"
const getQueries = async (appDb: any): Promise<Query[]> => {
const response = await appDb.allDocs(
@ -31,8 +31,9 @@ export const backfill = async (appDb: any, timestamp: string | number) => {
// and the query has not
if (e.status === 404) {
datasource = {
type: "unknown",
_id: query.datasourceId,
source: "unknown",
source: SourceNames.UNKNOWN,
}
} else {
throw e

6
packages/types/src/documents/app/datasource.ts

@ -4,13 +4,13 @@ import { Table } from "./table"
export interface Datasource extends Document {
type: string
name: string
name?: string
source: SourceNames
// the config is defined by the schema
config: {
config?: {
[key: string]: string | number | boolean
}
plus: boolean
plus?: boolean
entities?: {
[key: string]: Table
}

1
packages/types/src/sdk/datasources.ts

@ -51,6 +51,7 @@ export enum SourceNames {
FIRESTORE = "FIRESTORE",
REDIS = "REDIS",
SNOWFLAKE = "SNOWFLAKE",
UNKNOWN = "unknown",
}
export enum IncludeRelationships {

Loading…
Cancel
Save