fix(@cubejs-schema-compilter): MSSQL remove order by from subqueries

cube-js · Feb 18, 2021 · 75c1903 · 75c1903
1 parent 622f398
commit 75c1903
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 1 deletion.
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -923,7 +923,8 @@ export class BaseQuery {
       dimensions: [this.primaryKeyName(cubeName)],
       filters,
       segments,
-      timeDimensions
+      timeDimensions,
+      order: {}
     });
     return { prefix, subQuery, cubeName };
   }

diff --git a/packages/cubejs-schema-compiler/test/unit/mssql-query.test.ts b/packages/cubejs-schema-compiler/test/unit/mssql-query.test.ts
@@ -27,6 +27,57 @@ describe('MssqlQuery', () => {
           sql: 'created_at'
         }
       }
+    })
+
+    cube(\`Deals\`, {
+      sql: \`select * from deals\`,
+    
+      measures: {
+        amount: {
+          sql: \`amount\`,
+          type: \`sum\`
+        }
+      },
+
+      dimensions: {
+        salesManagerId: {
+          sql: \`sales_manager_id\`,
+          type: 'string',
+          primaryKey: true
+        }
+      }
+    })
+    
+    cube(\`SalesManagers\`, {
+      sql: \`select * from sales_managers\`,
+    
+      joins: {
+        Deals: {
+          relationship: \`hasMany\`,
+          sql: \`\${SalesManagers}.id = \${Deals}.sales_manager_id\`
+        }
+      },
+      
+      measures: {
+        averageDealAmount: {
+          sql: \`\${dealsAmount}\`,
+          type: \`avg\`
+        }
+      },
+    
+      dimensions: {
+        id: {
+          sql: \`id\`,
+          type: \`string\`,
+          primaryKey: true
+        },
+    
+        dealsAmount: {
+          sql: \`\${Deals.amount}\`,
+          type: \`number\`,
+          subQuery: true
+        }
+      }
     });
     `);
 
@@ -61,4 +112,26 @@ describe('MssqlQuery', () => {
 
       expect(finalGroupBy).toEqual('GROUP BY "visitors.createdAt_series"."date_from"');
     }));
+
+  it('should not include order by clauses in subqueries',
+    () => compiler.compile().then(() => {
+      const query = new MssqlQuery(
+        { joinGraph, cubeEvaluator, compiler },
+        {
+          dimensions: ['SalesManagers.id', 'SalesManagers.dealsAmount'],
+        }
+      );
+
+      const subQueryDimensions = query.collectFromMembers(
+        false,
+        query.collectSubQueryDimensionsFor.bind(query),
+        'collectSubQueryDimensionsFor'
+      );
+
+      const queryAndParams = query.buildSqlAndParams();
+      const subQuery: any = query.subQueryJoin(subQueryDimensions[0]);
+
+      expect(/ORDER BY/.test(subQuery.sql)).toEqual(false);
+      expect(queryAndParams[0]).toMatch(/ORDER BY/);
+    }));
 });