Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to H2 1.4.197

Browse Source 
https://build.spring.io/browse/INT-FATS5IC-457

The H2 `1.4.197` has fixed some issues
(in particular https://github.com/h2database/h2database/issues/178)
and introduced some breaking changes for us, although they are
reasonably good.

* Fix `JdbcOutboundGatewayParserTests` to use correct identifiers
for returned generated keys instead of previously used `SCOPE_IDENTITY()`

**Cherry-pick to 5.0.x and 4.3.x**
This commit is contained in:
Artem Bilan
2018-03-26 12:24:48 -04:00
parent da6f47cf40
commit 7b86ca7bc8
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -105,7 +105,7 @@ subprojects { subproject ->
hazelcastVersion = '3.8'
hibernateVersion = '5.2.10.Final'
hsqldbVersion = '2.4.0'
h2Version = '1.4.196'
h2Version = '1.4.197'
jackson2Version = '2.9.4'
javaxActivationVersion = '1.1.1'
javaxMailVersion = '1.6.0'

7
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@ import org.springframework.messaging.support.GenericMessage;
* @author Gary Russell
* @author Artem Bilan
* @author Gunnar Hillert
*
* @since 2.0
*
*/
@@ -104,7 +105,7 @@ public class JdbcOutboundGatewayParserTests {
assertNotNull(reply);
Map<String, ?> payload = (Map<String, ?>) reply.getPayload();
Object id = payload.get("SCOPE_IDENTITY()");
Object id = payload.get("ID");
assertNotNull(id);
Map<String, Object> map = this.jdbcTemplate.queryForMap("SELECT * from BARS");
@@ -119,7 +120,7 @@ public class JdbcOutboundGatewayParserTests {
assertNotNull(reply);
payload = (Map<String, ?>) reply.getPayload();
id = payload.get("SCOPE_IDENTITY()");
id = payload.get("ID");
assertNotNull(id);
map = this.jdbcTemplate.queryForMap("SELECT * from BARS");
assertEquals("Wrong id", id, map.get("ID"));

6
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingKeyGenerationJdbcOutboundGatewayTest.xml
View File

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc" xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:si="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/jdbc
http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
<beans:import resource="jdbcOutboundChannelAdapterCommonConfig.xml" />
<si:channel id="output">
<si:queue />
</si:channel>
@@ -27,6 +27,4 @@
request-prepared-statement-setter="messagePreparedStatementSetter"
keys-generated="true" />
<beans:import resource="jdbcOutboundChannelAdapterCommonConfig.xml" />
</beans:beans>

4
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
View File

@@ -1,4 +1,4 @@
drop table foos;
drop table bars;
create table foos(id varchar(100),status int,name varchar(20));
create table bars(id int identity,status int,name varchar(20));
create table foos(id varchar(100), status int, name varchar(20));
create table bars(id int identity, status int, name varchar(20));