Assert collation in the 'collation in order by' clickhouse integration test

Author: casab

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

@@ -1141,15 +1141,16 @@ const variables: Record<string, (...args: any) => any> = {
   /**
    * ClickHouse sort collation.
    */
-  clickhouseSortCollation: ({
-    dataSource
-  }: {
-    dataSource: string,
-  }) => (
-    process.env[
+  clickhouseSortCollation: ({ dataSource }: {dataSource: string }) => {
+    const val = process.env[
       keyByDataSource('CUBEJS_DB_CLICKHOUSE_SORT_COLLATION', dataSource)
-    ] || 'en'
-  ),
+    ];
+    if (!val) {
+      // Default to 'en' collation
+      return 'en';
+    }
+    return val;
+  },
 
   /**
    * Clickhouse use collation flag.

packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse-dataschema-compiler.test.ts

@@ -411,6 +411,9 @@ describe('ClickHouse DataSchemaCompiler', () => {
     });
     logSqlAndParams(query);
 
+    const collation = query.getCollation();
+    expect(collation).toEqual('en');
+
     const sqlAndParams = query.buildSqlAndParams();
     const res = await dbRunner.testQuery(sqlAndParams);
     const sql = sqlAndParams[0];