Skip to content
This repository has been archived by the owner on Jun 16, 2020. It is now read-only.

Converted array into object to expose keys #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions src/main/java/org/wololo/jdbc/resources/RowsResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,14 @@ void writeRows(
}

void writeRow(final JsonGenerator jsonGenerator, final Record record) throws SQLException, JsonGenerationException, IOException {
jsonGenerator.writeStartArray();
for (Object value : record.intoArray()) {
jsonGenerator.writeObject(value);
jsonGenerator.writeStartObject();
try {
for (Map.Entry<String, Object> entry : record.intoMap().entrySet()) {
jsonGenerator.writeObjectField(entry.getKey(), entry.getValue());
}
} finally {
jsonGenerator.writeEndObject();
}
jsonGenerator.writeEndArray();
}

List<Field<Object>> getFields() throws SQLException {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/wololo/jdbc/RowsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void testTwoSelectTwo() throws IOException, SQLException {
statement.execute("insert into test (name) values ('test')");
statement.execute("insert into test (name) values ('test2')");
}
assertEquals(getJson("RowsTwo"), target(path).queryParam("select", "id,name").request().get(String.class));
assertEquals(getJson("RowsTwoSelectTwo"), target(path).queryParam("select", "id,name").request().get(String.class));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/h2/expected/RowsOne.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"]]
[{"ID":1,"NAME":"test"}]
2 changes: 1 addition & 1 deletion src/test/resources/h2/expected/RowsTwo.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"],[2,"test2"]]
[{"ID":1,"NAME":"test"},{"ID":2,"NAME":"test2"}]
1 change: 1 addition & 0 deletions src/test/resources/h2/expected/RowsTwoExpectTwo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"id":1,"name":"test"},{"id":2,"name":"test2"}]
2 changes: 1 addition & 1 deletion src/test/resources/h2/expected/RowsTwoSelect.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1],[2]]
[{"id":1},{"id":2}]
2 changes: 1 addition & 1 deletion src/test/resources/h2/expected/RowsTwoWhere.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[2,"test2"]]
[{"ID":2,"NAME":"test2"}]
2 changes: 1 addition & 1 deletion src/test/resources/hsql/expected/RowsOne.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"]]
[{"ID":1,"NAME":"test"}]
2 changes: 1 addition & 1 deletion src/test/resources/hsql/expected/RowsTwo.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"],[2,"test2"]]
[{"ID":1,"NAME":"test"},{"ID":2,"NAME":"test2"}]
1 change: 1 addition & 0 deletions src/test/resources/hsql/expected/RowsTwoExpectTwo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"id":1,"name":"test"},{"id":2,"name":"test2"}]
2 changes: 1 addition & 1 deletion src/test/resources/hsql/expected/RowsTwoSelect.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1],[2]]
[{"id":1},{"id":2}]
2 changes: 1 addition & 1 deletion src/test/resources/hsql/expected/RowsTwoWhere.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[2,"test2"]]
[{"ID":2,"NAME":"test2"}]
2 changes: 1 addition & 1 deletion src/test/resources/pg/expected/RowsOne.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"]]
[{"ID":1,"NAME":"test"}]
2 changes: 1 addition & 1 deletion src/test/resources/pg/expected/RowsTwo.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1,"test"],[2,"test2"]]
[{"ID":1,"NAME":"test"},{"ID":2,"NAME":"test2"}]
1 change: 1 addition & 0 deletions src/test/resources/pg/expected/RowsTwoExpectTwo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"id":1,"name":"test"},{"id":2,"name":"test2"}]
2 changes: 1 addition & 1 deletion src/test/resources/pg/expected/RowsTwoSelect.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1],[2]]
[{"id":1},{"id":2}]
2 changes: 1 addition & 1 deletion src/test/resources/pg/expected/RowsTwoWhere.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[2,"test2"]]
[{"ID":2,"NAME":"test2"}]