Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use "GENERATED BY DEFAULT AS IDENTITY" for h2 2.0+ #2372

Merged
merged 2 commits into from Feb 17, 2022
Merged

Use "GENERATED BY DEFAULT AS IDENTITY" for h2 2.0+ #2372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29a516
Use "GENERATED BY DEFAULT AS IDENTITY" for h2 2.0+
nvoxland Jan 14, 2022
fb1f669
Merge remote-tracking branch 'origin/master' into h2-autoincrement
nvoxland Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion liquibase-core/src/main/java/liquibase/database/core/H2Database.java
View file
Open in desktop
Expand Up @@ -291,7 +291,15 @@ public boolean supportsInitiallyDeferrableColumns() {

@Override
protected String getAutoIncrementClause() {
return "AUTO_INCREMENT";
try {
if (getDatabaseMajorVersion() == 1) {
return "AUTO_INCREMENT";
} else {
return "GENERATED BY DEFAULT AS IDENTITY";
}
} catch (DatabaseException e) {
return "AUTO_INCREMENT";
}
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions liquibase-core/src/test/java/liquibase/sqlgenerator/core/CreateTableGeneratorTest.java
View file
Open in desktop
Expand Up @@ -521,7 +521,7 @@ public void testAutoIncrementH2Database() throws Exception {

Sql[] generatedSql = this.generatorUnderTest.generateSql(statement, database, null);

assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT AUTO_INCREMENT)", generatedSql[0].toSql());
assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT GENERATED BY DEFAULT AS IDENTITY)", generatedSql[0].toSql());
}
}
}
Expand All @@ -539,7 +539,7 @@ public void testAutoIncrementStartWithH2Database() throws Exception {

Sql[] generatedSql = this.generatorUnderTest.generateSql(statement, database, null);

assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT AUTO_INCREMENT (0))", generatedSql[0].toSql());
assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT GENERATED BY DEFAULT AS IDENTITY (0))", generatedSql[0].toSql());
}
}
}
Expand All @@ -557,7 +557,7 @@ public void testAutoIncrementStartWithIncrementByH2Database() throws Exception {

Sql[] generatedSql = this.generatorUnderTest.generateSql(statement, database, null);

assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT AUTO_INCREMENT (0, 10))", generatedSql[0].toSql());
assertEquals("CREATE TABLE SCHEMA_NAME.TABLE_NAME (COLUMN1_NAME BIGINT GENERATED BY DEFAULT AS IDENTITY (0, 10))", generatedSql[0].toSql());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...aved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/addAutoIncrement/h2.sql
View file
Open in desktop
Expand Up @@ -2,4 +2,4 @@
-- Change Parameter: columnDataType=int
-- Change Parameter: columnName=id
-- Change Parameter: tableName=person
ALTER TABLE person ALTER COLUMN id int AUTO_INCREMENT;
ALTER TABLE person ALTER COLUMN id int GENERATED BY DEFAULT AS IDENTITY;
3 changes: 1 addition & 2 deletions ...tegration-tests/src/test/java/liquibase/statementexecute/AddAutoIncrementExecuteTest.java
View file
Open in desktop
Expand Up @@ -47,8 +47,7 @@ public void noSchema() throws Exception {
assertCorrect("alter table [table_name] modify column_name integer generated by default as identity", PostgresDatabase.class, CockroachDatabase.class, EnterpriseDBDatabase.class);
assertCorrect("alter table table_name modify column_name int auto_increment", MySQLDatabase.class);
assertCorrect("ALTER TABLE [table_name] ALTER COLUMN [column_name] SET GENERATED BY DEFAULT AS IDENTITY", DB2Database.class);
assertCorrect("alter table table_name alter column column_name int generated by default as identity", HsqlDatabase.class);
assertCorrect("alter table table_name alter column column_name int auto_increment", H2Database.class);
assertCorrect("alter table table_name alter column column_name int generated by default as identity", HsqlDatabase.class, H2Database.class);

assertCorrect("ALTER TABLE [table_name] MODIFY [column_name] serial", InformixDatabase.class);
assertCorrect("ALTER TABLE [table_name] ALTER [column_name] SET DEFAULT AUTOINCREMENT", SybaseASADatabase.class);
Expand Down