fix: schemaVersion called with old context (#293)

Fixes #294
cube-js · Dec 24, 2019 · da10e39 · da10e39
1 parent 38e33ce
commit da10e39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/cubejs-server-core/core/CompilerApi.js b/packages/cubejs-server-core/core/CompilerApi.js
@@ -11,11 +11,12 @@ class CompilerApi {
     this.logger = this.options.logger;
     this.preAggregationsSchema = this.options.preAggregationsSchema;
     this.allowUngroupedWithoutPrimaryKey = this.options.allowUngroupedWithoutPrimaryKey;
+    this.schemaVersion = this.options.schemaVersion;
   }
 
   async getCompilers() {
     let compilerVersion = (
-      this.options.schemaVersion && this.options.schemaVersion() ||
+      this.schemaVersion && this.schemaVersion() ||
       'default_schema_version'
     ).toString();
     if (this.options.devServer) {

diff --git a/packages/cubejs-server-core/core/index.js b/packages/cubejs-server-core/core/index.js
@@ -287,17 +287,20 @@ class CubejsServerCore {
   getCompilerApi(context) {
     const appId = this.contextToAppId(context);
     let compilerApi = this.compilerCache.get(appId);
+    const currentSchemaVersion = this.options.schemaVersion && (() => this.options.schemaVersion(context));
     if (!compilerApi) {
       compilerApi = this.createCompilerApi(
         this.repositoryFactory(context), {
           dbType: (dataSourceContext) => this.contextToDbType({ ...context, ...dataSourceContext }),
           externalDbType: this.contextToExternalDbType(context),
-          schemaVersion: this.options.schemaVersion && (() => this.options.schemaVersion(context)),
+          schemaVersion: currentSchemaVersion,
           preAggregationsSchema: this.preAggregationsSchema(context)
         }
       );
       this.compilerCache.set(appId, compilerApi);
     }
+
+    compilerApi.schemaVersion = currentSchemaVersion;
     return compilerApi;
   }