You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/10/02 12:56:40 UTC
cayenne git commit: Cleanup
Repository: cayenne
Updated Branches:
refs/heads/master 75d126490 -> 9867ff21e
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9867ff21
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9867ff21
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9867ff21
Branch: refs/heads/master
Commit: 9867ff21e2f7104e9adb5cbd1709066eb772ab16
Parents: 75d1264
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Oct 2 15:56:34 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Oct 2 15:56:34 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/query/SQLExecIT.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9867ff21/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java
index 4a03778..b85bfb8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLExecIT.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.QueryResult;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.test.jdbc.DBHelper;
+import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -40,6 +41,9 @@ public class SQLExecIT extends ServerCase {
@Inject
private DBHelper dbHelper;
+ @Inject
+ private UnitDbAdapter unitDbAdapter;
+
@Test
public void test_DataMapNameRoot() throws Exception {
int inserted = SQLExec.query("testmap", "INSERT INTO ARTIST (ARTIST_ID, ARTIST_NAME) VALUES (1, 'a')").update(
@@ -74,14 +78,14 @@ public class SQLExecIT extends ServerCase {
assertEquals(1, result.firstList().size());
DataRow row = (DataRow)result.firstList().get(0);
- // there is no methods to control case of the columns' names in SQLExec, so check both versions
- assertTrue(row.containsKey("ARTIST_ID") || row.containsKey("artist_id"));
- if(row.containsKey("ARTIST_ID")) {
- assertEquals(1L, row.get("ARTIST_ID"));
- assertEquals("a", row.get("ARTIST_NAME"));
- } else {
+ if(unitDbAdapter.isLowerCaseNames()) {
+ assertTrue(row.containsKey("artist_id"));
assertEquals(1L, row.get("artist_id"));
assertEquals("a", row.get("artist_name"));
+ } else {
+ assertTrue(row.containsKey("ARTIST_ID"));
+ assertEquals(1L, row.get("ARTIST_ID"));
+ assertEquals("a", row.get("ARTIST_NAME"));
}
}