Merge branch 'master' into dremio-date-interval-fix

Author: wardsi

CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Bug Fixes
+
+- **@cubejs-client/ngx:** Update APF configuration and build settings for Angular 12+ compatibility ([#9152](https://github.com/cube-js/cube/issues/9152)) Thanks to @HaidarZ! ([57bcbc4](https://github.com/cube-js/cube/commit/57bcbc482002aaa025ba5eab8960ecc5784faa55))
+- **cubejs-playground:** update query builder ([#9175](https://github.com/cube-js/cube/issues/9175)) ([4e9ed0e](https://github.com/cube-js/cube/commit/4e9ed0eae46c4abb1b84e6423bbc94ad93da37c3))
+- **cubejs-playground:** update query builder ([#9184](https://github.com/cube-js/cube/issues/9184)) ([247ac0c](https://github.com/cube-js/cube/commit/247ac0c4028aef5295e88cd501323b94c5a4eaab))
+- **cubesql:** Avoid panics during filter rewrites ([#9166](https://github.com/cube-js/cube/issues/9166)) ([4c8de88](https://github.com/cube-js/cube/commit/4c8de882b3cc57e2b0c29c33ca4ee91377176e85))
+- **databricks-jdbc-driver:** Fix extract epoch from timestamp SQL Generation ([#9160](https://github.com/cube-js/cube/issues/9160)) ([9a73857](https://github.com/cube-js/cube/commit/9a73857b4abc5691b44b8a395176a565cdbf1b2a))
+- **schema-compiler:** make sure view members are resolvable in DAP ([#9059](https://github.com/cube-js/cube/issues/9059)) ([e7b992e](https://github.com/cube-js/cube/commit/e7b992effb6ef90883d059280270c92d903607d4))
+
+### Features
+
+- **cubeclient:** Add hierarchies to Cube meta ([#9180](https://github.com/cube-js/cube/issues/9180)) ([56dbf9e](https://github.com/cube-js/cube/commit/56dbf9edc8c257cd81f00ff119b12543652b76d0))
+- **cubesql:** Add filter flattening rule ([#9148](https://github.com/cube-js/cube/issues/9148)) ([92a4b8e](https://github.com/cube-js/cube/commit/92a4b8e0e65c05f2ca0a683387d3f4434c358fc6))
+- **cubesql:** Add separate ungrouped_scan flag to wrapper replacer context ([#9120](https://github.com/cube-js/cube/issues/9120)) ([50bdbe7](https://github.com/cube-js/cube/commit/50bdbe7f52f653680e32d26c96c41f10e459c341))
+- **snowflake-driver:** set QUOTED_IDENTIFIERS_IGNORE_CASE=FALSE by default ([#9172](https://github.com/cube-js/cube/issues/9172)) ([164b783](https://github.com/cube-js/cube/commit/164b783843efa93ac8ca422634e5b6daccd91883))
+- Support complex join conditions for grouped joins ([#9157](https://github.com/cube-js/cube/issues/9157)) ([28c1e3b](https://github.com/cube-js/cube/commit/28c1e3bba7a100f3152bfdefd86197e818fac941))
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 ### Bug Fixes

docs/pages/guides/recipes/access-control/controlling-access-to-cubes-and-views.mdx

@@ -52,9 +52,15 @@ cubes:
 views:
   - name: total_revenue_per_customer
     public: {{ COMPILE_CONTEXT['securityContext']['isFinance'] }}
-    includes:
-      - orders.total_revenue
-      - users.company
+
+    cubes:
+      - join_path: orders
+        includes:
+          - total_revenue
+
+      - join_path: orders.users
+        includes:
+          - company
 ```
 
 ```javascript
@@ -75,12 +81,25 @@ cube(`users`, {
 });
 
 // total_revenue_per_customer.js
-view("total_revenue_per_customer", {
+view(`total_revenue_per_customer`, {
   description: `Total revenue per customer`,
   public: COMPILE_CONTEXT.securityContext.isFinance,
 
-  includes: [orders.total_revenue, users.company],
-});
+  cubes: [
+    {
+      join_path: orders,
+      includes: [
+        `total_revenue`
+      ]
+    },
+    {
+      join_path: orders.users,
+      includes: [
+        `company`
+      ]
+    }
+  ]
+})
 ```
 
 </CodeTabs>

docs/pages/product/auth/data-access-policies.mdx

@@ -62,7 +62,7 @@ cubes:
         row_level:
           filters:
             - member: country
-              operator: eq
+              operator: equals
               values: [ "{ securityContext.country }" ]
 ```
 
@@ -118,6 +118,10 @@ When processing a request, Cube will evaluate the data access policies and combi
 with relevant custom security rules, e.g., [`public` parameters][ref-mls-public] for member-level security
 and [`query_rewrite` filters][ref-rls-queryrewrite] for row-level security.
 
+If multiple access policies apply to a request, they are _combined together_
+using the _OR_ semantics. For example, if a user has two roles with different
+policies, the user will get the union of the permissions in these policies.
+
 ### Member-level access
 
 Member-level security rules in data access policies are _combined together_

docs/pages/product/deployment/cloud/continuous-deployment.mdx

@@ -39,7 +39,7 @@ GitHub</Btn> button, and selecting your repository.
 If your organization uses SAML SSO for GitHub authentication, make sure to start an active SAML 
 session prior to connecting to your GitHub account from Cube.
 
-<WarningBox>
+</WarningBox>
 
 <div style={{ textAlign: "center" }}>
   <img

docs/pages/reference/data-model/data-access-policies.mdx

@@ -307,7 +307,7 @@ cubes:
         row_level:
           filters:
             - member: state
-              operator: eq
+              operator: equals
               values: [ "{ securityContext.state }" ]
 ```
 

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

@@ -292,8 +292,20 @@ view(`arr`, {
   description: `Annual Recurring Revenue`,
   public: COMPILE_CONTEXT.security_context.is_finance,
 
-  includes: [revenue.arr, revenue.date, customers.plan],
-});
+  cubes: [
+    {
+      join_path: revenue,
+      includes: [
+        `arr`,
+        `date`
+      ]
+    },
+    {
+      join_path: revenue.customers,
+      includes: `plan`
+    }
+  ]
+})
 ```
 
 ```yaml
@@ -302,12 +314,15 @@ views:
     description: Annual Recurring Revenue
     public: COMPILE_CONTEXT.security_context.is_finance
 
-    includes:
-      # Measures
-      - revenue.arr
-      # Dimensions
-      - revenue.date
-      - customers.plan
+    cubes:
+      - join_path: revenue
+        includes:
+          - arr
+          - date
+
+      - join_path: revenue.customers
+        includes:
+          - plan
 ```
 
 </CodeTabs>
@@ -344,50 +359,6 @@ views:
 
 The `access_policy` parameter is used to configure [data access policies][ref-ref-dap].
 
-### `includes` (deprecated)
-
-<WarningBox>
-
-The top-level `includes` parameter is deprecated and might be removed in
-the future. Please always use the `includes` parameter with `cubes` and
-`join_path` parameters so you can explicitly control the join path.
-
-</WarningBox>
-
-The top-level `includes` parameter is used to bulk add measures or dimensions
-to a view.
-
-<CodeTabs>
-
-```javascript
-view(`active_users`, {
-  includes: [
-    // Measures
-    users.rolling_count,
-
-    // Dimensions
-    users.city,
-    users.created_at,
-  ],
-});
-```
-
-```yaml
-views:
-  - name: active_users
-
-    includes:
-      # Measures
-      - users.rolling_count
-
-      # Dimensions
-      - users.city
-      - users.created_at
-```
-
-</CodeTabs>
-
-
 [ref-recipe-control-access-cubes-views]:
   /guides/recipes/access-control/controlling-access-to-cubes-and-views
 [ref-schema-joins-direction]:

lerna-publish.sh

@@ -5,4 +5,4 @@ BUMP=$1
 if [ "x$BUMP" == "x" ]; then
   BUMP=patch
 fi
-yarn lerna version --create-release=github --conventional-commits --exact $BUMP
+yarn lerna version --create-release=github --conventional-commits --force-publish --exact $BUMP

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.18",
+  "version": "1.2.0",
   "npmClient": "yarn",
   "command": {
     "bootstrap": {

packages/cubejs-api-gateway/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/cube-js/cube/compare/v1.1.18...v1.2.0) (2025-02-05)
+
+### Features
+
+- **cubeclient:** Add hierarchies to Cube meta ([#9180](https://github.com/cube-js/cube/issues/9180)) ([56dbf9e](https://github.com/cube-js/cube/commit/56dbf9edc8c257cd81f00ff119b12543652b76d0))
+
 ## [1.1.18](https://github.com/cube-js/cube/compare/v1.1.17...v1.1.18) (2025-01-27)
 
 ### Bug Fixes

packages/cubejs-api-gateway/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/api-gateway",
   "description": "Cube.js API Gateway",
   "author": "Cube Dev, Inc.",
-  "version": "1.1.18",
+  "version": "1.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -27,8 +27,8 @@
     "dist/src/*"
   ],
   "dependencies": {
-    "@cubejs-backend/native": "1.1.17",
-    "@cubejs-backend/shared": "1.1.17",
+    "@cubejs-backend/native": "1.2.0",
+    "@cubejs-backend/shared": "1.2.0",
     "@ungap/structured-clone": "^0.3.4",
     "body-parser": "^1.19.0",
     "chrono-node": "^2.6.2",
@@ -50,7 +50,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@cubejs-backend/linter": "^1.0.0",
+    "@cubejs-backend/linter": "1.2.0",
     "@types/express": "^4.17.21",
     "@types/jest": "^27",
     "@types/jsonwebtoken": "^9.0.2",