Skip to content

Commit e609725

Browse files
authored
Merge branch 'cube-js:master' into master
2 parents 388a9f3 + aa898e2 commit e609725

File tree

137 files changed

+1901
-445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1901
-445
lines changed

.github/actions/integration/athena.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::Athena [cloud]"
8+
export CUBEJS_AWS_KEY=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_KEY
9+
export CUBEJS_AWS_SECRET=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_SECRET
10+
811
export CUBEJS_AWS_REGION=us-east-1
912
export CUBEJS_AWS_S3_OUTPUT_LOCATION=s3://cubejs-opensource/testing/output
1013
export CUBEJS_DB_EXPORT_BUCKET=s3://cubejs-opensource/testing/export/

.github/actions/integration/bigquery.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -eo pipefail
55
export DEBUG=testcontainers
66

77
echo "::group::BigQuery [cloud]"
8+
export CUBEJS_DB_BQ_CREDENTIALS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_BQ_CREDENTIALS
89
export CUBEJS_DB_BQ_PROJECT_ID=cube-open-source
910
export CUBEJS_DB_EXPORT_BUCKET=cube-open-source-export-bucket
1011
yarn lerna run --concurrency 1 --stream --no-prefix integration:bigquery

.github/actions/integration/snowflake.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ export CUBEJS_DB_NAME=DEMO_DB
99
export CUBEJS_DB_SNOWFLAKE_ACCOUNT=lxb31104
1010
export CUBEJS_DB_SNOWFLAKE_REGION=us-west-2
1111
export CUBEJS_DB_SNOWFLAKE_WAREHOUSE=COMPUTE_WH
12+
export CUBEJS_DB_USER=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_USER
13+
export CUBEJS_DB_PASS=$DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_PASS
1214

1315
yarn lerna run --concurrency 1 --stream --no-prefix smoke:snowflake
1416

.github/workflows/cloud.yml

Lines changed: 0 additions & 130 deletions
This file was deleted.

.github/workflows/push.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
paths:
66
- '.github/actions/smoke.sh'
7+
- '.github/actions/integration/**'
78
- '.github/workflows/push.yml'
89
- '.github/workflows/master.yml'
910
- 'packages/**'
@@ -23,6 +24,8 @@ on:
2324
- 'master'
2425
pull_request:
2526
paths:
27+
- '.github/actions/smoke.sh'
28+
- '.github/actions/integration/**'
2629
- '.github/workflows/push.yml'
2730
- '.github/workflows/master.yml'
2831
- 'packages/**'
@@ -389,6 +392,9 @@ jobs:
389392
if: (needs['latest-tag-sha'].outputs.sha != github.sha)
390393
env:
391394
CLOUD_DATABASES: >
395+
athena
396+
bigquery
397+
snowflake
392398
firebolt
393399
dremio
394400
# Athena (just to check for secrets availability)
@@ -398,6 +404,7 @@ jobs:
398404
matrix:
399405
node-version: [22.x]
400406
db: [
407+
'athena', 'bigquery', 'snowflake',
401408
'clickhouse', 'druid', 'elasticsearch', 'mssql', 'mysql', 'postgres', 'prestodb',
402409
'mysql-aurora-serverless', 'crate', 'mongobi', 'firebolt', 'dremio', 'vertica'
403410
]
@@ -449,6 +456,8 @@ jobs:
449456
retry_wait_seconds: 15
450457
timeout_minutes: 20
451458
command: yarn install --frozen-lockfile
459+
- name: Build Core Client libraries
460+
run: yarn build
452461
- name: Lerna tsc
453462
run: yarn tsc
454463
- name: Run Integration tests for ${{ matrix.db }} matrix
@@ -475,6 +484,17 @@ jobs:
475484
DRIVERS_TESTS_DREMIO_CUBEJS_DB_NAME: ${{ secrets.DRIVERS_TESTS_DREMIO_CUBEJS_DB_NAME }}
476485
DRIVERS_TESTS_DREMIO_CUBEJS_DB_DREMIO_AUTH_TOKEN: ${{ secrets.DRIVERS_TESTS_DREMIO_CUBEJS_DB_DREMIO_AUTH_TOKEN }}
477486

