Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,13 @@ describe(
agHelper.RenameQuery("intervalRecords");
dataSources.RunQuery();
dataSources.ReadQueryTableResponse(0).then(($cellData) => {
expect($cellData).to.eq(
"0 years 11 mons 29 days 23 hours 0 mins 0.0 secs",
);
expect($cellData).to.eq("11 mons 29 days 23 hours");
});
dataSources.ReadQueryTableResponse(1).then(($cellData) => {
expect($cellData).to.eq(
"0 years 1 mons 0 days 0 hours 0 mins 0.0 secs",
);
expect($cellData).to.eq("1 mons");
});
dataSources.ReadQueryTableResponse(2).then(($cellData) => {
expect($cellData).to.eq(
"0 years 0 mons 1 days 0 hours 0 mins 0.0 secs",
);
expect($cellData).to.eq("1 days");
});
dataSources.ReadQueryTableResponse(3).then(($cellData) => {
expect($cellData).to.eq("21");
Expand Down Expand Up @@ -186,9 +180,7 @@ describe(
expect($cellData).to.eq("16:05:00"); //time format
});
table.ReadTableRowColumnData(0, 6, "v1", 200).then(($cellData) => {
expect($cellData).to.eq(
"6 years 5 mons 4 days 3 hours 2 mins 1.0 secs",
); //Interval format!
expect($cellData).to.eq("6 years 5 mons 4 days 3 hours 2 mins 1 secs"); //Interval format!
});
table.ReadTableRowColumnData(0, 7).then(($cellData) => {
expect($cellData).to.eq("19.01.1989");
Expand Down Expand Up @@ -228,9 +220,7 @@ describe(
expect($cellData).to.eq("04:05:00");
});
table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
expect($cellData).to.eq(
"0 years 0 mons 3 days 4 hours 5 mins 6.0 secs",
);
expect($cellData).to.eq("3 days 4 hours 5 mins 6 secs");
});
table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
expect($cellData).to.eq("29.12.2045");
Expand Down Expand Up @@ -270,9 +260,7 @@ describe(
expect($cellData).to.eq("04:05:06.789");
});
table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
expect($cellData).to.eq(
"1 years 3 mons 2 days 6 hours 4 mins 5.0 secs",
);
expect($cellData).to.eq("1 years 3 mons 2 days 6 hours 4 mins 5 secs");
});
table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
expect($cellData).to.eq("17.03.2014");
Expand Down Expand Up @@ -322,9 +310,7 @@ describe(
expect($cellData).to.eq("18:14:16");
});
table.ReadTableRowColumnData(1, 6, "v1", 200).then(($cellData) => {
expect($cellData).to.eq(
"1 years 2 mons 0 days 0 hours 0 mins 0.0 secs",
);
expect($cellData).to.eq("1 years 2 mons");
});
table.ReadTableRowColumnData(1, 7, "v1", 200).then(($cellData) => {
expect($cellData).to.eq("08.01.1999");
Expand Down
6 changes: 4 additions & 2 deletions app/server/appsmith-plugins/postgresPlugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<!-- Overriding version to get fix for CVE-2024-1597. Remove once spring-boot is at least at 3.1.9 or 3.2.3 -->
<version>42.6.1</version>
<!-- Overriding Spring Boot's managed version (42.7.10) to pull in the fix for CVE-2026-42198
(SCRAM-SHA-256 PBKDF2 client-side DoS via malicious PostgreSQL servers).
Remove once Spring Boot manages org.postgresql:postgresql >= 42.7.11. -->
<version>42.7.11</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,9 +695,7 @@ public void testExecute() {
assertEquals("2018-11-30T20:45:15Z", node.get("created_on").asText());
assertEquals(
"2018-11-30T19:45:15Z", node.get("created_on_tz").asText());
assertEquals(
"1 years 5 mons 0 days 2 hours 0 mins 0.0 secs",
node.get("interval1").asText());
assertEquals("1 years 5 mons 2 hours", node.get("interval1").asText());
Assertions.assertThat(node.get("spouse_dob")).isEqualTo(NullNode.getInstance());

// Check the order of the columns.
Expand Down Expand Up @@ -1070,9 +1068,7 @@ public void testPreparedStatementWithoutQuotes() {
assertEquals("2018-11-30T20:45:15Z", node.get("created_on").asText());
assertEquals(
"2018-11-30T19:45:15Z", node.get("created_on_tz").asText());
assertEquals(
"1 years 5 mons 0 days 2 hours 0 mins 0.0 secs",
node.get("interval1").asText());
assertEquals("1 years 5 mons 2 hours", node.get("interval1").asText());
assertTrue(node.get("spouse_dob").isNull());
assertEquals(1.0, node.get("rating").asDouble(), 0.0);

Expand Down Expand Up @@ -1149,9 +1145,7 @@ public void testPreparedStatementWithDoubleQuotes() {
assertEquals("2018-11-30T20:45:15Z", node.get("created_on").asText());
assertEquals(
"2018-11-30T19:45:15Z", node.get("created_on_tz").asText());
assertEquals(
"1 years 5 mons 0 days 2 hours 0 mins 0.0 secs",
node.get("interval1").asText());
assertEquals("1 years 5 mons 2 hours", node.get("interval1").asText());
assertTrue(node.get("spouse_dob").isNull());

// Check the order of the columns.
Expand Down Expand Up @@ -1239,9 +1233,7 @@ public void testPreparedStatementWithSingleQuotes() {
assertEquals("2018-11-30T20:45:15Z", node.get("created_on").asText());
assertEquals(
"2018-11-30T19:45:15Z", node.get("created_on_tz").asText());
assertEquals(
"1 years 5 mons 0 days 2 hours 0 mins 0.0 secs",
node.get("interval1").asText());
assertEquals("1 years 5 mons 2 hours", node.get("interval1").asText());
assertTrue(node.get("spouse_dob").isNull());

// Check the order of the columns.
Expand Down
Loading