feat: base query builder validation

teableio · Aug 8, 2024 · a4d9fa3 · a4d9fa3
1 parent da07cce
commit a4d9fa3
Show file tree

Hide file tree

Showing 14 changed files with 400 additions and 126 deletions.
diff --git a/apps/nestjs-backend/src/features/base/base-query/base-query.service.ts b/apps/nestjs-backend/src/features/base/base-query/base-query.service.ts
@@ -73,7 +73,7 @@ export class BaseQueryService {
       .$queryRawUnsafe<{ [key in string]: unknown }[]>(query)
       .catch((e) => {
         this.logger.error(e);
-        throw new BadRequestException(`Query failed: ${query}`);
+        throw new BadRequestException(`Query failed: ${query}, ${e.message}`);
       });
 
     return {

diff --git a/apps/nestjs-backend/src/features/base/base-query/parse/select.ts b/apps/nestjs-backend/src/features/base/base-query/parse/select.ts
@@ -39,6 +39,7 @@ export class QuerySelect {
             if (field && getQueryColumnTypeByFieldInstance(field) === BaseQueryColumnType.Field) {
               if (cur.alias) {
                 acc[cur.alias] = field.dbFieldName;
+                currentFieldMap[cur.column].name = cur.alias;
                 currentFieldMap[cur.column].dbFieldName = cur.alias;
               } else {
                 const alias = `${field.id}_${field.name}`;

diff --git a/packages/common-i18n/src/locales/en/sdk.json b/packages/common-i18n/src/locales/en/sdk.json
@@ -619,7 +619,9 @@
     "add": "Add",
     "error": {
       "invalidCol": "Invalid column, please reselect",
-      "invalidCols": "Invalid columns: {{colNames}}"
+      "invalidCols": "Invalid columns: {{colNames}}",
+      "invalidTable": "Invalid table, please reselect",
+      "requiredSelect": "You must select one"
     },
     "from": {
       "title": "From",

diff --git a/packages/common-i18n/src/locales/zh/sdk.json b/packages/common-i18n/src/locales/zh/sdk.json
@@ -620,7 +620,9 @@
     "add": "添加",
     "error": {
       "invalidCol": "无效的列，请重新选择",
-      "invalidCols": "无效的列：{{colNames}}"
+      "invalidCols": "无效的列：{{colNames}}",
+      "invalidTable": "无效的表格，请重新选择",
+      "requiredSelect": "必须选择一个"
     },
     "from": {
       "title": "来源",