Skip to content

fix(arrow/scalar): format interval scalars in String #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeroshade merged 1 commit into from
Aug 7, 2026
Merged

fix(arrow/scalar): format interval scalars in String #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions arrow/scalar/scalar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ func TestMonthIntervalScalarBasics(t *testing.T) {
assert.False(t, scalar.Equals(tsVal1, tsVal2))
assert.False(t, scalar.Equals(tsVal1, tsNull))
assert.False(t, scalar.Equals(tsNull, tsVal2))
assert.Equal(t, "1", tsVal1.String())
}

func TestDayTimeIntervalScalarBasics(t *testing.T) {
Expand All @@ -583,6 +584,7 @@ func TestDayTimeIntervalScalarBasics(t *testing.T) {
assert.False(t, scalar.Equals(tsVal1, tsVal2))
assert.False(t, scalar.Equals(tsVal1, tsNull))
assert.False(t, scalar.Equals(tsNull, tsVal2))
assert.Equal(t, "{\"days\":1,\"milliseconds\":1}", tsVal1.String())
}

func TestMonthDayNanoIntervalScalarBasics(t *testing.T) {
Expand Down Expand Up @@ -610,6 +612,11 @@ func TestMonthDayNanoIntervalScalarBasics(t *testing.T) {
assert.False(t, scalar.Equals(tsNull, tsVal2))
}

func TestMonthDayNanoIntervalScalarString(t *testing.T) {
s := scalar.NewMonthDayNanoIntervalScalar(arrow.MonthDayNanoInterval{Months: 1, Days: 2, Nanoseconds: 3000})
assert.Equal(t, "{\"months\":1,\"days\":2,\"nanoseconds\":3000}", s.String())
}

func TestNumericScalarCasts(t *testing.T) {
tests := []arrow.DataType{
arrow.PrimitiveTypes.Int8,
Expand Down
19 changes: 8 additions & 11 deletions arrow/scalar/temporal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package scalar

import (
"encoding/json"
"fmt"
"reflect"
"time"
Expand Down Expand Up @@ -383,11 +384,7 @@ func (s *MonthInterval) String() string {
if !s.Valid {
return "null"
}
val, err := s.CastTo(arrow.BinaryTypes.String)
if err != nil {
return "..."
}
return string(val.(*String).Value.Bytes())
return fmt.Sprint(s.Value)
}
func (s *MonthInterval) equals(rhs Scalar) bool {
return s.Value == rhs.(*MonthInterval).Value
Expand Down Expand Up @@ -415,11 +412,11 @@ func (s *DayTimeInterval) String() string {
if !s.Valid {
return "null"
}
val, err := s.CastTo(arrow.BinaryTypes.String)
val, err := json.Marshal(s.Value)
if err != nil {
return "..."
}
return string(val.(*String).Value.Bytes())
return string(val)
}

func (s *DayTimeInterval) CastTo(to arrow.DataType) (Scalar, error) {
Expand All @@ -428,7 +425,7 @@ func (s *DayTimeInterval) CastTo(to arrow.DataType) (Scalar, error) {
}

if !arrow.TypeEqual(s.DataType(), to) {
return nil, fmt.Errorf("non-null daytimeinterval scalar cannot be cast to anything other than monthinterval")
return nil, fmt.Errorf("non-null daytimeinterval scalar cannot be cast to anything other than daytimeinterval")
}

return s, nil
Expand Down Expand Up @@ -457,11 +454,11 @@ func (s *MonthDayNanoInterval) String() string {
if !s.Valid {
return "null"
}
val, err := s.CastTo(arrow.BinaryTypes.String)
val, err := json.Marshal(s.Value)
if err != nil {
return "..."
}
return string(val.(*String).Value.Bytes())
return string(val)
}

func (s *MonthDayNanoInterval) CastTo(to arrow.DataType) (Scalar, error) {
Expand All @@ -470,7 +467,7 @@ func (s *MonthDayNanoInterval) CastTo(to arrow.DataType) (Scalar, error) {
}

if !arrow.TypeEqual(s.DataType(), to) {
return nil, fmt.Errorf("non-null month_day_nano_interval scalar cannot be cast to anything other than monthinterval")
return nil, fmt.Errorf("non-null month_day_nano_interval scalar cannot be cast to anything other than month_day_nano_interval")
}

return s, nil
Expand Down
Loading