[#1313] <includes/> and <excludes/> match only table names, not fully qualified names

This commit is contained in:
Lukas Eder 2012-04-15 17:57:38 +00:00
parent f995290622
commit c304e8702a

View File

@ -564,13 +564,19 @@ public abstract class AbstractDatabase implements Database {
definitionsLoop: for (T definition : definitions) {
for (String exclude : excludes) {
if (exclude != null && definition.getName().matches(exclude.trim())) {
if (exclude != null &&
(definition.getName().matches(exclude.trim()) ||
definition.getQualifiedName().matches(exclude.trim()))) {
continue definitionsLoop;
}
}
for (String include : includes) {
if (include != null && definition.getName().matches(include.trim())) {
if (include != null &&
(definition.getName().matches(include.trim()) ||
definition.getQualifiedName().matches(include.trim()))) {
result.add(definition);
continue definitionsLoop;
}