Skip to content

[master] In test, send REORG for DB2 to finish table modification #2597

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

Open
arjantijms wants to merge 1 commit into
base: master
Choose a base branch
from
+55 −11
Open

[master] In test, send REORG for DB2 to finish table modification #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions ...persistence/testing/tests/jpa/persistence32/SchemaManagerValidateOnMissingColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2025 Contributors to the Eclipse Foundation.
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -20,6 +21,8 @@
import jakarta.persistence.SchemaManager;
import jakarta.persistence.SchemaValidationException;
import junit.framework.Test;

import org.eclipse.persistence.queries.SQLCall;
import org.eclipse.persistence.tools.schemaframework.TableCreator;
import org.eclipse.persistence.tools.schemaframework.TableDefinition;
import org.eclipse.persistence.tools.schemaframework.TableValidationException;
Expand All @@ -43,10 +46,11 @@ public SchemaManagerValidateOnMissingColumnTest(String name) {
super(name);
}

// Test SchemaManager validate method on existing valid schema
// Test SchemaManager#validate on a schema with a missing column
public void testValidateOnMissingColumn() {
// Make sure that tables exist
createTables();

// Modify current schema
TableCreator tableCreator = getDefaultTableCreator();
Map<String, TableDefinition> tableDefinitions = new HashMap<>(tableCreator.getTableDefinitions().size());
Expand All @@ -56,9 +60,21 @@ public void testValidateOnMissingColumn() {
: tableDefinition.getTable().getName();
tableDefinitions.put(tableName, tableDefinition);
}

// Remove "NAME" field from "PERSISTENCE32_TEAM"
TableDefinition team = tableDefinitions.get("PERSISTENCE32_TEAM");
team.dropFieldOnDatabase(emf.getDatabaseSession(), "NAME");
tableDefinitions.get("PERSISTENCE32_TEAM")
.dropFieldOnDatabase(
emf.getDatabaseSession(),
"NAME");

if (emf.getDatabaseSession().getPlatform().isDB2()) {
// After table modifications, DB2 needs a kind of secondary commit called a 'REORG'
// to make the table available again.
emf.getDatabaseSession()
.priviledgedExecuteNonSelectingCall(
new SQLCall("CALL SYSPROC.ADMIN_CMD('REORG TABLE PERSISTENCE32_TEAM')"));
}

// Do the validation
SchemaManager schemaManager = emf.getSchemaManager();
try {
Expand All @@ -73,12 +89,14 @@ public void testValidateOnMissingColumn() {
if (!(exception instanceof TableValidationException.MissingColumns)) {
fail("Exception is not an instance of TableValidationException.MissingColumns");
}

if (exception.getFailure() == TableValidationException.ValidationFailure.MISSING_COLUMNS) {
assertEquals("PERSISTENCE32_TEAM", exception.getTable());

} else {
fail("Exception type is not MISSING_COLUMNS");
}

checkMissingColumns(missingColumns,
exception.getTable(),
exception.unwrap(TableValidationException.MissingColumns.class)
Expand Down
42 changes: 34 additions & 8 deletions ...ersistence/testing/tests/jpa/persistence32/SchemaManagerValidateOnModifiedColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2025 Contributors to the Eclipse Foundation.
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -18,11 +19,18 @@
import jakarta.persistence.SchemaManager;
import jakarta.persistence.SchemaValidationException;
import junit.framework.Test;

import org.eclipse.persistence.queries.SQLCall;
import org.eclipse.persistence.tools.schemaframework.FieldDefinition;
import org.eclipse.persistence.tools.schemaframework.TableCreator;
import org.eclipse.persistence.tools.schemaframework.TableDefinition;
import org.eclipse.persistence.tools.schemaframework.TableValidationException;

import static org.eclipse.persistence.tools.schemaframework.TableValidationException.DifferentColumns.Difference;
import static org.eclipse.persistence.tools.schemaframework.TableValidationException.DifferentColumns.Type.TYPE_DIFFERENCE;
import static org.eclipse.persistence.tools.schemaframework.TableValidationException.DifferentColumns.TypeDifference;
import static org.eclipse.persistence.tools.schemaframework.TableValidationException.DifferentColumns;

/**
* Verify jakarta.persistence 3.2 API changes in {@link SchemaManager}.
* Test {@link jakarta.persistence.SchemaManager#validate()} method on database with existing but modified schema.
Expand All @@ -46,6 +54,7 @@ public SchemaManagerValidateOnModifiedColumnTest(String name) {
public void testValidateOnModifiedSchema() {
// Make sure that tables exist
createTables();

// Modify current schema
TableCreator tableCreator = getDefaultTableCreator();
Map<String, TableDefinition> tableDefinitions = new HashMap<>(tableCreator.getTableDefinitions().size());
Expand All @@ -55,24 +64,38 @@ public void testValidateOnModifiedSchema() {
: tableDefinition.getTable().getName();
tableDefinitions.put(tableName, tableDefinition);
}

// Modify "NAME" field in "PERSISTENCE32_TRAINER"
TableDefinition trainer = tableDefinitions.get("PERSISTENCE32_TRAINER");
FieldDefinition nameField = trainer.getField("NAME");
trainer.dropFieldOnDatabase(emf.getDatabaseSession(), "NAME");
FieldDefinition newNameField = new FieldDefinition();
newNameField.setName("NAME");

// Different type
newNameField.setTypeName("NUMERIC");

// Different type size
newNameField.setSize(nameField.getSize()+5);

// Different nullable
newNameField.setShouldAllowNull(nameField.shouldAllowNull());
newNameField.setIsPrimaryKey(nameField.isPrimaryKey());
newNameField.setUnique(nameField.isUnique());
newNameField.setIsIdentity(nameField.isIdentity());
trainer.addFieldOnDatabase(emf.getDatabaseSession(), newNameField);

if (emf.getDatabaseSession().getPlatform().isDB2()) {
// After table modifications, DB2 needs a kind of secondary commit called a 'REORG'
// to make the table available again.
emf.getDatabaseSession()
.priviledgedExecuteNonSelectingCall(
new SQLCall("CALL SYSPROC.ADMIN_CMD('REORG TABLE PERSISTENCE32_TRAINER')"));
}

// Do the validation
SchemaManager schemaManager = emf.getSchemaManager();

try {
// Test validation
schemaManager.validate();
Expand All @@ -81,18 +104,21 @@ public void testValidateOnModifiedSchema() {
// Validation is expected to fail and return all missing columns
Exception[] exceptions = sve.getFailures();
for (TableValidationException exception : (TableValidationException[]) exceptions) {
if (!(exception instanceof TableValidationException.DifferentColumns)) {
if (!(exception instanceof DifferentColumns)) {
exception.printStackTrace();
fail("Exception is not an instance of TableValidationException.DifferentColumns");
}
List<TableValidationException.DifferentColumns.Difference> diffs
= exception.unwrap(TableValidationException.DifferentColumns.class).getDifferences();
assertEquals(1, diffs.size());
for (TableValidationException.DifferentColumns.Difference diff : diffs) {

List<Difference> differences = exception.unwrap(DifferentColumns.class).getDifferences();
assertEquals(1, differences.size());

for (Difference difference : differences) {
assertEquals("PERSISTENCE32_TRAINER", exception.getTable());
assertEquals(TableValidationException.DifferentColumns.Type.TYPE_DIFFERENCE, diff.getType());
TableValidationException.DifferentColumns.TypeDifference typeDiff = diff.unwrap(TableValidationException.DifferentColumns.TypeDifference.class);
assertEquals(TYPE_DIFFERENCE, difference.getType());
TypeDifference typeDifference = difference.unwrap(TypeDifference.class);

// Type names are database specific so let's just check that they are not the same
assertNotSame(typeDiff.getModelValue(), typeDiff.getDbValue());
assertNotSame(typeDifference.getModelValue(), typeDifference.getDbValue());
}
}
}
Expand Down
Loading