You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/02/12 14:32:31 UTC
[2/4] cayenne git commit: skip stored procedures loading for merge
tests
skip stored procedures loading for merge tests
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/489acb32
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/489acb32
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/489acb32
Branch: refs/heads/master
Commit: 489acb329616cad9d268d99b0012f47fb9fcc491
Parents: 07173c5
Author: kolonitsky <Al...@gmail.com>
Authored: Thu Feb 12 16:29:24 2015 +0300
Committer: kolonitsky <Al...@gmail.com>
Committed: Thu Feb 12 16:29:24 2015 +0300
----------------------------------------------------------------------
.../src/test/java/org/apache/cayenne/merge/MergeCase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/489acb32/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
index 8dd6c18..f7a2d21 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/merge/MergeCase.java
@@ -107,7 +107,7 @@ public abstract class MergeCase extends ServerCase {
protected List<MergerToken> createMergeTokens() {
DbLoaderConfiguration loaderConfiguration = new DbLoaderConfiguration();
- loaderConfiguration.setFiltersConfig(new FiltersConfig(new EntityFilters(DbPath.EMPTY, include("ARTIST|GALLERY|PAINTING|NEW_TABLE2?"), TRUE, TRUE)));
+ loaderConfiguration.setFiltersConfig(new FiltersConfig(new EntityFilters(DbPath.EMPTY, include("ARTIST|GALLERY|PAINTING|NEW_TABLE2?"), TRUE, NULL)));
return createMerger(node.getAdapter().mergerFactory())
.createMergeTokens(node.getDataSource(), node.getAdapter(), map, loaderConfiguration);