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

[DAT-16135] add new scope flag for modifyChangeSet flow #5707

Merged
merged 5 commits into from
Mar 22, 2024
Merged

[DAT-16135] add new scope flag for modifyChangeSet flow #5707

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76d699f
add new scope for modifyChangeSet flow
KushnirykOleh Mar 18, 2024
5bb69db
reverted formatting changes
KushnirykOleh Mar 18, 2024
8d3dd11
added comment
KushnirykOleh Mar 18, 2024
106dbed
fixed regression with getting and normalizing path
KushnirykOleh Mar 18, 2024
6c7c2bd
Merge branch 'master' into DAT-16135
obovsunivskyii Mar 22, 2024
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
25 changes: 17 additions & 8 deletions liquibase-standard/src/main/java/liquibase/changelog/DatabaseChangeLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,8 @@ public boolean include(String fileName,
throw new UnexpectedLiquibaseException(e);
}
}
final String normalizedFilePath = fileName;

DatabaseChangeLog changeLog;
try {
DatabaseChangeLog rootChangeLog = ROOT_CHANGE_LOG.get();
Expand All @@ -938,17 +940,24 @@ public boolean include(String fileName,
DatabaseChangeLog parentChangeLog = PARENT_CHANGE_LOG.get();
PARENT_CHANGE_LOG.set(this);
try {
if (!resourceAccessor.get(fileName).exists()) {
if (!resourceAccessor.get(normalizedFilePath).exists()) {
if (ChangeLogParserConfiguration.ON_MISSING_INCLUDE_CHANGELOG.getCurrentValue().equals(ChangeLogParserConfiguration.MissingIncludeConfiguration.WARN)
|| !errorIfMissing) {
Scope.getCurrentScope().getLog(getClass()).warning(FileUtil.getFileNotFoundMessage(fileName));
Scope.getCurrentScope().getLog(getClass()).warning(FileUtil.getFileNotFoundMessage(normalizedFilePath));
return false;
} else {
throw new ChangeLogParseException(FileUtil.getFileNotFoundMessage(fileName));
throw new ChangeLogParseException(FileUtil.getFileNotFoundMessage(normalizedFilePath));
}
}
ChangeLogParser parser = ChangeLogParserFactory.getInstance().getParser(fileName, resourceAccessor);
changeLog = parser.parse(fileName, changeLogParameters, resourceAccessor);
ChangeLogParser parser = ChangeLogParserFactory.getInstance().getParser(normalizedFilePath, resourceAccessor);

if (modifyChangeSets != null) {
// Some parser need to know it's not a top level changelog, in modifyChangeSets flow 'runWith' attributes are added later on
changeLog = Scope.child(Collections.singletonMap("modifyChangeSets", true),
() -> parser.parse(normalizedFilePath, changeLogParameters, resourceAccessor));
} else {
changeLog = parser.parse(normalizedFilePath, changeLogParameters, resourceAccessor);
}
changeLog.setIncludeContextFilter(includeContextFilter);
changeLog.setIncludeLabels(labels);
changeLog.setIncludeIgnore(ignore != null ? ignore.booleanValue() : false);
Expand All @@ -967,14 +976,14 @@ public boolean include(String fileName,
throw e;
}
// This matches only an extension, but filename can be a full path, too. Is it right?
boolean matchesFileExtension = StringUtil.trimToEmpty(fileName).matches("\\.\\w+$");
boolean matchesFileExtension = StringUtil.trimToEmpty(normalizedFilePath).matches("\\.\\w+$");
if (matchesFileExtension || onUnknownFileFormat == OnUnknownFileFormat.WARN) {
Scope.getCurrentScope().getLog(getClass()).warning(
"included file " + fileName + "/" + fileName + " is not a recognized file type"
"included file " + normalizedFilePath + "/" + normalizedFilePath + " is not a recognized file type"
);
}
return false;
} catch (IOException e) {
} catch (Exception e) {
throw new LiquibaseException(e.getMessage(), e);
}
PreconditionContainer preconditions = changeLog.getPreconditions();
Expand Down