Merge branch 'tmp2' into ebean-new

ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java

@@ -6,6 +6,7 @@ import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TWithPreInsert;
 import org.tests.model.basic.TWithPreInsertChild;
+import org.tests.model.basic.event.TWithPreInsertPersistAdapter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -27,6 +28,7 @@ class TestPreInsertValidation extends BaseTestCase {
     assertThat(e.requestCascadeState()).isEqualTo(2);
 
     TWithPreInsert e1 = DB.find(TWithPreInsert.class, e.getId());
+    assert e1 != null;
 
     e1.setTitle("Missus");
     DB.save(e1);
@@ -54,11 +56,21 @@ class TestPreInsertValidation extends BaseTestCase {
     assert e1 != null;
 
     e1.setTitle("ParentCascading-changed");
-    e1.children().get(0).setName("Child0-changed");
+    TWithPreInsertChild childBean = e1.children().get(0);
+    childBean.setName("Child0-changed");
     DB.save(e1);
 
     assertThat(e1.requestCascadeState()).isEqualTo(12);
-    assertThat(e1.children().get(0).requestCascadeState()).isEqualTo(11);
+    assertThat(childBean.requestCascadeState()).isEqualTo(11);
+
+    DB.delete(e1);
+
+    assertThat(e1.requestCascadeState()).isEqualTo(22);
+
+    // assert that isCascade() was true for the child bean
+    assertThat(TWithPreInsertPersistAdapter.cascadeDelete).hasSize(1);
+    String deleteCascade = TWithPreInsertPersistAdapter.cascadeDelete.get(0);
+    assertThat(deleteCascade).isEqualTo("class org.tests.model.basic.TWithPreInsertChild:1");
   }
 
   @Test

ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java

@@ -14,6 +14,8 @@ import org.tests.idkeys.db.GenKeySeqB;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -24,6 +26,7 @@ public class TestGeneratedKeys extends BaseTestCase {
   @ForPlatform(Platform.H2) // readSequenceValue is H2 specific
   public void testGenKeySeqA() throws SQLException {
     assumeTrue(idType() == IdType.SEQUENCE);
+    
     SpiEbeanServer server = spiEbeanServer();
 
     try (Transaction tx = server.beginTransaction()) {
@@ -69,20 +72,34 @@ public class TestGeneratedKeys extends BaseTestCase {
   }
 
   private long readSequenceValue(Transaction tx, String sequence) throws SQLException {
-    Statement stm = null;
-    try {
-      stm = tx.connection().createStatement();
-      ResultSet rs = stm.executeQuery("select currval('" + sequence + "')");
-      rs.next();
+    String sql;
+    switch (spiEbeanServer().databasePlatform().getPlatform().base()) {
+      case H2 :
+        sql = "select currval('" + sequence + "')";
+        break;
 
+      case DB2 :
+        sql = "values previous value for " + sequence;
+
+        break;
+      case SQLSERVER :
+        sql = "select current_value from sys.sequences where name = '" + sequence + "'";
+        break;
+
+      case MARIADB :
+        throw new UnsupportedOperationException("reading sequence value outside of the current connection is not supported. "
+            + "See https://mariadb.com/kb/en/previous-value-for-sequence_name/#description");
+        
+      default :
+        throw new UnsupportedOperationException("reading sequence value from "
+            + spiEbeanServer().databasePlatform().getPlatform()
+            + " is not supported.");
+
+    }
+    try (Statement stm = tx.connection().createStatement()) {
+      ResultSet rs = stm.executeQuery(sql);
+      rs.next();
       return rs.getLong(1);
-    } finally {
-      if (stm != null) {
-        try {
-          stm.close();
-        } catch (SQLException e) {
-        }
-      }
     }
   }
 
@@ -109,5 +126,25 @@ public class TestGeneratedKeys extends BaseTestCase {
       assertNotNull(al.getId());
     }
   }
+  
+  @Test
+  @ForPlatform({Platform.H2, Platform.MARIADB, Platform.SQLSERVER, Platform.DB2})
+  public void testGeneratedKeys() throws SQLException {
+    assumeTrue(idType() == IdType.SEQUENCE);
+
+    SpiEbeanServer server = spiEbeanServer();
+    List<Long> idList = new ArrayList<>(52);
+
+    try (Transaction tx = server.beginTransaction()) {
+      // bigger than increment
+      for (int i = 1; i < 52; i++) {
+        GenKeySeqA gks = new GenKeySeqA();
+        gks.setDescription("my description " + i);
+        server.save(gks);
+        assertFalse(idList.contains(gks.getId()));
+        idList.add(gks.getId());
+      }
+    }
+  }
 
 }

ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-import static javax.persistence.CascadeType.PERSIST;
+import static javax.persistence.CascadeType.ALL;
 
 @Entity
 public class TWithPreInsert implements TWithPreInsertCommon {
@@ -20,7 +20,7 @@ public class TWithPreInsert implements TWithPreInsertCommon {
 
   private String title;
 
-  @OneToMany(cascade = PERSIST)
+  @OneToMany(cascade = ALL)
   private List<TWithPreInsertChild> children = new ArrayList<>();
 
   /**

ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java

@@ -2,6 +2,8 @@ package org.tests.model.basic;
 
 public interface TWithPreInsertCommon {
 
+  Integer getId();
+
   String getName();
 
   void setName(String name);

ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java

@@ -4,8 +4,13 @@ import io.ebean.event.BeanPersistAdapter;
 import io.ebean.event.BeanPersistRequest;
 import org.tests.model.basic.TWithPreInsertCommon;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TWithPreInsertPersistAdapter extends BeanPersistAdapter {
 
+  public static List<String> cascadeDelete = new ArrayList<>();
+
   @Override
   public boolean isRegisterFor(Class<?> cls) {
     return TWithPreInsertCommon.class.isAssignableFrom(cls);
@@ -32,4 +37,14 @@ public class TWithPreInsertPersistAdapter extends BeanPersistAdapter {
     return super.preUpdate(request);
   }
 
+  @Override
+  public boolean preDelete(BeanPersistRequest<?> request) {
+    TWithPreInsertCommon bean = (TWithPreInsertCommon) request.bean();
+    if (request.isCascade()) {
+      cascadeDelete.add(bean.getClass() + ":" + bean.getId());
+    } else {
+      bean.requestCascadeState(22);
+    }
+    return true;
+  }
 }

ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java

@@ -10,6 +10,7 @@ import org.tests.model.basic.ResetBasicData;
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
+import java.util.Locale;
 
 public class TestCsvReader extends TransactionalTestCase {
 
@@ -32,7 +33,7 @@ public class TestCsvReader extends TransactionalTestCase {
       // csvReader.addProperty("id");
       csvReader.addProperty("status");
       csvReader.addProperty("name");
-      csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
+      csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
       csvReader.addProperty("billingAddress.line1");
       csvReader.addProperty("billingAddress.city");
       csvReader.addProperty("billingAddress.country.code");

ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java

@@ -10,6 +10,7 @@ import org.tests.model.basic.Customer;
 import java.io.File;
 import java.io.FileReader;
 import java.net.URL;
+import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,7 +33,7 @@ public class TestCsvReaderWithCallback extends TransactionalTestCase {
     // csvReader.addProperty("id");
     csvReader.addProperty("status");
     csvReader.addProperty("name");
-    csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
+    csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
     csvReader.addProperty("billingAddress.line1");
     csvReader.addProperty("billingAddress.city");
     // processor.addReference("billingAddress.country.code");