From 76d85adc98a77ed08db6458d34b397d287afc783 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 14 Aug 2023 11:14:43 +1200 Subject: [PATCH] Fix tests for #3133 MySql and SQLServer which require column ordering of PK and FK to match --- .../test/java/org/tests/cache/embeddedid/ConceptId.java | 2 +- .../tests/cache/embeddedid/TestCompositeForeignKey.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java index 4db440388..fec049815 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java @@ -4,8 +4,8 @@ import javax.persistence.Embeddable; @Embeddable public class ConceptId { - private final String networkId; private final String id; + private final String networkId; public ConceptId(String networkId, String id) { this.networkId = networkId; diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/TestCompositeForeignKey.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/TestCompositeForeignKey.java index 0fdf06910..fb1708979 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/TestCompositeForeignKey.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/TestCompositeForeignKey.java @@ -36,15 +36,15 @@ class TestCompositeForeignKey extends BaseTestCase { List sql = LoggedSql.stop(); assertThat(sql).hasSize(4); - assertThat(sql.get(0)).contains("select t0.network_id, t0.id from concept t0"); + assertThat(sql.get(0)).contains("select t0.id, t0.network_id from concept t0"); if (isSqlServer() || isDb2() || isNuoDb()) { assertThat(sql.get(1)).contains("delete from connection where "); assertThat(sql.get(2)).contains("delete from connection where "); assertThat(sql.get(3)).contains("delete from concept where "); } else { - assertThat(sql.get(1)).contains("delete from connection where (network_id,from_conc) in"); - assertThat(sql.get(2)).contains("delete from connection where (network_id,to_conc) in"); - assertThat(sql.get(3)).contains("delete from concept where (network_id,id) in"); + assertThat(sql.get(1)).contains("delete from connection where (from_conc,network_id) in"); + assertThat(sql.get(2)).contains("delete from connection where (to_conc,network_id) in"); + assertThat(sql.get(3)).contains("delete from concept where (id,network_id) in"); } } }