chore: fix

Author: ovr

packages/cubejs-backend-shared/src/env.ts

@@ -354,11 +354,9 @@ const variables: Record<string, (...args: any) => any> = {
   /**
    * Driver type.
    */
-  dbType: ({
-    dataSource,
-    preAggregations,
-  }: DataSourceOpts) => (
-    get(keyByDataSource('CUBEJS_DB_TYPE', dataSource, preAggregations)).asString()
+  dbType: ({ dataSource }: DataSourceOpts) => (
+    // We don't support different driverType for pre-aggregations right now
+    get(keyByDataSource('CUBEJS_DB_TYPE', dataSource, false)).asString()
   ),
 
   /**

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

@@ -601,17 +601,22 @@ export class CubejsServerCore {
        * Driver factory function `DriverFactoryByDataSource`.
        */
       async (dataSource = 'default', preAggregations = false) => {
-        // Only create a separate pre-agg driver when credentials are actually
-        // configured (custom driverFactory or PRE_AGGREGATIONS env vars).
-        const usePreAgg = preAggregations && (
-          !!this.options.driverFactory || hasPreAggregationsEnvVars(dataSource)
-        );
-        const factoryKey = usePreAgg ? `${dataSource}__pre_agg` : dataSource;
+        const requiredSeparatePreAggDriver = preAggregations && hasPreAggregationsEnvVars(dataSource);
+        const usePreAgg = requiredSeparatePreAggDriver && !this.options.driverFactory;
+
+        const factoryKey = usePreAgg ? `${dataSource}@pre_agg` : dataSource;
 
         if (driverPromise[factoryKey]) {
           return driverPromise[factoryKey];
         }
 
+        if (requiredSeparatePreAggDriver && this.options.driverFactory) {
+          this.logger('Pre-aggregation driver conflict', {
+            error: 'Both driverFactory and PRE_AGGREGATIONS env vars are defined. driverFactory will take precedence.',
+            dataSource,
+          });
+        }
+
         // eslint-disable-next-line no-return-assign
         return driverPromise[factoryKey] = (async () => {
           let driver: BaseDriver | null = null;