@cubejs-client/core 1.3.21 → 1.3.22

package/dist/src/SqlQuery.d.ts

@@ -1,16 +1,19 @@
-export type SqlQueryTuple = [string, any[], any];
+export type SqlQueryTuple = [string, any[], any?];
 export type SqlData = {
     aliasNameToMember: Record<string, string>;
     cacheKeyQueries: SqlQueryTuple[];
-    dataSource: boolean;
+    dataSource: string;
     external: boolean;
     sql: SqlQueryTuple;
     preAggregations: any[];
     rollupMatchResults: any[];
 };
+export type SqlQueryWrapper = {
+    sql: SqlData;
+};
 export default class SqlQuery {
     private readonly sqlQuery;
-    constructor(sqlQuery: SqlData);
+    constructor(sqlQuery: SqlQueryWrapper);
     rawQuery(): SqlData;
     sql(): string;
 }

package/dist/src/SqlQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqlQuery.d.ts","sourceRoot":"","sources":["../../src/SqlQuery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;AAEjD,MAAM,MAAM,OAAO,GAAG;IACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,eAAe,EAAE,aAAa,EAAE,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,aAAa,CAAC;IACnB,eAAe,EAAE,GAAG,EAAE,CAAC;IACvB,kBAAkB,EAAE,GAAG,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;gBAEhB,QAAQ,EAAE,OAAO;IAI7B,QAAQ,IAAI,OAAO;IAInB,GAAG,IAAI,MAAM;CAGrB"}
+{"version":3,"file":"SqlQuery.d.ts","sourceRoot":"","sources":["../../src/SqlQuery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;AAElD,MAAM,MAAM,OAAO,GAAG;IACpB,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,eAAe,EAAE,aAAa,EAAE,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,aAAa,CAAC;IACnB,eAAe,EAAE,GAAG,EAAE,CAAC;IACvB,kBAAkB,EAAE,GAAG,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,QAAQ;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAExB,QAAQ,EAAE,eAAe;IAIrC,QAAQ,IAAI,OAAO;IAInB,GAAG,IAAI,MAAM;CAGrB"}

package/dist/src/SqlQuery.js

@@ -3,7 +3,7 @@ export default class SqlQuery {
         this.sqlQuery = sqlQuery;
     }
     rawQuery() {
-        return this.sqlQuery;
+        return this.sqlQuery.sql;
     }
     sql() {
         return this.rawQuery().sql[0];

package/dist/test/SqlQuery.test.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license Apache-2.0
+ * @copyright Cube Dev, Inc.
+ * @fileoverview SqlQuery class unit tests.
+ */
+export {};
+//# sourceMappingURL=SqlQuery.test.d.ts.map

package/dist/test/SqlQuery.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SqlQuery.test.d.ts","sourceRoot":"","sources":["../../test/SqlQuery.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/test/SqlQuery.test.js

@@ -0,0 +1,44 @@
+/**
+ * @license Apache-2.0
+ * @copyright Cube Dev, Inc.
+ * @fileoverview SqlQuery class unit tests.
+ */
+/* globals describe,it,expect */
+import SqlQuery from '../src/SqlQuery';
+describe('SqlQuery', () => {
+    const mockCacheKeyQueriesTuple = [
+        'SELECT FLOOR((-25200 + EXTRACT(EPOCH FROM NOW())) / 600) as refresh_key',
+        [],
+        {
+            external: false,
+            renewalThreshold: 60
+        }
+    ];
+    const mockSqlTuple = [
+        'SELECT count(*) "base_orders__count" FROM base_orders WHERE base_orders.continent = ?',
+        ['Europe'],
+    ];
+    const mockSqlData = {
+        aliasNameToMember: { base_orders__count: 'base_orders.count' },
+        cacheKeyQueries: [mockCacheKeyQueriesTuple],
+        dataSource: 'default',
+        external: false,
+        sql: mockSqlTuple,
+        preAggregations: [],
+        rollupMatchResults: [],
+    };
+    const mockWrapper = {
+        sql: mockSqlData,
+    };
+    it('should construct without error', () => {
+        expect(() => new SqlQuery(mockWrapper)).not.toThrow();
+    });
+    it('rawQuery should return the original SqlData', () => {
+        const query = new SqlQuery(mockWrapper);
+        expect(query.rawQuery()).toEqual(mockSqlData);
+    });
+    it('sql should return the first element (SQL string) from the sql tuple', () => {
+        const query = new SqlQuery(mockWrapper);
+        expect(query.sql()).toBe('SELECT count(*) "base_orders__count" FROM base_orders WHERE base_orders.continent = ?');
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "1.3.21",
+  "version": "1.3.22",
   "engines": {},
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@cubejs-backend/linter": "1.3.21",
+    "@cubejs-backend/linter": "1.3.22",
     "@types/jest": "^29",
     "@types/moment-range": "^4.0.0",
     "@types/ramda": "^0.27.34",
@@ -50,5 +50,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "f1621e4541f9dc546b3ca51b7babd288c2722106"
+  "gitHead": "71b2c1d2a9fb6a5218ea0c1b4dbcbc77463a402e"
 }