From 83e5a40c2d2beb663fec369a9b7384d608920334 Mon Sep 17 00:00:00 2001
From: Alexandr Romanenko <alex.romanenko@cube.dev>
Date: Fri, 20 Sep 2024 15:51:26 +0300
Subject: [PATCH] update

---
 packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts | 3 ++-
 packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js   | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts b/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
index 4d30317ccab56..e1240f27d5ccf 100644
--- a/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
+++ b/packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts
@@ -462,9 +462,10 @@ export class CubeEvaluator extends CubeSymbols {
 
   public isInstanceOfType(type: 'measures' | 'dimensions' | 'segments', path: string | string[]): boolean {
     const cubeAndName = Array.isArray(path) ? path : path.split('.');
-    return this.evaluatedCubes[cubeAndName[0]] &&
+    const symbol = this.evaluatedCubes[cubeAndName[0]] &&
       this.evaluatedCubes[cubeAndName[0]][type] &&
       this.evaluatedCubes[cubeAndName[0]][type][cubeAndName[1]];
+    return symbol !== undefined;
   }
 
   public byPathAnyType(path: string[]) {
diff --git a/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js b/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js
index 03fbea8487c10..49c0e8a37bb42 100644
--- a/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js
+++ b/packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js
@@ -608,8 +608,6 @@ export class CubeSymbols {
         const parentIndex = currResolveIndexFn();
         cube = this.cubeDependenciesProxy(parentIndex, newCubeName);
         return cube;
-      } else if (this.symbols[cubeName]?.[name]) {
-        depsResolveFn(name, undefined);
       }
     }
     return cube || (this.symbols[cubeName] && this.symbols[cubeName][name]);