487+
# BigQuery
488+
DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_BQ_CREDENTIALS: ${{ secrets.CUBEJS_DB_BQ_CREDENTIALS }}
489+
490+
# AWS Athena
491+
DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_KEY: ${{ secrets.CUBEJS_AWS_KEY }}
492+
DRIVERS_TESTS_SNOWFLAKE_CUBEJS_AWS_SECRET: ${{ secrets.CUBEJS_AWS_SECRET }}
493+
494+
# Snowflake
495+
DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_USER: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_USER }}
496+
DRIVERS_TESTS_SNOWFLAKE_CUBEJS_DB_PASS: ${{ secrets.DRIVERS_TESTS_CUBEJS_DB_SNOWFLAKE_PASS }}
497+
478498
integration-smoke:
479499
needs: [latest-tag-sha, build-cubestore, build-native-linux]
480500
runs-on: ubuntu-24.04

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.3.6](https://github.com/cube-js/cube/compare/v1.3.5...v1.3.6) (2025-04-22)
7+
8+
### Bug Fixes
9+
10+
- **cubesql:** Fix SortPushDown pushing sort through joins ([#9464](https://github.com/cube-js/cube/issues/9464)) ([fed08e1](https://github.com/cube-js/cube/commit/fed08e1384cf6f666970472f5bd67feb5c86462e)), closes [/github.com/apache/datafusion/blob/7.0.0/datafusion/src/physical_plan/hash_join.rs#L282-L284](https://github.com//github.com/apache/datafusion/blob/7.0.0/datafusion/src/physical_plan/hash_join.rs/issues/L282-L284) [/github.com/apache/datafusion/blob/7.0.0/datafusion/src/physical_plan/cross_join.rs#L141-L143](https://github.com//github.com/apache/datafusion/blob/7.0.0/datafusion/src/physical_plan/cross_join.rs/issues/L141-L143)
11+
- **cubesql:** Realias expressions when normalizing columns ([#9498](https://github.com/cube-js/cube/issues/9498)) ([32f9b79](https://github.com/cube-js/cube/commit/32f9b7993c97fc294ec92b54a587f27e4e29dda0))
12+
- **schema-compiler:** Use join paths from pre-aggregation declaration instead of building join tree from scratch ([#9471](https://github.com/cube-js/cube/issues/9471)) ([cd7e9fd](https://github.com/cube-js/cube/commit/cd7e9fddca8fa1c31335adbba6e79c4032841cbb))
13+
14+
### Features
15+
16+
- **mssql-driver:** Return numeric result values as strings ([#9485](https://github.com/cube-js/cube/issues/9485)) ([52da601](https://github.com/cube-js/cube/commit/52da6010792985b610087040733f6da650369c1a))
17+
618
## [1.3.5](https://github.com/cube-js/cube/compare/v1.3.4...v1.3.5) (2025-04-17)
719

820
### Bug Fixes

docs/pages/reference/data-model/dimensions.mdx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,14 @@ examples.
618618

619619
</ReferenceBox>
620620

621+
<WarningBox>
622+
623+
Custom granularities are supported for the following [data sources][ref-data-sources]:
624+
Amazon Athena, Amazon Redshift, DuckDB, Databricks, Google BigQuery, ClickHouse, Microsoft SQL Server, MySQL, Postgres, and Snowflake.
625+
Please [file an issue](https://github.com/cube-js/cube/issues) if you need support for another data source.
626+
627+
</WarningBox>
628+
621629
For each custom granularity, the `interval` parameter is required. It specifies
622630
the duration of the time interval and has the following format:
623631
`quantity unit [quantity unit...]`, e.g., `5 days` or `1 year 6 months`.
@@ -713,4 +721,5 @@ cube(`orders`, {
713721
[ref-time-dimensions]: /reference/data-model/types-and-formats#time-1
714722
[link-date-time-string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#date_time_string_format
715723
[ref-custom-granularity-recipe]: /guides/recipes/data-modeling/custom-granularity
716-
[ref-ref-hierarchies]: /reference/data-model/hierarchies
724+
[ref-ref-hierarchies]: /reference/data-model/hierarchies
725+
[ref-data-sources]: /product/configuration/data-sources

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.3.5",
2+
"version": "1.3.6",
33
"npmClient": "yarn",
44
"command": {
55
"bootstrap": {

packages/cubejs-api-gateway/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.3.6](https://github.com/cube-js/cube/compare/v1.3.5...v1.3.6) (2025-04-22)
7+
8+
**Note:** Version bump only for package @cubejs-backend/api-gateway
9+
610
## [1.3.5](https://github.com/cube-js/cube/compare/v1.3.4...v1.3.5) (2025-04-17)
711

812
**Note:** Version bump only for package @cubejs-backend/api-gateway

packages/cubejs-api-gateway/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@cubejs-backend/api-gateway",
33
"description": "Cube.js API Gateway",
44
"author": "Cube Dev, Inc.",
5-
"version": "1.3.5",
5+
"version": "1.3.6",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
2727
"dist/src/*"
2828
],
2929
"dependencies": {
30-
"@cubejs-backend/native": "1.3.5",
31-
"@cubejs-backend/shared": "1.3.5",
30+
"@cubejs-backend/native": "1.3.6",
31+
"@cubejs-backend/shared": "1.3.6",
3232
"@ungap/structured-clone": "^0.3.4",
3333
"assert-never": "^1.4.0",
3434
"body-parser": "^1.19.0",
@@ -51,7 +51,7 @@
5151
"uuid": "^8.3.2"
5252
},
5353
"devDependencies": {
54-
"@cubejs-backend/linter": "1.3.5",
54+
"@cubejs-backend/linter": "1.3.6",
5555
"@types/express": "^4.17.21",
5656
"@types/jest": "^27",
5757
"@types/jsonwebtoken": "^9.0.2",

0 commit comments

Comments
 (0)