semanticdb-core 1.0.27 → 1.0.29

package/dist/common/dataSourceItem.d.ts

@@ -1,6 +1,6 @@
 export declare interface DataSourceItemType {
     id: string;
-    client: 'clickhouse' | 'mysql' | 'postgres' | 'starrocks' | 'oracle' | 'impala' | 'sybase';
+    client: 'clickhouse' | 'mysql' | 'postgres' | 'starrocks' | 'oracle' | 'impala' | 'sybase' | 'databricks';
     connection: {
         database: string;
         host: string;
@@ -12,6 +12,9 @@ export declare interface DataSourceItemType {
         cluster?: string;
         shardingKey?: string;
         time?: string;
+        sid?: string;
+        path?: string;
+        token?: string;
     };
     readonly?: boolean;
 }

package/dist/logicform/logicform.utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getValueByChain = exports.getFlattenQuery = exports.isDimensionInLogicform = exports.isDimensionInPred = exports.isDimensionInGroupby = exports.isDimensionInQuery = void 0;
 const date_1 = require("../common/date");
+const tws = (0, date_1.getSupportedTimeWindows)();
 /**
  * 判断一个维度是否在查询中被使用
  * @param query - 查询对象
@@ -23,7 +24,9 @@ const isDimensionInQuery = (query, dimension, strictMode = true) => {
         else if (dimension._id in flattenQuery) {
             if ((0, date_1.isStandardDateForm)(flattenQuery[dimension._id])) {
                 const minGran = (0, date_1.getMinGran)(flattenQuery[dimension._id]);
-                return minGran === dimension.level;
+                if (!minGran)
+                    return false;
+                return tws.indexOf(minGran) >= tws.indexOf(dimension.level);
             }
         }
     }
@@ -38,8 +41,22 @@ exports.isDimensionInQuery = isDimensionInQuery;
 const isDimensionInGroupby = (groupby, dimension) => {
     for (const groupbyItem of groupby) {
         if (typeof dimension === 'object') {
-            return ((groupbyItem._id === dimension._id || groupbyItem._id.startsWith(`${dimension._id}_`)) &&
-                groupbyItem.level === dimension.level);
+            // predItem check
+            if (groupbyItem._id === dimension._id || groupbyItem._id.startsWith(`${dimension._id}_`)) {
+                if (groupbyItem.level) {
+                    // level check
+                    if (tws.indexOf(groupbyItem.level) < 0) {
+                        return groupbyItem.level === dimension.level;
+                    }
+                    else {
+                        return tws.indexOf(groupbyItem.level) >= tws.indexOf(dimension.level);
+                    }
+                }
+                else {
+                    return true;
+                }
+            }
+            return false;
         }
         if (groupbyItem._id === dimension) {
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semanticdb-core",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [