@budibase/server 1.0.9-alpha.0 → 1.0.11

package/dist/api/routes/query.js

@@ -2,14 +2,44 @@
 const Router = require("@koa/router");
 const queryController = require("../controllers/query");
 const authorized = require("../../middleware/authorized");
+const Joi = require("joi");
 const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/auth/permissions");
+const joiValidator = require("../../middleware/joi-validator");
 const { bodyResource, bodySubResource, paramResource, } = require("../../middleware/resourceId");
-const { generateQueryPreviewValidation, generateQueryValidation, } = require("../controllers/query/validation");
 const router = Router();
+function generateQueryValidation() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        _id: Joi.string(),
+        _rev: Joi.string(),
+        name: Joi.string().required(),
+        fields: Joi.object().required(),
+        datasourceId: Joi.string().required(),
+        readable: Joi.boolean(),
+        parameters: Joi.array().items(Joi.object({
+            name: Joi.string(),
+            default: Joi.string().allow(""),
+        })),
+        queryVerb: Joi.string().allow().required(),
+        extra: Joi.object().optional(),
+        schema: Joi.object({}).required().unknown(true),
+        transformer: Joi.string().optional(),
+    }));
+}
+function generateQueryPreviewValidation() {
+    // prettier-ignore
+    return joiValidator.body(Joi.object({
+        fields: Joi.object().required(),
+        queryVerb: Joi.string().allow().required(),
+        extra: Joi.object().optional(),
+        datasourceId: Joi.string().required(),
+        transformer: Joi.string().optional(),
+        parameters: Joi.object({}).required().unknown(true)
+    }));
+}
 router
     .get("/api/queries", authorized(BUILDER), queryController.fetch)
     .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)
-    .post("/api/queries/import", authorized(BUILDER), queryController.import)
     .post("/api/queries/preview", bodyResource("datasourceId"), authorized(BUILDER), generateQueryPreviewValidation(), queryController.preview)
     .get("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
     .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.execute)

package/dist/integrations/mysql.js

@@ -107,7 +107,7 @@ var MySQLModule;
                 for (let tableName of tableNames) {
                     const primaryKeys = [];
                     const schema = {};
-                    const descResp = yield internalQuery(this.client, { sql: `DESCRIBE ${tableName};` }, false);
+                    const descResp = yield internalQuery(this.client, { sql: `DESCRIBE \`${tableName}\`;` }, false);
                     for (let column of descResp) {
                         const columnName = column.Field;
                         if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,10 +69,9 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
-        "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/auth": "^1.0.8",
-        "@budibase/client": "^1.0.8",
-        "@budibase/string-templates": "^1.0.8",
+        "@budibase/auth": "^1.0.10",
+        "@budibase/client": "^1.0.10",
+        "@budibase/string-templates": "^1.0.10",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -86,14 +85,12 @@
         "bull": "^3.22.4",
         "chmodr": "1.2.0",
         "csvtojson": "2.0.10",
-        "curlconverter": "^3.21.0",
         "dotenv": "8.2.0",
         "download": "8.0.0",
         "fix-path": "3.0.0",
         "fs-extra": "8.1.0",
         "jimp": "0.16.1",
         "joi": "17.2.1",
-        "js-yaml": "^4.1.0",
         "jsonschema": "1.4.0",
         "knex": "^0.95.6",
         "koa": "2.7.0",
@@ -149,7 +146,6 @@
         "eslint": "^6.8.0",
         "jest": "^27.0.5",
         "nodemon": "^2.0.4",
-        "openapi-types": "^9.3.1",
         "path-to-regexp": "^6.2.0",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",