Skip to content

Commit d381306

Browse files
Owen-CH-Leungalamb
andauthored
Fix datafusion proto crate json feature (#15172)
* Fix datafusion proto crate json feature Fix datafusion proto crate json feature * Revert changes that remove the imports * Enable CI check --------- Co-authored-by: Andrew Lamb <[email protected]>
1 parent d3967ae commit d381306

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/rust.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,8 @@ jobs:
131131
rust-version: stable
132132
- name: Check datafusion-proto (no-default-features)
133133
run: cargo check --profile ci --all-targets --no-default-features -p datafusion-proto
134-
# fails due to https://github.com/apache/datafusion/issues/15157
135-
#- name: Check datafusion-proto (json)
136-
# run: cargo check --profile ci --all-targets --no-default-features -p datafusion-proto --features=json
134+
- name: Check datafusion-proto (json)
135+
run: cargo check --profile ci --all-targets --no-default-features -p datafusion-proto --features=json
137136
- name: Check datafusion-proto (parquet)
138137
run: cargo check --profile ci --all-targets --no-default-features -p datafusion-proto --features=parquet
139138
- name: Check datafusion-proto (avro)

datafusion/proto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ name = "datafusion_proto"
3939

4040
[features]
4141
default = ["parquet"]
42-
json = ["pbjson", "serde", "serde_json"]
42+
json = ["pbjson", "serde", "serde_json", "datafusion-proto-common/json"]
4343
parquet = ["datafusion/parquet", "datafusion-common/parquet"]
4444
avro = ["datafusion/avro", "datafusion-common/avro"]
4545

0 commit comments

Comments
 (0)