diff --git a/ebean-api/src/main/java/io/ebean/OrderBy.java b/ebean-api/src/main/java/io/ebean/OrderBy.java index 8b39fc19e..d083387b3 100644 --- a/ebean-api/src/main/java/io/ebean/OrderBy.java +++ b/ebean-api/src/main/java/io/ebean/OrderBy.java @@ -231,18 +231,6 @@ public class OrderBy implements Serializable { return this; } - /** - * Return true if this order by can be used in select clause. - */ - public boolean supportsSelect() { - for (Property property : list) { - if (!property.supportsSelect()) { - return false; - } - } - return true; - } - /** * A property and its ascending descending order. */ @@ -403,12 +391,6 @@ public class OrderBy implements Serializable { this.ascending = ascending; } - /** - * Support use in select clause if no collation or nulls ordering. - */ - boolean supportsSelect() { - return nulls == null; - } } private void parse(String orderByClause) { diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 4fb45fef6..2a23f7273 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -20,7 +20,6 @@ public class TestOrderByParse extends BaseTestCase { assertTrue(o1.getProperties().get(0).isAscending()); assertThat(o1.toStringFormat()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end"); assertThat(o1.getProperties().get(0).getProperty()).isEqualTo("case when status='N' then 1 when status='F' then 2 else 99 end"); - assertTrue(o1.supportsSelect()); } @Test @@ -31,7 +30,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("id", o1.getProperties().get(0).getProperty()); assertTrue(o1.getProperties().get(0).isAscending()); assertEquals("id", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); o1 = new OrderBy<>("id asc"); assertEquals(1, o1.getProperties().size()); @@ -63,7 +61,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("id", o1.getProperties().get(0).getProperty()); assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id desc nulls high", o1.toStringFormat()); - assertFalse(o1.supportsSelect()); } @Test @@ -99,7 +96,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("name", o1.getProperties().get(1).getProperty()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id, name", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); o1 = new OrderBy<>(" id , name "); assertEquals(2, o1.getProperties().size()); @@ -178,7 +174,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("id", o1.getProperties().get(0).getProperty()); assertTrue(o1.getProperties().get(0).isAscending()); assertEquals("id collate latin_1", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); o1 = new OrderBy<>(); o1.desc("id", "latin_1"); @@ -186,7 +181,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("id", o1.getProperties().get(0).getProperty()); assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("id collate latin_1 desc", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); o1 = new OrderBy<>(); o1.desc("id", "latin_1"); @@ -197,7 +191,6 @@ public class TestOrderByParse extends BaseTestCase { assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, date", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); o1 = new OrderBy<>(); o1.desc("id", "latin_1"); @@ -208,7 +201,6 @@ public class TestOrderByParse extends BaseTestCase { assertFalse(o1.getProperties().get(0).isAscending()); assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); // functional (DB2) syntax o1 = new OrderBy<>(); @@ -217,7 +209,6 @@ public class TestOrderByParse extends BaseTestCase { assertEquals("id", o1.getProperties().get(0).getProperty()); assertFalse(o1.getProperties().get(0).isAscending()); assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat()); - assertTrue(o1.supportsSelect()); } @Test