fixed duplicate meerkat projections (#111)

* fixed duplicate meerkat projections

* updated failedcd '/Users/zaidjan/Documents/Projects/meerkat'

* updated failing tests

* bumped versions

Author: zaidjan-devrev

meerkat-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-browser",
-  "version": "0.0.78",
+  "version": "0.0.79",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",

meerkat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-core",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "dependencies": {
     "@swc/helpers": "~0.5.0"
   },

meerkat-core/src/get-wrapped-base-query-with-projections/__tests__/get-projection-clause.spec.ts

@@ -31,7 +31,7 @@ describe('get-projection-clause', () => {
     });
     it('should skip aliased items present in already seen', () => {
       const members = ['test.a', 'test.c'];
-      const aliasedColumnSet = new Set<string>(['test.c']);
+      const aliasedColumnSet = new Set<string>(['test__c']);
       const result = getProjectionClause(
         {
           dimensions: members, measures: []
@@ -44,7 +44,7 @@ describe('get-projection-clause', () => {
 
     it('should project columns used inside the measure string', () => {
       const members = ['test.a', 'test.c'];
-      const aliasedColumnSet = new Set<string>(['test.c']);
+      const aliasedColumnSet = new Set<string>(['test__c']);
       const result = getProjectionClause(
         {
           measures: ['test.total_rows'],

meerkat-core/src/get-wrapped-base-query-with-projections/get-projection-clause.ts

@@ -4,7 +4,7 @@ import { memberKeyToSafeKey } from '../utils/member-key-to-safe-key';
 import { getDimensionProjection, getFilterMeasureProjection } from './get-aliased-columns-from-filters';
 import { MODIFIERS } from './sql-expression-modifiers';
 
-const aggregator = ({
+const memberClauseAggregator = ({
   member,
   aliasedColumnSet,
   acc,
@@ -45,8 +45,8 @@ export const getProjectionClause = (
         modifiers: MODIFIERS,
         query
       });
-      return aggregator({
-        member,
+      return memberClauseAggregator({
+        member: memberKeyToSafeKey(member),
         aliasedColumnSet,
         acc,
         currentIndex,
@@ -65,7 +65,7 @@ export const getProjectionClause = (
         tableSchema,
         measures,
       });
-      return aggregator({
+      return memberClauseAggregator({
         member,
         aliasedColumnSet,
         acc,

meerkat-core/src/get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections.ts

@@ -24,6 +24,12 @@ export const getWrappedBaseQueryWithProjections = ({
   const newBaseSql = `SELECT * FROM (${baseQuery}) AS ${tableSchema.name}`;
   const aliasedColumnSet = new Set<string>();
 
+  const memberProjections = getProjectionClause(
+    query,
+    tableSchema,
+    aliasedColumnSet
+  );
+
   const aliasFromFilters = getAliasedColumnsFromFilters({
     aliasedColumnSet,
     baseSql: 'SELECT *',
@@ -33,11 +39,6 @@ export const getWrappedBaseQueryWithProjections = ({
     meerkatFilters: query.filters,
   });
 
-  const memberProjections = getProjectionClause(
-    query,
-    tableSchema,
-    aliasedColumnSet
-  );
   const formattedMemberProjection = memberProjections
     ? `, ${memberProjections}`
     : '';

meerkat-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-node",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",

meerkat-node/src/__tests__/having-filters.spec.ts

@@ -101,7 +101,7 @@ describe('cube-to-sql', () => {
     const sql = await cubeQueryToSQL(query, [TABLE_SCHEMA]);
     console.info(`SQL for Simple Cube Query: `, sql);
     expect(sql).toBe(
-      `SELECT SUM(order_amount) AS orders__total_order_amount ,   orders__customer_id FROM (SELECT *, customer_id AS orders__customer_id, customer_id AS orders__customer_id FROM (select * from orders) AS orders) AS orders WHERE (orders__customer_id = '2') GROUP BY orders__customer_id HAVING (orders__total_order_amount = 100) ORDER BY orders__total_order_amount DESC LIMIT 2`
+      `SELECT SUM(order_amount) AS orders__total_order_amount ,   orders__customer_id FROM (SELECT *, customer_id AS orders__customer_id FROM (select * from orders) AS orders) AS orders WHERE (orders__customer_id = '2') GROUP BY orders__customer_id HAVING (orders__total_order_amount = 100) ORDER BY orders__total_order_amount DESC LIMIT 2`
     );
     const output = await duckdbExec(sql);
     expect(output).toEqual([

meerkat-node/src/__tests__/joins.spec.ts

@@ -545,6 +545,10 @@ describe('Joins Tests', () => {
         'customers.customer_id',
         'customers.order_id',
       ],
+      order: {
+        'orders.total_order_amount': 'desc',
+        'customers.customer_id': 'asc'
+      },
     };
 
     const sql = await cubeQueryToSQL(query1, [ORDER_SCHEMA, CUSTOMER_SCHEMA]);
@@ -553,11 +557,11 @@ describe('Joins Tests', () => {
     const parsedOutput = JSON.parse(JSON.stringify(output));
     console.info('parsedOutput', parsedOutput);
     expect(parsedOutput).toHaveLength(3);
-    expect(parsedOutput[0].customers__customer_id).toBe('2');
-    expect(parsedOutput[1].customers__customer_id).toBe('1');
+    expect(parsedOutput[0].customers__customer_id).toBe('1');
+    expect(parsedOutput[1].customers__customer_id).toBe('2');
     expect(parsedOutput[2].customers__customer_id).toBe('1');
-    expect(parsedOutput[0].customers__order_id).toBe('2');
-    expect(parsedOutput[1].customers__order_id).toBe('3');
+    expect(parsedOutput[0].customers__order_id).toBe('3');
+    expect(parsedOutput[1].customers__order_id).toBe('2');
     expect(parsedOutput[2].customers__order_id).toBe('3');
 
     const query2 = {