Skip to content

Pin the engine at 1.0.0-rc11 #62

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
david-Darkcollective merged 2 commits into from
Oct 16, 2026
Merged

Pin the engine at 1.0.0-rc11 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117cc31
Build against the engine candidate, and render a TIMESTAMPTZ as JSON
david-Darkcollective Oct 16, 2026
b48d2fc
Pin the engine at 1.0.0-rc11
david-Darkcollective Oct 16, 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
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ version = findProperty('cliVersion') ?: '0.1.0-SNAPSHOT'
// command needs engine work that is not yet released, it tracks the engine's own develop
// branch instead (1.0.0-SNAPSHOT), which relix-core publishes to Central's snapshot
// repository on every push. A release pins a released engine (checkEnginePin).
ext.relixEngineVersion = '1.0.0-rc9'
// -PrelixEngineVersion=<v> overrides it for one build, to try a candidate engine.
ext.relixEngineVersion = (findProperty('relixEngineVersion') ?: '1.0.0-rc11') as String

def engineIsSnapshot = relixEngineVersion.endsWith('-SNAPSHOT')

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/darkcollective/relix/cli/render/OutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.darkcollective.relix.value.TimeValue;
import com.darkcollective.relix.value.TimestampValue;
import com.darkcollective.relix.value.Value;
import com.darkcollective.relix.value.ZonedTimestampValue;
import com.darkcollective.relix.symbol.ColumnDefinition;
import com.darkcollective.relix.symbol.Schema;

Expand Down Expand Up @@ -442,6 +443,7 @@ public static String jsonValue(Value value) {
case DateValue d -> JsonText.quote(d.asDisplayString());
case TimeValue t -> JsonText.quote(t.asDisplayString());
case TimestampValue ts -> JsonText.quote(ts.asDisplayString());
case ZonedTimestampValue z -> JsonText.quote(z.asDisplayString());
case DurationValue du -> JsonText.quote(du.asDisplayString());
};
}
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/com/darkcollective/relix/cli/render/OutputFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.darkcollective.relix.value.TimeValue;
import com.darkcollective.relix.value.TimestampValue;
import com.darkcollective.relix.value.Value;
import com.darkcollective.relix.value.ZonedTimestampValue;
import com.darkcollective.relix.symbol.ColumnDefinition;
import com.darkcollective.relix.symbol.ScalarType;
import com.darkcollective.relix.symbol.Schema;
Expand Down Expand Up @@ -368,6 +369,17 @@ void booleansAndNull() {
assertThat(out).contains("{\"flag\":true,\"note\":null}");
}

@Test
@DisplayName("renders a zoned timestamp as an ISO string that keeps its offset")
void zonedTimestamp() {
Schema schema = new Schema(List.of(new ColumnDefinition("at", ScalarType.TIMESTAMPTZ)));
String out = render(OutputFormat.JSON, schema, List.of(row(schema,
new ZonedTimestampValue(java.time.OffsetDateTime.parse("2026-03-01T09:00:00+02:00")))));

assertThat(out).contains("{\"at\":\"2026-03-01T09:00")
.contains("+02:00\"}");
}

@Test
@DisplayName("renders nested struct and array values as native JSON")
void nestedValues() {
Expand Down
Loading