Skip to content

Commit a5a89f8

Browse files
YaytayYaytay
committed
#233 Default date/time formats for XLSX
1 parent 84ae0b6 commit a5a89f8

File tree

9 files changed

+147
-55
lines changed

9 files changed

+147
-55
lines changed

‎query-engine-design-mode/src/test/java/uk/co/spudsoft/query/main/MainQueryIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void testQuery() throws Exception {
121121
.statusCode(200)
122122
.extract().body().asString();
123123

124-
assertThat(body, startsWith("{\"name\":\"\",\"children\":[{\"name\":\"args\",\"children\":[{\"name\":\"Args00\",\"path\":\"args/Args00\",\"title\":\"No Arguments\",\"description\":\"Test pipeline that has no arguments\",\"argumentGroups\":[],\"arguments\":[],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\""));
124+
assertThat(body, startsWith("{\"name\":\"\",\"children\":[{\"name\":\"args\",\"children\":[{\"name\":\"Args00\",\"path\":\"args/Args00\",\"title\":\"No Arguments\",\"description\":\"Test pipeline that has no arguments\",\"argumentGroups\":[],\"arguments\":[],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args01\",\"path\":\"args/Args01\",\"title\":\"One Argument\",\"description\":\"Test pipeline that has 1 argument\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args02\",\"path\":\"args/Args02\",\"title\":\"Two Arguments\",\"description\":\"Test pipeline that has 2 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args03\",\"path\":\"args/Args03\",\"title\":\"Three Arguments\",\"description\":\"Test pipeline that has 3 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg3\",\"title\":\"Third\",\"prompt\":\"arg3\",\"description\":\"The Third Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args04\",\"path\":\"args/Args04\",\"title\":\"Four Arguments\",\"description\":\"Test pipeline that has 4 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg3\",\"title\":\"Third\",\"prompt\":\"arg3\",\"description\":\"The Third Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg4\",\"title\":\"Fourth\",\"prompt\":\"arg1\",\"description\":\"The Fourth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args05\",\"path\":\"args/Args05\",\"title\":\"Five Arguments\",\"description\":\"Test pipeline that has 5 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg3\",\"title\":\"Third\",\"prompt\":\"arg3\",\"description\":\"The Third Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg4\",\"title\":\"Fourth\",\"prompt\":\"arg1\",\"description\":\"The Fourth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg5\",\"title\":\"Fifth\",\"prompt\":\"arg5\",\"description\":\"The Fifth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args06\",\"path\":\"args/Args06\",\"title\":\"Six Arguments\",\"description\":\"Test pipeline that has 6 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg3\",\"title\":\"Third\",\"prompt\":\"arg3\",\"description\":\"The Third Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg4\",\"title\":\"Fourth\",\"prompt\":\"arg1\",\"description\":\"The Fourth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg5\",\"title\":\"Fifth\",\"prompt\":\"arg5\",\"description\":\"The Fifth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg6\",\"title\":\"Sixth\",\"prompt\":\"arg6\",\"description\":\"The Sixth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]}],\"destinations\":[{\"type\":\"HTML\",\"name\":\"html\",\"extension\":\"html\",\"mediaType\":\"text/html\"},{\"type\":\"XLSX\",\"name\":\"xlsx\",\"extension\":\"xlsx\",\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\",\"sheetName\":\"data\",\"gridLines\":true,\"headers\":true,\"defaultDateFormat\":\"yyyy-mm-dd\",\"defaultDateTimeFormat\":\"yyyy-mm-dd hh:mm:ss\",\"defaultTimeFormat\":\"hh:mm:ss\",\"columns\":[]},{\"type\":\"Delimited\",\"name\":\"tab\",\"extension\":\"tsv\",\"mediaType\":\"text/tsv\",\"delimiter\":\"\\t\",\"openQuote\":\"\\\"\",\"closeQuote\":\"\\\"\",\"escapeCloseQuote\":\"\\\"\",\"newline\":\"\\n\"}]},{\"name\":\"Args07\",\"path\":\"args/Args07\",\"title\":\"Seven Arguments\",\"description\":\"Test pipeline that has 7 arguments\",\"argumentGroups\":[],\"arguments\":[{\"type\":\"String\",\"name\":\"arg1\",\"title\":\"First\",\"prompt\":\"arg1\",\"description\":\"The First Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[{\"value\":\"First\"},{\"value\":\"Second\"},{\"value\":\"Third\"}]},{\"type\":\"String\",\"name\":\"arg2\",\"title\":\"Second\",\"prompt\":\"arg2\",\"description\":\"The Second Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg3\",\"title\":\"Third\",\"prompt\":\"arg3\",\"description\":\"The Third Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg4\",\"title\":\"Fourth\",\"prompt\":\"arg1\",\"description\":\"The Fourth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg5\",\"title\":\"Fifth\",\"prompt\":\"arg5\",\"description\":\"The Fifth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg6\",\"title\":\"Sixth\",\"prompt\":\"arg6\",\"description\":\"The Sixth Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":false,\"ignored\":false,\"validate\":true,\"dependsUpon\":[],\"possibleValues\":[]},{\"type\":\"String\",\"name\":\"arg7\",\"title\":\"Seventh\",\"prompt\":\"arg7\",\"description\":\"The Seventh Argument\",\"optional\":false,\"hidden\":false,\"multiValued\":fal"));
125125
assertThat(body, containsString("\"mediaType\":\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\""));
126126

127127
body = given()

‎query-engine/docs/query-engine-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
- 16686:16686
5151

5252
query-engine:
53-
image: ghcr.io/yaytay/query-engine-design-mode:0.0.46-5-main
53+
image: ghcr.io/yaytay/query-engine-design-mode:0.0.46-6-main
5454
ports:
5555
- 2000:8080
5656
volumes:

‎query-engine/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
<dependency>
403403
<groupId>com.google.protobuf</groupId>
404404
<artifactId>protobuf-java</artifactId>
405-
<version>4.30.0</version>
405+
<version>4.30.1</version>
406406
</dependency>
407407
<dependency>
408408
<groupId>com.mysql</groupId>

0 commit comments

Comments
 (0)