@gingkoo/pandora-metabase 1.0.125 → 1.0.126

package/lib/cjs/utils.js

@@ -282,12 +282,39 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === _types.AtomsTypeEnum.SUB_QUERY) {
+      if (type === AliasType.table) {
+        v.subQuery = changeTableAlias(v.subQuery || [], {
+          tableUuid: val.uuid,
+          alias: val.alias
+        });
+      }
+      if (type === AliasType.field) {
+        v.subQuery = changeFieldAlias(v.subQuery || [], {
+          fieldUuid: val.uuid,
+          fieldAlias: val.alias
+        });
+      }
+      return v;
     } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
       v.args = _changeAlias(v.args, val, type);
       return v;
     } else if (v.type === _types.AtomsTypeEnum.COLLECTION) {
       v.list = _changeAlias(v.list, val, type);
       return v;
+    } else if (v.type === _types.AtomsTypeEnum.CASE_WHEN) {
+      v.caseValue = _changeAlias(v.caseValue || [], val, type);
+      v.branches = (v.branches || []).map(function (branch) {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, branch), {}, {
+          when: _changeAlias(branch.when || [], val, type),
+          then: _changeAlias(branch.then || [], val, type)
+        });
+      });
+      v.elseValue = _changeAlias(v.elseValue || [], val, type);
+      return v;
+    } else if (v.type === _types.AtomsTypeEnum.AND_OR) {
+      v.list = _changeAlias(v.list || [], val, type);
+      return v;
     } else {
       return v;
     }
@@ -353,27 +380,27 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
     }
     if (v.type === _enum.TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.tableUuid === tableUuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
+        } else if (group.tableUuid === tableUuid) {
           group.alias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.tableUuid === tableUuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          by.sql = (0, _helper.summarizeByToSql)(by);
+        } else if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });
@@ -417,27 +444,27 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
     if (v.type === _enum.TypeEnum.rowLimit) {}
     if (v.type === _enum.TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.fieldUuid === uuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
+        } else if (group.fieldUuid === uuid) {
           group.fieldAlias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.fieldUuid === uuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          by.sql = (0, _helper.summarizeByToSql)(by);
+        } else if (by.fieldUuid === uuid) {
           by.fieldAlias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });

package/lib/es/utils.js

@@ -269,12 +269,39 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === AtomsTypeEnum.SUB_QUERY) {
+      if (type === AliasType.table) {
+        v.subQuery = changeTableAlias(v.subQuery || [], {
+          tableUuid: val.uuid,
+          alias: val.alias
+        });
+      }
+      if (type === AliasType.field) {
+        v.subQuery = changeFieldAlias(v.subQuery || [], {
+          fieldUuid: val.uuid,
+          fieldAlias: val.alias
+        });
+      }
+      return v;
     } else if (v.type === AtomsTypeEnum.FORMULA) {
       v.args = _changeAlias(v.args, val, type);
       return v;
     } else if (v.type === AtomsTypeEnum.COLLECTION) {
       v.list = _changeAlias(v.list, val, type);
       return v;
+    } else if (v.type === AtomsTypeEnum.CASE_WHEN) {
+      v.caseValue = _changeAlias(v.caseValue || [], val, type);
+      v.branches = (v.branches || []).map(function (branch) {
+        return _objectSpread(_objectSpread({}, branch), {}, {
+          when: _changeAlias(branch.when || [], val, type),
+          then: _changeAlias(branch.then || [], val, type)
+        });
+      });
+      v.elseValue = _changeAlias(v.elseValue || [], val, type);
+      return v;
+    } else if (v.type === AtomsTypeEnum.AND_OR) {
+      v.list = _changeAlias(v.list || [], val, type);
+      return v;
     } else {
       return v;
     }
@@ -340,27 +367,27 @@ export var changeTableAlias = function changeTableAlias(list, curObj) {
     }
     if (v.type === TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.tableUuid === tableUuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          group.sql = summarizeToSql(v.group, group).sql;
+        } else if (group.tableUuid === tableUuid) {
           group.alias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           group.sql = summarizeToSql(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.tableUuid === tableUuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          by.sql = summarizeByToSql(by);
+        } else if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           by.sql = summarizeByToSql(by);
         }
       });
@@ -404,27 +431,27 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
     if (v.type === TypeEnum.rowLimit) {}
     if (v.type === TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.fieldUuid === uuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          group.sql = summarizeToSql(v.group, group).sql;
+        } else if (group.fieldUuid === uuid) {
           group.fieldAlias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           group.sql = summarizeToSql(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.fieldUuid === uuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          by.sql = summarizeByToSql(by);
+        } else if (by.fieldUuid === uuid) {
           by.fieldAlias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           by.sql = summarizeByToSql(by);
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.125",
+  "version": "1.0.126",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",