mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
This commit is contained in:
parent
37c1f47902
commit
e3d0f1feee
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE CITY (
|
CREATE TABLE CITY (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
state VARCHAR(30),
|
state VARCHAR(30),
|
||||||
country VARCHAR(30),
|
country VARCHAR(30),
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2021 the original author or authors.
|
* Copyright 2012-2022 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -98,9 +98,11 @@ class ConnectionFactoryHealthIndicatorTests {
|
|||||||
CloseableConnectionFactory connectionFactory = createTestDatabase();
|
CloseableConnectionFactory connectionFactory = createTestDatabase();
|
||||||
try {
|
try {
|
||||||
String customValidationQuery = "SELECT COUNT(*) from HEALTH_TEST";
|
String customValidationQuery = "SELECT COUNT(*) from HEALTH_TEST";
|
||||||
Mono.from(connectionFactory.create()).flatMapMany((it) -> Flux
|
String createTableStatement = "CREATE TABLE HEALTH_TEST (id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY)";
|
||||||
.from(it.createStatement("CREATE TABLE HEALTH_TEST (id INTEGER IDENTITY PRIMARY KEY)").execute())
|
Mono.from(connectionFactory.create())
|
||||||
.flatMap(Result::getRowsUpdated).thenMany(it.close())).as(StepVerifier::create).verifyComplete();
|
.flatMapMany((it) -> Flux.from(it.createStatement(createTableStatement).execute())
|
||||||
|
.flatMap(Result::getRowsUpdated).thenMany(it.close()))
|
||||||
|
.as(StepVerifier::create).verifyComplete();
|
||||||
ReactiveHealthIndicator healthIndicator = new ConnectionFactoryHealthIndicator(connectionFactory,
|
ReactiveHealthIndicator healthIndicator = new ConnectionFactoryHealthIndicator(connectionFactory,
|
||||||
customValidationQuery);
|
customValidationQuery);
|
||||||
healthIndicator.health().as(StepVerifier::create).assertNext((actual) -> {
|
healthIndicator.health().as(StepVerifier::create).assertNext((actual) -> {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE PREFIX_JOB_INSTANCE (
|
CREATE TABLE PREFIX_JOB_INSTANCE (
|
||||||
JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
|
JOB_INSTANCE_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
|
||||||
VERSION BIGINT ,
|
VERSION BIGINT ,
|
||||||
JOB_NAME VARCHAR(100) NOT NULL,
|
JOB_NAME VARCHAR(100) NOT NULL,
|
||||||
JOB_KEY VARCHAR(32) NOT NULL,
|
JOB_KEY VARCHAR(32) NOT NULL,
|
||||||
@ -7,7 +7,7 @@ CREATE TABLE PREFIX_JOB_INSTANCE (
|
|||||||
) ;
|
) ;
|
||||||
|
|
||||||
CREATE TABLE PREFIX_JOB_EXECUTION (
|
CREATE TABLE PREFIX_JOB_EXECUTION (
|
||||||
JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
|
JOB_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
|
||||||
VERSION BIGINT ,
|
VERSION BIGINT ,
|
||||||
JOB_INSTANCE_ID BIGINT NOT NULL,
|
JOB_INSTANCE_ID BIGINT NOT NULL,
|
||||||
CREATE_TIME TIMESTAMP NOT NULL,
|
CREATE_TIME TIMESTAMP NOT NULL,
|
||||||
@ -36,7 +36,7 @@ CREATE TABLE PREFIX_JOB_EXECUTION_PARAMS (
|
|||||||
) ;
|
) ;
|
||||||
|
|
||||||
CREATE TABLE PREFIX_STEP_EXECUTION (
|
CREATE TABLE PREFIX_STEP_EXECUTION (
|
||||||
STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
|
STEP_EXECUTION_ID BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY ,
|
||||||
VERSION BIGINT NOT NULL,
|
VERSION BIGINT NOT NULL,
|
||||||
STEP_NAME VARCHAR(100) NOT NULL,
|
STEP_NAME VARCHAR(100) NOT NULL,
|
||||||
JOB_EXECUTION_ID BIGINT NOT NULL,
|
JOB_EXECUTION_ID BIGINT NOT NULL,
|
||||||
@ -75,11 +75,11 @@ CREATE TABLE PREFIX_JOB_EXECUTION_CONTEXT (
|
|||||||
) ;
|
) ;
|
||||||
|
|
||||||
CREATE TABLE PREFIX_STEP_EXECUTION_SEQ (
|
CREATE TABLE PREFIX_STEP_EXECUTION_SEQ (
|
||||||
ID BIGINT IDENTITY
|
ID BIGINT GENERATED BY DEFAULT AS IDENTITY
|
||||||
);
|
);
|
||||||
CREATE TABLE PREFIX_JOB_EXECUTION_SEQ (
|
CREATE TABLE PREFIX_JOB_EXECUTION_SEQ (
|
||||||
ID BIGINT IDENTITY
|
ID BIGINT GENERATED BY DEFAULT AS IDENTITY
|
||||||
);
|
);
|
||||||
CREATE TABLE PREFIX_JOB_SEQ (
|
CREATE TABLE PREFIX_JOB_SEQ (
|
||||||
ID BIGINT IDENTITY
|
ID BIGINT GENERATED BY DEFAULT AS IDENTITY
|
||||||
);
|
);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE CITY (
|
CREATE TABLE CITY (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
state VARCHAR(30),
|
state VARCHAR(30),
|
||||||
country VARCHAR(30),
|
country VARCHAR(30),
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE SPAM (
|
CREATE TABLE SPAM (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30)
|
name VARCHAR(30)
|
||||||
);
|
);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE FOO (
|
CREATE TABLE FOO (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
todrop VARCHAR(30)
|
todrop VARCHAR(30)
|
||||||
);
|
);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE FOO (
|
CREATE TABLE FOO (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30)
|
name VARCHAR(30)
|
||||||
);
|
);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE BAR (
|
CREATE TABLE BAR (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30)
|
name VARCHAR(30)
|
||||||
);
|
);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE FOO (
|
CREATE TABLE FOO (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30)
|
name VARCHAR(30)
|
||||||
);
|
);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
CREATE TABLE EXAMPLE (
|
CREATE TABLE EXAMPLE (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30)
|
name VARCHAR(30)
|
||||||
);
|
);
|
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE CUSTOMER (
|
CREATE TABLE CUSTOMER (
|
||||||
ID INTEGER IDENTITY PRIMARY KEY,
|
ID INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
FIRST_NAME VARCHAR(30),
|
FIRST_NAME VARCHAR(30),
|
||||||
DATE_OF_BIRTH DATE
|
DATE_OF_BIRTH DATE
|
||||||
);
|
);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE CITY (
|
CREATE TABLE CITY (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
state VARCHAR(30),
|
state VARCHAR(30),
|
||||||
country VARCHAR(30)
|
country VARCHAR(30)
|
||||||
|
Loading…
Reference in New Issue
Block a user