Skip to content

fix: display nested geo values #734

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
youngsofun merged 4 commits into from
Jan 13, 2026
Merged

fix: display nested geo values #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e40747a
fix display nested geo values
b41sh Dec 30, 2025
74f9107
fix
b41sh Dec 30, 2025
1da2cb2
Merge branch 'main' into fix-geo-display
youngsofun Jan 13, 2026
b7bb238
Merge branch 'main' into fix-geo-display
youngsofun Jan 13, 2026
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
1 change: 1 addition & 0 deletions cli/tests/00-base.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ NULL "{""k1"":""v1"",""k2"":""v2""}" (2,NULL)
1 NULL 1 ab
NULL v1 2 NULL
"{""k1"":""v1"",""k2"":""v2""}" [6162,78797A] "([1,2],""2024-04-10"")"
"[{""type"": ""Point"", ""coordinates"": [-122.35,37.55]}]" "[{""type"": ""LineString"", ""coordinates"": [[0.75,0.75],[-10,20]]}]"
bye
3 changes: 3 additions & 0 deletions cli/tests/00-base.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ select a[1], b['k1'], c:x, c:y from test_nested;

select {'k1':'v1','k2':'v2'}, [to_binary('ab'), to_binary('xyz')], (parse_json('[1,2]'), to_date('2024-04-10'));

set geometry_output_format='GEOJSON';
select [to_geometry('POINT(-122.35 37.55)')], [st_geographyfromewkt('LINESTRING(0.75 0.75, -10 20)')];

select 'bye';
drop table test;
drop table test_decimal;
Expand Down
30 changes: 16 additions & 14 deletions sql/src/value/string_decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,26 +354,28 @@ impl ValueDecoder {

fn read_geometry<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
if reader.read_quoted_text(&mut buf, b'"').is_err() {
if let Ok(val) = self.read_json(reader) {
return Ok(Value::Variant(val));
}
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_ok()
|| reader.read_quoted_text(&mut buf, b'\'').is_ok()
{
Ok(Value::Geometry(unsafe { String::from_utf8_unchecked(buf) }))
} else {
let val = self.read_json(reader)?;
Ok(Value::Geometry(val))
}
Ok(Value::Geometry(unsafe { String::from_utf8_unchecked(buf) }))
}

fn read_geography<R: AsRef<[u8]>>(&self, reader: &mut Cursor<R>) -> Result<Value> {
let mut buf = Vec::new();
if reader.read_quoted_text(&mut buf, b'"').is_err() {
if let Ok(val) = self.read_json(reader) {
return Ok(Value::Variant(val));
}
reader.read_quoted_text(&mut buf, b'\'')?;
if reader.read_quoted_text(&mut buf, b'"').is_ok()
|| reader.read_quoted_text(&mut buf, b'\'').is_ok()
{
Ok(Value::Geography(unsafe {
String::from_utf8_unchecked(buf)
}))
} else {
let val = self.read_json(reader)?;
Ok(Value::Geography(val))
}
Ok(Value::Geography(unsafe {
String::from_utf8_unchecked(buf)
}))
}

fn read_nullable<R: AsRef<[u8]>>(
Expand Down
Loading