github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1765 - Wrong SQL generated on m2m and OrderBy (Regression of #1746)

Browse Source
This commit is contained in:
rob bygrave
2019-07-19 10:43:07 +12:00
parent 8b670fd615
commit bcb136b692
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java
+36
View File
@@ -0,0 +1,36 @@
package org.tests.m2m;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import io.ebeantest.LoggedSql;
import org.junit.Test;
import org.tests.model.m2m.Permission;
import org.tests.model.m2m.Role;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
public class TestM2MDistinct_sqlServer extends BaseTestCase {
@ForPlatform(Platform.SQLSERVER)
@Test
public void testName() {
Permission perm = new Permission("TestPerm");
DB.save(perm);
LoggedSql.start();
List<Role> roles = DB.find(Role.class).where().eq("permissions", perm)
.order().asc("name", "Latin1_General_CI_AS")
.findList();
List<String> sqls = LoggedSql.stop();
assertThat(sqls.get(0)).startsWith("select distinct t0.id, t0.name, t0.version, t0.tenant_id, t0.name collate Latin1_General_CI_AS "
+ "from mt_role t0 join mt_role_permission u1z_ on u1z_.mt_role_id = t0.id "
+ "join mt_permission u1 on u1.id = u1z_.mt_permission_id where u1.id = ? "
+ "order by t0.name collate Latin1_General_CI_AS;");
}
}
src/test/java/org/tests/unitinternal/TestOrderByParse.java
+5 -6
View File
@@ -182,7 +182,7 @@ 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());
assertFalse(o1.supportsSelect());
assertTrue(o1.supportsSelect());
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
@@ -190,7 +190,7 @@ public class TestOrderByParse extends BaseTestCase {
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertEquals("id collate latin_1 desc", o1.toStringFormat());
assertFalse(o1.supportsSelect());
assertTrue(o1.supportsSelect());
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
@@ -201,7 +201,7 @@ public class TestOrderByParse extends BaseTestCase {
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id collate latin_1 desc, date", o1.toStringFormat());
assertFalse(o1.supportsSelect());
assertTrue(o1.supportsSelect());
o1 = new OrderBy<>();
o1.desc("id", "latin_1");
@@ -212,7 +212,7 @@ public class TestOrderByParse extends BaseTestCase {
assertTrue(!o1.getProperties().get(0).isAscending());
assertTrue(o1.getProperties().get(1).isAscending());
assertEquals("id collate latin_1 desc, name collate latin_2", o1.toStringFormat());
assertFalse(o1.supportsSelect());
assertTrue(o1.supportsSelect());
// functional (DB2) syntax
o1 = new OrderBy<>();
@@ -221,8 +221,7 @@ public class TestOrderByParse extends BaseTestCase {
assertEquals("id", o1.getProperties().get(0).getProperty());
assertTrue(!o1.getProperties().get(0).isAscending());
assertEquals("COLLATION_KEY(id, 'latin_1') desc", o1.toStringFormat());
assertFalse(o1.supportsSelect());
assertTrue(o1.supportsSelect());
}
@Test