fix(server-core): Handle schemaPath default value correctly everywher…

…e (refix) (#8152)

.github/workflows/cloud.yml

@@ -15,6 +15,8 @@ on:
       - 'packages/cubejs-base-driver/**'
       - 'packages/cubejs-query-orchestrator/**'
       - 'packages/cubejs-schema-compiler/**'
+      - 'packages/cubejs-backend-shared/**'
+      - 'packages/cubejs-server-core/**'
       # drivers
       - 'packages/cubejs-athena-driver/**'
       - 'packages/cubejs-bigquery-driver/**'

.github/workflows/drivers-tests.yml

@@ -10,6 +10,8 @@ on:
       - 'packages/cubejs-testing-drivers/**'
       - 'packages/cubejs-testing-shared/**'
       - 'packages/cubejs-query-orchestrator/src/**'
+      - 'packages/cubejs-backend-shared/**'
+      - 'packages/cubejs-server-core/**'
       - 'packages/cubejs-base-driver/src/**'
       - 'packages/cubejs-jdbc-driver/src/**'
 
@@ -31,6 +33,8 @@ on:
       - 'packages/cubejs-testing-drivers/**'
       - 'packages/cubejs-testing-shared/**'
       - 'packages/cubejs-query-orchestrator/src/**'
+      - 'packages/cubejs-backend-shared/**'
+      - 'packages/cubejs-server-core/**'
       - 'packages/cubejs-base-driver/src/**'
       - 'packages/cubejs-jdbc-driver/src/**'
 

packages/cubejs-server-core/src/core/DevServer.ts

@@ -161,12 +161,10 @@ export class DevServer {
       });
       const files = scaffoldingTemplate.generateFilesByTableNames(req.body.tables, { dataSource });
 
-      const schemaPath = options.schemaPath || 'schema';
-
-      await fs.emptyDir(path.join(schemaPath, 'cubes'));
-      await fs.emptyDir(path.join(schemaPath, 'views'));
+      await fs.emptyDir(path.join(options.schemaPath, 'cubes'));
+      await fs.emptyDir(path.join(options.schemaPath, 'views'));
 
-      await fs.writeFile(path.join(schemaPath, 'views', 'example_view.yml'), `# In Cube, views are used to expose slices of your data graph and act as data marts.
+      await fs.writeFile(path.join(options.schemaPath, 'views', 'example_view.yml'), `# In Cube, views are used to expose slices of your data graph and act as data marts.
 # You can control which measures and dimensions are exposed to BIs or data apps, 
 # as well as the direction of joins between the exposed cubes.
 # You can learn more about views in documentation here - https://cube.dev/docs/schema/reference/view
@@ -195,7 +193,7 @@ export class DevServer {
 #         prefix: true
 #         includes: 
 #           - city`);
-      await Promise.all(files.map(file => fs.writeFile(path.join(schemaPath, 'cubes', file.fileName), file.content)));
+      await Promise.all(files.map(file => fs.writeFile(path.join(options.schemaPath, 'cubes', file.fileName), file.content)));
 
       res.json({ files });
     }));

packages/cubejs-server-core/src/core/OptsHandler.ts

@@ -468,7 +468,7 @@ export class OptsHandler {
         (this.isDevMode()
           ? 'dev_pre_aggregations'
           : 'prod_pre_aggregations'),
-      schemaPath: process.env.CUBEJS_SCHEMA_PATH || 'schema',
+      schemaPath: getEnv('schemaPath'),
       scheduledRefreshTimer: getEnv('refreshWorkerMode'),
       sqlCache: true,
       livePreview: getEnv('livePreview'),

packages/cubejs-server-core/src/core/types.ts

@@ -230,6 +230,7 @@ export type ServerCoreInitializedOptions = Required<
   'telemetry' |
   'dashboardAppPath' |
   'dashboardAppPort' |
+  'schemaPath' |
   'driverFactory' |
   'dialectFactory' |
   'externalDriverFactory' |

packages/cubejs-testing-drivers/src/helpers/getComposePath.ts

@@ -22,7 +22,7 @@ export function getComposePath(type: string, isLocal: boolean): [path: string, f
   const volumes = [
     './cube.js:/cube/conf/cube.js',
     './package.json:/cube/conf/package.json',
-    './schema/ecommerce.yaml:/cube/conf/schema/ecommerce.yaml',
+    './model/ecommerce.yaml:/cube/conf/model/ecommerce.yaml',
   ];
   const compose: any = {
     version: '2.2',

packages/cubejs-testing-drivers/src/helpers/getCore.ts

@@ -10,7 +10,7 @@ export function getCore(
   source: BaseDriver,
   storage: BaseDriver,
 ): CubejsServerCoreExposed {
-  const _path = path.resolve(process.cwd(), './.temp/schema/ecommerce.yaml');
+  const _path = path.resolve(process.cwd(), './.temp/model/ecommerce.yaml');
   return new CubejsServerCore({
     apiSecret: 'mysupersecret',
     // devServer: true,

packages/cubejs-testing-drivers/src/helpers/getSchemaPath.ts

@@ -9,7 +9,7 @@ import { getFixtures } from './getFixtures';
  * Returns schema yaml file by data source type.
  */
 export function getSchemaPath(type: string, suf?: string): [path: string, file: string] {
-  const _path = path.resolve(process.cwd(), './.temp/schema');
+  const _path = path.resolve(process.cwd(), './.temp/model');
   const _file = 'ecommerce.yaml';
   const { tables, preAggregations } = getFixtures(type);
   const _content = JSON.parse(fs.readFileSync(

packages/cubejs-testing-drivers/src/helpers/getTempPath.ts

@@ -10,5 +10,5 @@ export function getTempPath(): void {
     fs.rmdirSync(_temp, { recursive: true });
   }
   fs.mkdirSync(_temp);
-  fs.mkdirSync(path.resolve(_temp, './schema'));
+  fs.mkdirSync(path.resolve(_temp, './model'));
 }

packages/cubejs-testing-drivers/src/helpers/runEnvironment.ts

@@ -117,7 +117,6 @@ export async function runEnvironment(
   compose.withStartupTimeout((isCI() ? 60 : 30) * 1000);
   compose.withEnvironment({
     CUBEJS_TELEMETRY: 'false',
-    CUBEJS_SCHEMA_PATH: 'schema'
   });
 
   const _path = `${path.resolve(process.cwd(), `./fixtures/${type}.env`)}`;