root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

This commit is contained in:
Sam Brannen 2022-01-08 17:24:53 +01:00
parent 86387db045 51d263bd06
commit ab88ff374a
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
spring-jdbc/src/test/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementerTests.java
View File

@ -20,18 +20,16 @@ import java.util.UUID;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.h2.engine.Mode.ModeEnum;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource; import org.junit.jupiter.params.provider.EnumSource;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.jdbc.datasource.SimpleDriverDataSource; import org.springframework.jdbc.datasource.SimpleDriverDataSource;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -60,12 +58,7 @@ class H2SequenceMaxValueIncrementerTests {
.addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql") .addScript("classpath:/org/springframework/jdbc/support/incrementer/schema.sql")
.build(); .build();
JdbcTemplate jdbcTemplate = new JdbcTemplate(database); assertIncrements(database);
assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(database, "SEQ");
assertThat(incrementer.nextIntValue()).isEqualTo(2);
assertThat(incrementer.nextStringValue()).isEqualTo("3");
database.shutdown(); database.shutdown();
} }
@ -74,24 +67,24 @@ class H2SequenceMaxValueIncrementerTests {
* Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>. * Tests that the incrementer works when using all supported H2 <em>compatibility modes</em>.
*/ */
@ParameterizedTest @ParameterizedTest
@ValueSource(strings = { "STRICT", "LEGACY", "DB2", "Derby", "HSQLDB", "MariaDB", "MSSQLServer", "MySQL", "Oracle", "PostgreSQL" }) @EnumSource(ModeEnum.class)
void incrementsSequenceWithExplicitH2CompatibilityMode(String compatibilityMode) { void incrementsSequenceWithExplicitH2CompatibilityMode(ModeEnum mode) {
String connectionUrl = String.format("jdbc:h2:mem:%s;MODE=%s", UUID.randomUUID().toString(), compatibilityMode); String connectionUrl = String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false;MODE=%s", UUID.randomUUID().toString(), mode);
DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", ""); DataSource dataSource = new SimpleDriverDataSource(new org.h2.Driver(), connectionUrl, "sa", "");
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
PlatformTransactionManager transactionManager = new DataSourceTransactionManager(dataSource); jdbcTemplate.execute("CREATE SEQUENCE SEQ");
TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);
transactionTemplate.executeWithoutResult(status -> { assertIncrements(dataSource);
jdbcTemplate.execute("CREATE SEQUENCE SEQ");
assertThat(jdbcTemplate.queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
assertThat(incrementer.nextIntValue()).isEqualTo(2);
assertThat(incrementer.nextStringValue()).isEqualTo("3");
});
jdbcTemplate.execute("SHUTDOWN"); jdbcTemplate.execute("SHUTDOWN");
} }
private void assertIncrements(DataSource dataSource) {
assertThat(new JdbcTemplate(dataSource).queryForObject("values next value for SEQ", int.class)).isEqualTo(1);
H2SequenceMaxValueIncrementer incrementer = new H2SequenceMaxValueIncrementer(dataSource, "SEQ");
assertThat(incrementer.nextIntValue()).isEqualTo(2);
assertThat(incrementer.nextStringValue()).isEqualTo("3");
}
} }