MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge import

This commit is contained in:
Rory Powell 2021-12-02 15:20:03 +00:00
parent 224516787d
commit cadd3cf259
2 changed files with 21 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/api/controllers/query/index.js
View File

@ -1,12 +1,12 @@
const { processString } = require("@budibase/string-templates") const { processString } = require("@budibase/string-templates")
const CouchDB = require("../../db") const CouchDB = require("../../../db")
const { const {
generateQueryID, generateQueryID,
getQueryParams, getQueryParams,
isProdAppID, isProdAppID,
} = require("../../db/utils") } = require("../../../db/utils")
const { BaseQueryVerbs } = require("../../constants") const { BaseQueryVerbs } = require("../../../constants")
const { Thread, ThreadType } = require("../../threads") const { Thread, ThreadType } = require("../../../threads")
const { save: saveDatasource } = require("../datasource") const { save: saveDatasource } = require("../datasource")
const { RestImporter } = require("./import") const { RestImporter } = require("./import")

783
packages/server/yarn.lock
View File

File diff suppressed because it is too large Load Diff