cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [3/3] cayenne git commit: CAY-2050 Refactoring: ParameterBinding to contain ExtendedType property
Date Sun, 24 Jan 2016 10:29:52 GMT
CAY-2050 Refactoring: ParameterBinding to contain ExtendedType property

cleaning up translator hacks intended to avoid unit test failures.
Those suspect unit tests were removed already


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2b61d2f3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2b61d2f3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2b61d2f3

Branch: refs/heads/master
Commit: 2b61d2f3f3ff9e8aa3c3217f6b20f8ca64c0e09e
Parents: 9c4ae9f
Author: aadamchik <aadamchik@apache.org>
Authored: Sun Jan 24 13:24:14 2016 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Sun Jan 24 13:26:42 2016 +0300

----------------------------------------------------------------------
 .../cayenne/access/translator/select/QueryAssemblerHelper.java     | 2 +-
 .../cayenne/access/translator/select/QualifierTranslatorIT.java    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/2b61d2f3/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
index 540e23a..decdaa7 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QueryAssemblerHelper.java
@@ -343,7 +343,7 @@ public abstract class QueryAssemblerHelper {
 				}
 			}
 
-			return new DbAttribute("null"); //Make tests passed. Should never happen in runtime.
+			return null;
 		}
 
 		// naive algorithm:

http://git-wip-us.apache.org/repos/asf/cayenne/blob/2b61d2f3/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
index 105efd6..5671830 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java
@@ -40,8 +40,6 @@ import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
 public class QualifierTranslatorIT extends ServerCase {
 


Mime
View raw message