Skip to content

Commit

Permalink
Merge pull request #946 from njr-11/wide-column-databases-might-not-b…
Browse files Browse the repository at this point in the history 
…e-capable-of-and

Wide column databases might not be capable of AND
  • Loading branch information
@otaviojava
otaviojava authored Jan 22, 2025
2 parents 913c5df + 63f8481 commit 171e940
Showing 1 changed file with 47 additions and 42 deletions.
89 changes: 47 additions & 42 deletions tck/src/main/java/ee/jakarta/tck/data/standalone/entity/EntityTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public void testBeyondFinalSlice() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of LessThanEqual.
return;
} else {
Expand Down Expand Up @@ -490,7 +490,7 @@ public void testContainsInString() {
} catch (UnsupportedOperationException e) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of Contains.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
} else {
throw e;
Expand All @@ -514,8 +514,8 @@ public void testDataRepository() {
assertEquals("7f", del.getHexadecimal());
assertEquals(true, del.isControl());
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of Between.
// Key-Value databases might not be capable of True/False comparison.
} else {
Expand Down Expand Up @@ -627,8 +627,8 @@ public void testFalse() {
try {
even = positives.findByIsOddFalseAndIdBetween(50L, 60L);
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of Between.
// Key-Value databases might not be capable of True/False comparison.
return;
Expand Down Expand Up @@ -715,7 +715,7 @@ public void testFinalSliceOfUpTo5() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of LessThanEqual.
return;
} else {
Expand Down Expand Up @@ -791,7 +791,7 @@ public void testFindFirst() {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of StartsWith.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
} else {
throw e;
Expand All @@ -818,7 +818,7 @@ public void testFindFirst3() {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of EndsWith.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
} else {
throw e;
Expand Down Expand Up @@ -972,7 +972,7 @@ public void testFirstCursoredPageOf8AndNextPages() {
// Test passes: Jakarta Data providers must raise UnsupportedOperationException when the database
// is not capable of cursor-based pagination.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
}

Expand Down Expand Up @@ -1107,7 +1107,7 @@ public void testFirstSliceOf5() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-value databases might not be capable of LessThanEqual.
return;
} else {
Expand Down Expand Up @@ -1202,11 +1202,11 @@ public void testIgnoreCase() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of IgnoreCase
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of Between.
// Column and Key-Value databases might not be capable of In
// Column and Key-Value databases might not be capable of sorting.
// when used with entity attributes other than the Id.
// Column and Key-Value databases might not be capable of sorting.
return;
} else {
throw x;
Expand Down Expand Up @@ -1255,7 +1255,7 @@ public void testCursoredPageOf7FromCursor() {
// Test passes: Jakarta Data providers must raise UnsupportedOperationException when the database
// is not capable of cursor-based pagination.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
}

Expand Down Expand Up @@ -1318,7 +1318,7 @@ public void testCursoredPageOfNothing() {
// Test passes: Jakarta Data providers must raise UnsupportedOperationException when the database
// is not capable of cursor-based pagination.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
}

Expand Down Expand Up @@ -1367,7 +1367,7 @@ public void testCursoredPageWithoutTotalOf9FromCursor() {
// Test passes: Jakarta Data providers must raise UnsupportedOperationException when the database
// is not capable of cursor-based pagination.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
}

Expand Down Expand Up @@ -1534,8 +1534,10 @@ public void testLiteralEnumAndLiteralFalse() {
try {
two = numbers.two().orElseThrow();
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
return; // Key-Value databases are not capable of JDQL TRUE/FALSE
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of JDQL AND
// Key-Value databases might not be capable of JDQL TRUE/FALSE
return;
} else {
throw x;
}
Expand All @@ -1552,9 +1554,9 @@ public void testLiteralInteger() {
try {
assertEquals(24, characters.twentyFour());
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases are not capable of <= in JDQL.
// Key-Value databases might not be capable of JDQL AND.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Key-Value databases might not be capable of <= in JDQL.
// Column and Key-Value databases might not be capable of JDQL AND.
return;
} else {
throw x;
Expand All @@ -1573,7 +1575,7 @@ public void testLiteralString() {
.collect(Collectors.toList()));
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Key-Value databases might not be capable of JDQL AND.
// Column and Key-Value databases might not be capable of JDQL AND.
// Column and Key-Value databases might not be capable of JDQL IN
// when used with entity attributes other than the Id.
return;
Expand All @@ -1589,9 +1591,10 @@ public void testLiteralTrue() {
try {
page1 = numbers.oddsFrom21To(40L, PageRequest.ofSize(5));
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases are not capable of JDQL BETWEEN
// Key-Value databases are not capable of JDQL TRUE/FALSE
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of JDQL AND
// Key-Value databases might not be capable of JDQL BETWEEN
// Key-Value databases might not be capable of JDQL TRUE/FALSE
return;
} else {
throw x;
Expand Down Expand Up @@ -1663,8 +1666,8 @@ public void testNonUniqueResultException() {
x.printStackTrace(System.out);
// test passes
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of Between.
// Key-Value databases might not be capable of True/False comparison.
return;
Expand Down Expand Up @@ -1871,7 +1874,7 @@ public void testQueryWithNot() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of Like
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of Between.
return;
} else {
Expand All @@ -1893,7 +1896,7 @@ public void testQueryWithNull() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of Contains.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
return;
} else {
throw x;
Expand Down Expand Up @@ -1992,7 +1995,7 @@ public void testQueryWithParenthesis() {
// Document, Column, and Key-Value databases might not be capable of parentheses.
// Column and Key-Value databases might not be capable of JDQL OR.
// Key-Value databases might not be capable of < in JDQL.
// Key-Value databases might not be capable of JDQL AND.
// Column and Key-Value databases might not be capable of JDQL AND.
return;
} else {
throw x;
Expand Down Expand Up @@ -2029,7 +2032,7 @@ public void testSliceOfNothing() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of LessThanEqual.
return;
} else {
Expand Down Expand Up @@ -2132,7 +2135,7 @@ public void testStaticMetamodelDescendingSorts() {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of EndsWith.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of GreaterThanEqual.
return;
} else {
Expand Down Expand Up @@ -2161,7 +2164,7 @@ public void testStaticMetamodelDescendingSortsPreGenerated() {
if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH)) {
// NoSQL databases might not be capable of EndsWith.
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of GreaterThanEqual.
return;
} else {
Expand All @@ -2181,8 +2184,8 @@ public void testStreamsFromList() {
chars = characters.findByNumericValueLessThanEqualAndNumericValueGreaterThanEqual(
109, 101);
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of GTE/LTE.
return;
} else {
Expand Down Expand Up @@ -2287,7 +2290,7 @@ public void testThirdAndFourthSlicesOf5() {
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of sorting.
// Key-Value databases might not be capable of And.
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of LessThanEqual.
return;
} else {
Expand Down Expand Up @@ -2319,8 +2322,8 @@ public void testTrue() {
try {
odd = positives.findByIsOddTrueAndIdLessThanEqualOrderByIdDesc(10L);
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
// Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
// Key-Value databases might not be capable of LessThanEqual.
// Key-Value databases might not be capable of True/False comparison.
return;
Expand Down Expand Up @@ -2442,8 +2445,9 @@ public void testUpdateQueryWithWhereClause() {
// Ensure there is no data left over from other tests:
shared.deleteIfPositive();
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
return; // Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
return;
} else if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH) && TestProperty.delay.isSet()) {
// NoSQL databases with eventual consistency might not be capable
// of counting removed entities.
Expand Down Expand Up @@ -2488,8 +2492,9 @@ public void testUpdateQueryWithWhereClause() {
try {
assertEquals(2, shared.deleteIfPositive());
} catch (UnsupportedOperationException x) {
if (type.isKeywordSupportAtOrBelow(DatabaseType.KEY_VALUE)) {
return; // Key-Value databases might not be capable of And.
if (type.isKeywordSupportAtOrBelow(DatabaseType.COLUMN)) {
// Column and Key-Value databases might not be capable of And.
return;
} else if (type.isKeywordSupportAtOrBelow(DatabaseType.GRAPH) && TestProperty.delay.isSet()) {
// NoSQL databases with eventual consistency might not be capable
// of counting removed entities.
Expand Down

0 comments on commit 171e940

Please sign in to comment.