github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7545] Fixed regression caused by unnecessary application of Filters

Browse Source
This commit is contained in:
lukaseder 2019-04-17 14:18:09 +02:00
parent c5903425ee
commit 66249dcfb7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
View File

@ -1513,13 +1513,10 @@ public abstract class AbstractDatabase implements Database {
|| (nullability == Nullability.NULL && !definedType.isNullable())))
continue forcedTypeLoop;
if ( (excludeExpression != null || includeExpression != null)
&& filterExcludeInclude(
Collections.singletonList(definition),
new String[] { excludeExpression },
new String[] { includeExpression != null ? includeExpression : ".*" },
getFilters()
).isEmpty())
if (excludeExpression != null && matches(patterns.pattern(excludeExpression), definition))
continue forcedTypeLoop;
if (includeExpression != null && !matches(patterns.pattern(includeExpression), definition))
continue forcedTypeLoop;
if ( (definedType != null && (excludeTypes != null || includeTypes != null))