Skip to content

Commit 942d6e7

Browse files
authored
Merge branch 'master' into lfischerstrom/quarter-dimension
2 parents e031ec8 + ee826e1 commit 942d6e7

File tree

24 files changed

+277
-207
lines changed

24 files changed

+277
-207
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
**Check List**
2-
- [ ] Tests has been run in packages where changes made if available
2+
- [ ] Tests have been run in packages where changes made if available
33
- [ ] Linter has been run for changed code
44
- [ ] Tests for the changes have been added if not covered yet
55
- [ ] Docs have been added / updated if required

dev-env.sh

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e
55
CURRENT_DIR=$(pwd)
66
SCRIPT_DIR=$(dirname "$(realpath "$0")")
77

8+
IGNORED_PACKAGES=("cubejs-testing*" "cubejs-linter" "cubejs-docker")
9+
810
# Function to install dependencies in root
911
install_root_dependencies() {
1012
echo "Running 'yarn install' in the root directory..."
@@ -35,6 +37,21 @@ link_packages() {
3537
cd "$SCRIPT_DIR"
3638
for package in packages/*; do
3739
if [ -d "$package" ]; then
40+
package_name=$(basename "$package")
41+
42+
skip_package="false"
43+
for pattern in "${IGNORED_PACKAGES[@]}"; do
44+
# shellcheck disable=SC2053
45+
if [[ "$package_name" == $pattern ]]; then
46+
echo "Skipping $package_name..."
47+
skip_package="true"
48+
fi
49+
done
50+
51+
if [ "$skip_package" = "true" ]; then
52+
continue
53+
fi
54+
3855
echo "Linking $package..."
3956
cd "$package"
4057
yarn link
@@ -106,6 +123,21 @@ link_project_packages() {
106123
cd "$CURRENT_DIR/$app_name"
107124
for package in "$SCRIPT_DIR"/packages/*; do
108125
if [ -d "$package" ]; then
126+
package_name=$(basename "$package")
127+
128+
skip_package="false"
129+
for pattern in "${IGNORED_PACKAGES[@]}"; do
130+
# shellcheck disable=SC2053
131+
if [[ "$package_name" == $pattern ]]; then
132+
echo "Skipping $package_name..."
133+
skip_package="true"
134+
fi
135+
done
136+
137+
if [ "$skip_package" = "true" ]; then
138+
continue
139+
fi
140+
109141
package_name=$(node -p "require('$package/package.json').name")
110142
echo "Linking $package_name..."
111143
yarn link "$package_name"
@@ -146,6 +178,7 @@ show_help() {
146178
echo ""
147179
echo " link Link all packages and link them to a project"
148180
echo " Usage: ./dev-env.sh link [app_name]"
181+
echo " If argument is omitted, cube packages will be marked as linked"
149182
echo ""
150183
echo " setup Run all steps (install, build, link, create project)"
151184
echo " Usage: ./dev-env.sh setup [app_name] [db_type]"
@@ -177,7 +210,9 @@ case "$command" in
177210
;;
178211
"link")
179212
link_packages
180-
link_project_packages "$2"
213+
if [ -n "$2" ]; then
214+
link_project_packages "$2"
215+
fi
181216
;;
182217
"drivers")
183218
get_db_types

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"classnames": "^2.3.2",
2222
"cubedev-tracking": "^1.1.0",
2323
"date-fns": "^2.30.0",
24-
"next": "^14.2.10",
24+
"next": "^14.2.21",
2525
"next-sitemap": "^4.1.3",
2626
"nextra": "^2.13.2",
2727
"nextra-theme-docs": "^2.4.0",

docs/pages/product/configuration/data-sources/snowflake.mdx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,26 @@ CUBEJS_DB_EXPORT_GCS_CREDENTIALS=<BASE64_ENCODED_SERVICE_CREDENTIALS_JSON>
150150
CUBEJS_DB_EXPORT_INTEGRATION=gcs_int
151151
```
152152

153+
#### Azure
154+
155+
To use Azure Blob Storage as an export bucket, follow [the guide on
156+
using a Snowflake storage integration (Option 1)][snowflake-docs-azure].
157+
Take note of the integration name (`azure_int` from the example link)
158+
as you'll need it to configure Cube.
159+
160+
[Retrieve the storage account access key][azure-bs-docs-get-key] from your Azure
161+
account.
162+
163+
Once the Snowflake integration is set up, configure Cube using the following:
164+
165+
```dotenv
166+
CUBEJS_DB_EXPORT_BUCKET_TYPE=azure
167+
CUBEJS_DB_EXPORT_BUCKET=wasbs://[email protected]
168+
CUBEJS_DB_EXPORT_BUCKET_AZURE_KEY=<AZURE_STORAGE_ACCOUNT_ACCESS_KEY>
169+
CUBEJS_DB_EXPORT_INTEGRATION=azure_int
170+
```
171+
172+
153173
## SSL
154174

155175
Cube does not require any additional configuration to enable SSL as Snowflake
@@ -176,3 +196,5 @@ connections are made over HTTPS.
176196
[snowflake-docs-warehouse]:
177197
https://docs.snowflake.com/en/user-guide/warehouses.html
178198
[snowflake-format-2]: https://docs.snowflake.com/en/user-guide/admin-account-identifier#format-2-account-locator-in-a-region
199+
[snowflake-docs-azure]: https://docs.snowflake.com/en/user-guide/data-load-azure-config#option-1-configuring-a-snowflake-storage-integration
200+
[azure-bs-docs-get-key]: https://docs.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json&tabs=azure-portal#view-account-access-keys

docs/pages/product/distribution.mdx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ that breaking changes can happen both in _major_ and _minor_ versions. Before
5454
upgrading, it is recommended that you check the [release notes][link-releases]
5555
on GitHub and read [changelog entries][link-changelog] in the blog.
5656

57+
<WarningBox>
58+
59+
You can find a list of currently [deprecated features][link-github-deprecation] on GitHub.
60+
Usually, there are also deprecation notices in the documentation that look similar to this one.
61+
62+
</WarningBox>
63+
5764
Additionally, Cube Cloud provides [update channels][ref-update-channels] where
5865
versions are marked as either <Btn>Stable</Btn> or <Btn>Latest</Btn>.
5966

@@ -92,6 +99,7 @@ List of LTS releases:
9299
[link-dockerhub-cubestore]: https://hub.docker.com/r/cubejs/cubestore/tags
93100
[link-apple-silicon]: https://support.apple.com/en-us/116943
94101
[link-semver]: https://semver.org
102+
[link-github-deprecation]: https://github.com/cube-js/cube/blob/master/DEPRECATION.md
95103
[ref-infrastructure]: /product/deployment/cloud
96104
[ref-workspace]: /product/workspace
97105
[ref-deployment]: /product/deployment

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,16 @@ Joins `a → b` and `b → c` will be resolved automatically. Cube uses the
654654
[Dijkstra algorithm][wiki-djikstra-alg] to find a join path between cubes given
655655
requested members.
656656

657+
In case there are multiple join paths that can be used to join the same set of cubes, Cube will collect cube names from members in the following order:
658+
659+
1. Measures
660+
2. Dimensions
661+
3. Segments
662+
4. Time dimensions
663+
664+
Cube makes join trees as predictable and stable as possible, but this isn't guaranteed in case multiple join paths exist.
665+
Please use views to address join predictability and stability.
666+
657667
[ref-restapi-query-filter-op-set]:
658668
/product/apis-integrations/rest-api/query-format#set
659669
[ref-schema-fundamentals-join-dir]:

0 commit comments

Comments
 (0)