Skip to content

Commit 3e4fafc

Browse files
committed
Merge remote-tracking branch 'apache/main' into shredding-variant-part1-merge-main
2 parents 7a66cfb + 4b8cbe2 commit 3e4fafc

26 files changed

Lines changed: 3280 additions & 1453 deletions

File tree

.github/workflows/dev_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
github.event_name == 'pull_request_target' &&
4545
(github.event.action == 'opened' ||
4646
github.event.action == 'synchronize')
47-
uses: actions/labeler@v6.0.0
47+
uses: actions/labeler@v6.0.1
4848
with:
4949
repo-token: ${{ secrets.GITHUB_TOKEN }}
5050
configuration-path: .github/workflows/dev_pr/labeler.yml

.github/workflows/integration.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
ARROW_INTEGRATION_CPP: ON
6464
ARROW_INTEGRATION_CSHARP: ON
6565
ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS: "rust"
66+
ARCHERY_INTEGRATION_WITH_DOTNET: "1"
6667
ARCHERY_INTEGRATION_WITH_GO: "1"
6768
ARCHERY_INTEGRATION_WITH_JAVA: "1"
6869
ARCHERY_INTEGRATION_WITH_JS: "1"
@@ -98,6 +99,11 @@ jobs:
9899
with:
99100
path: rust
100101
fetch-depth: 0
102+
- name: Checkout Arrow .NET
103+
uses: actions/checkout@v5
104+
with:
105+
repository: apache/arrow-dotnet
106+
path: dotnet
101107
- name: Checkout Arrow Go
102108
uses: actions/checkout@v5
103109
with:

.github/workflows/take.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
if: (!github.event.issue.pull_request) && github.event.comment.body == 'take'
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/github-script@v7
31+
- uses: actions/github-script@v8
3232
with:
3333
script: |
3434
github.rest.issues.addAssignees({

arrow-array/src/timezone.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ mod private {
5353
use super::*;
5454
use chrono::offset::TimeZone;
5555
use chrono::{LocalResult, NaiveDate, NaiveDateTime, Offset};
56+
use std::fmt::Display;
5657
use std::str::FromStr;
5758

5859
/// An [`Offset`] for [`Tz`]
@@ -97,6 +98,15 @@ mod private {
9798
}
9899
}
99100

101+
impl Display for Tz {
102+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
103+
match self.0 {
104+
TzInner::Timezone(tz) => tz.fmt(f),
105+
TzInner::Offset(offset) => offset.fmt(f),
106+
}
107+
}
108+
}
109+
100110
macro_rules! tz {
101111
($s:ident, $tz:ident, $b:block) => {
102112
match $s.0 {
@@ -228,6 +238,15 @@ mod private {
228238
sydney_offset_with_dst
229239
);
230240
}
241+
242+
#[test]
243+
fn test_timezone_display() {
244+
let test_cases = ["UTC", "America/Los_Angeles", "-08:00", "+05:30"];
245+
for &case in &test_cases {
246+
let tz: Tz = case.parse().unwrap();
247+
assert_eq!(tz.to_string(), case);
248+
}
249+
}
231250
}
232251
}
233252

arrow-avro/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ snappy = ["snap", "crc"]
4242
canonical_extension_types = ["arrow-schema/canonical_extension_types"]
4343
md5 = ["dep:md5"]
4444
sha256 = ["dep:sha2"]
45+
small_decimals = []
4546

4647
[dependencies]
4748
arrow-schema = { workspace = true }

0 commit comments

Comments
 (0)