Skip to content

Commit 1f25279

Browse files
authored
Upgrade to Metabase v0.47.0 (#25)
* Upgrade to Metabase v0.47.0 * Remove Materialize from tz-shifted-driver-bug group
1 parent 54c7e18 commit 1f25279

File tree

5 files changed

+8
-39
lines changed

5 files changed

+8
-39
lines changed

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v3
1818
with:
1919
repository: metabase/metabase
20-
ref: v0.46.7
20+
ref: v0.47.0
2121

2222
- name: Checkout Driver Repo
2323
uses: actions/checkout@v3
@@ -55,7 +55,7 @@ jobs:
5555
- name: Setup Node
5656
uses: actions/setup-node@v2
5757
with:
58-
node-version: "16"
58+
node-version: "18"
5959
cache: "yarn"
6060

6161
- name: Get M2 cache

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
* Clojure 1.11+
1111
* OpenJDK 17
12-
* Node.js 16.x
12+
* Node.js 18.x
1313
* Yarn
1414

1515
For testing: Docker Compose
@@ -24,7 +24,7 @@ The easiest way to set up a development environment is as follows (mostly the sa
2424
```bash
2525
git clone https://github.com/metabase/metabase.git
2626
cd metabase
27-
checkout v0.46.7
27+
checkout v0.47.0
2828
git clone https://github.com/MaterializeInc/metabase-materialize-driver.git modules/drivers/materialize
2929
```
3030

scripts/exclude_tests.diff

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
diff --git a/test/metabase/query_processor_test.clj b/test/metabase/query_processor_test.clj
2-
index b26ac03b83..fd5c2abb99 100644
3-
--- a/test/metabase/query_processor_test.clj
4-
+++ b/test/metabase/query_processor_test.clj
5-
@@ -365,7 +365,7 @@
6-
also have this issue."
7-
[driver]
8-
;; TIMEZONE FIXME — remove this and fix the drivers
9-
- (contains? #{:snowflake :oracle :redshift} driver))
10-
+ (contains? #{:snowflake :oracle :redshift :materialize} driver))
11-
12-
(defn nest-query
13-
"Nest an MBQL/native query by `n-levels`. Useful for testing how nested queries behave."
141
diff --git a/test/metabase/query_processor_test/explicit_joins_test.clj b/test/metabase/query_processor_test/explicit_joins_test.clj
152
index 166598c4c6..e1bef679f1 100644
163
--- a/test/metabase/query_processor_test/explicit_joins_test.clj
@@ -62,24 +49,3 @@ index 87d225f5ae..343eb1f5f5 100644
6249
[["2015-06-01T10:31:00-04:00" 1]
6350
["2015-06-01T16:06:00-04:00" 1]
6451
["2015-06-01T17:23:00-04:00" 1]
65-
diff --git a/test/metabase/query_processor/middleware/parameters/mbql_test.clj b/test/metabase/query_processor/middleware/parameters/mbql_test.clj
66-
index cebabc72dc..e148dd5b3f 100644
67-
--- a/test/metabase/query_processor/middleware/parameters/mbql_test.clj
68-
+++ b/test/metabase/query_processor/middleware/parameters/mbql_test.clj
69-
@@ -288,6 +288,7 @@
70-
;;
71-
(deftest handle-fk-forms-test
72-
(mt/test-drivers (filter #(driver/supports? % :foreign-keys) (params-test-drivers))
73-
+ (when (not= driver/*driver* :materialize)
74-
(testing "Make sure we properly handle paramters that have `fk->` forms in `:dimension` targets (#9017)"
75-
(is (= [[31 "Bludso's BBQ" 5 33.8894 -118.207 2]
76-
[32 "Boneyard Bistro" 5 34.1477 -118.428 3]
77-
@@ -317,7 +318,7 @@
78-
{:query {:order-by [[:asc $id]]}
79-
:parameters [{:type :string/starts-with
80-
:target [:dimension $category_id->categories.name]
81-
- :value ["BB"]}]}))))))))
82-
+ :value ["BB"]}]})))))))))
83-
84-
(deftest test-mbql-parameters
85-
(testing "Should be able to pass parameters in to an MBQL query"

src/metabase/driver/materialize.clj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
:datetime-diff false
3434
:convert-timezone false
3535
:temporal-extract (not config/is-test?)
36+
;; Disabling during tests as the data load fails with:
37+
;; metabase.driver.sql-jdbc.sync.describe-table-test/describe-big-nested-field-columns-test (impl.clj:141)
38+
;; ERROR: column "big_json" is of type jsonb but expression is of type character varying
39+
:nested-field-columns (not config/is-test?)
3640
;; Disabling nested queries during tests as they try to use Foreign Keys
3741
:nested-queries (not config/is-test?)
3842
;; Disabling the expressions support due to the following error:

test/metabase/test/data/materialize.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
(defmethod load-data/load-data! :materialize [& args]
8787
(apply load-data/load-data-add-ids-chunked! args))
8888

89-
9089
(defmethod tx/sorts-nil-first? :materialize
9190
[_driver _base-type]
9291
false)

0 commit comments

Comments
 (0)