Possible regression: Issues lazy loading deep relations that are soft-deleted

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.example</groupId>
-  <artifactId>example-mininal</artifactId>
+  <artifactId>minimal-bug-reproduction</artifactId>
   <version>1.1-SNAPSHOT</version>
 
   <properties>
@@ -14,6 +14,9 @@
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
     <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+    <ebean-version>13.8.0</ebean-version>
+<!--    Using 13.6.5 to test behaviour prior to 13.6.6 -->
+<!--    <ebean-version>13.6.5</ebean-version>-->
   </properties>
 
   <dependencies>
@@ -27,14 +30,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>12.11.1</version>
+      <version>${ebean-version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>8.0.28</version>
     </dependency>
 
     <!-- java annotation processor to generate query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.11.1</version>
+      <version>${ebean-version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -43,7 +52,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.11.1</version>
+      <version>${ebean-version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -75,7 +84,7 @@
         <configuration>
           <tiles>
             <tile>org.avaje.tile:java-compile:11</tile>
-            <tile>io.ebean.tile:enhancement:12.11.1</tile>
+            <tile>io.ebean.tile:enhancement:${ebean-version}</tile>
           </tiles>
         </configuration>
       </plugin>

src/main/java/org/example/domain/Environment.java

@@ -0,0 +1,34 @@
+package org.example.domain;
+
+import java.util.UUID;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import io.ebean.Model;
+import io.ebean.annotation.SoftDelete;
+
+@Entity
+public class Environment extends Model {
+  @Id
+  private UUID id;
+
+  @SoftDelete
+  private boolean deleted;
+
+  private String name;
+
+  public Environment(String name, boolean deleted) {
+    this.id = UUID.randomUUID();
+    this.name = name;
+    this.deleted = deleted;
+  }
+
+  public UUID getId() {
+    return id;
+  }
+
+  public String getName() {
+    return name;
+  }
+}

src/main/java/org/example/domain/ServiceAccount.java

@@ -0,0 +1,45 @@
+package org.example.domain;
+
+import java.util.UUID;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+
+import io.ebean.Model;
+import io.ebean.annotation.SoftDelete;
+
+@Entity
+public class ServiceAccount extends Model {
+  @Id
+  private UUID id;
+
+  @ManyToOne(cascade = CascadeType.REMOVE)
+  private Environment environment;
+
+  @SoftDelete
+  private boolean deleted;
+
+  private String name;
+
+  public ServiceAccount(String name, Environment environment, boolean deleted) {
+    this.id = UUID.randomUUID();
+    this.name = name;
+    this.environment = environment;
+    this.deleted = deleted;
+  }
+
+  public UUID getId() {
+    return id;
+  }
+
+  public Environment getEnvironment() {
+    return environment;
+  }
+
+  public String getName() {
+    return name;
+  }
+}

src/main/java/org/example/domain/UsageRaw.java

@@ -0,0 +1,39 @@
+package org.example.domain;
+
+import java.util.UUID;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import io.ebean.Model;
+
+@Entity
+public class UsageRaw extends Model {
+  @Id
+  private UUID id;
+
+  @ManyToOne(cascade = CascadeType.REMOVE)
+  private ServiceAccount serviceAccount;
+
+  private String name;
+
+  public UsageRaw(String name, ServiceAccount serviceAccount) {
+    this.id = UUID.randomUUID();
+    this.name = name;
+    this.serviceAccount = serviceAccount;
+  }
+
+  public UUID getId() {
+    return id;
+  }
+
+  public ServiceAccount getServiceAccount() {
+    return serviceAccount;
+  }
+
+  public String getName() {
+    return name;
+  }
+}

src/main/resources/dbmigration/1.1_create_tables.xml

@@ -0,0 +1,26 @@
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<migration xmlns="http://ebean-orm.github.io/xml/ns/dbmigration">
+  <changeSet type="apply">
+
+    <createTable name="usage_raw">
+      <column name="id" type="varchar" primaryKey="true" notnull="true"/>
+      <column name="serviceAccount" type="varchar"/>
+      <column name="name" type="varchar"/>
+    </createTable>
+
+    <createTable name="service_account">
+      <column name="id" type="varchar" primaryKey="true" notnull="true"/>
+      <column name="name" type="varchar"/>
+      <column name="environment" type="varchar"/>
+      <column name="deleted" type="boolean"/>
+    </createTable>
+
+    <createTable name="environment">
+      <column name="id" type="varchar" primaryKey="true" notnull="true"/>
+      <column name="name" type="varchar"/>
+      <column name="deleted" type="boolean"/>
+    </createTable>
+
+  </changeSet>
+</migration>

src/test/java/main/MainDbMigration.java

@@ -18,7 +18,7 @@ public static void main(String[] args) throws Exception {
     //System.setProperty("ddl.migration.pendingDropsFor", "1.1");
 
     DbMigration dbMigration = DbMigration.create();
-    dbMigration.setPlatform(Platform.POSTGRES);
+    dbMigration.setPlatform(Platform.MYSQL);
     // generate the migration ddl and xml
     dbMigration.generateMigration();
   }