start. It will call the visitor for each dirty bean that would
+ * be saved with {@link #save(Object)} or {@link #saveAll(Collection)}. You can
+ * use this method to implement custom validations.
+ *
+ * @param start could be a bean, a list of beans or a map of beans.
+ * @param visitor the visitor
+ */
+ public static void visitSave(Object start, PersistVisitor visitor) {
+ getDefault().visitSave(start, visitor);
+ }
/**
* This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 6dd0ab3cfa..6a8cc2d82e 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -843,6 +843,17 @@ public interface Database {
*/
int saveAll(Object... beans) throws OptimisticLockException;
+ /**
+ * This will visit all beans in the persist graph on a given object
+ * start. It will call the visitor for each dirty bean that would
+ * be saved with {@link #save(Object)} or {@link #saveAll(Collection)}. You can
+ * use this method to implement custom validations.
+ *
+ * @param start could be a bean, a list of beans or a map of beans.
+ * @param visitor the visitor
+ */
+ void visitSave(Object start, PersistVisitor visitor);
+
/**
* Delete the bean.
* @@ -1509,4 +1520,8 @@ public interface Database { */ void truncate(Class... beanTypes); + /** + * RunDdl manually. This can be used if 'db.ddl.run=false' is set and you plan to run DDL manually. + */ + void runDdl(); } diff --git a/ebean-api/src/main/java/io/ebean/PersistVisitor.java b/ebean-api/src/main/java/io/ebean/PersistVisitor.java new file mode 100644 index 0000000000..b5f1398d09 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/PersistVisitor.java @@ -0,0 +1,29 @@ +package io.ebean; + +import java.util.Collection; +import java.util.Map; + +import io.ebean.bean.EntityBean; +import io.ebean.plugin.Property; + +@FunctionalInterface +public interface PersistVisitor { + + PersistVisitor visitBean(EntityBean bean); + + default PersistVisitor visitProperty(Property prop) { + return this; + }; + + default PersistVisitor visitCollection(Collection collection) { + return this; + }; + + default PersistVisitor visitMap(Map map) { + return this; + }; + + default void visitEnd() { + } + +} diff --git a/ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java new file mode 100644 index 0000000000..ee312bb72c --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityImplements.java @@ -0,0 +1,21 @@ +package io.ebean.annotation.ext; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation to define a list of interface for which this entity is target for. + * @author Roland Praml, FOCONIS AG + */ +@Documented +@Target({ FIELD, TYPE }) +@Retention(RUNTIME) +public @interface EntityImplements { + + Class[] value(); + +} diff --git a/ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java new file mode 100644 index 0000000000..2c166812a3 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/annotation/ext/EntityOverride.java @@ -0,0 +1,24 @@ +package io.ebean.annotation.ext; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Annotation to define that an entity overrides the parent entity. + * @author Roland Praml, FOCONIS AG + */ +@Documented +@Target({ FIELD, TYPE }) +@Retention(RUNTIME) +public @interface EntityOverride { + + /** + * The priority of the statement. Lower priority wins. + */ + int priority() default 0; + +} diff --git a/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java b/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java new file mode 100644 index 0000000000..5749549fb9 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java @@ -0,0 +1,29 @@ +package io.ebean.annotation.ext; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Annotation to define a factory for an intersection model. This class MUST have a constructor or factory method with two parameters that accepts parent and property type. + * @author Roland Praml, FOCONIS AG + */ +@Documented +@Target({ FIELD, TYPE }) +@Retention(RUNTIME) +public @interface IntersectionFactory { + + /** + * The intersection model class. + */ + Class value(); + + /** + * An optional factory method. + */ + String factoryMethod() default ""; +} diff --git a/ebean-api/src/main/java/io/ebean/annotation/ext/package.html b/ebean-api/src/main/java/io/ebean/annotation/ext/package.html new file mode 100644 index 0000000000..9505c002ca --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/annotation/ext/package.html @@ -0,0 +1,8 @@ + +
+* For example, put IgniteConfiguration in to be passed to the Ignite plugin. */ @@ -623,6 +635,28 @@ public void putServiceObject(String key, Object configObject) { serviceObject.put(key, configObject); } + /** + * Put a service object into configuration such that it can be used by ebean or a plugin. + *
+ * For example, put IgniteConfiguration in to be passed to the Ignite plugin. + * You can also override some SPI objects that should be used for that Database. Currently, the following + * objects are possible. + *
{@code
*
@@ -656,7 +690,7 @@ private String serviceObjectKey(Class cls) {
}
/**
- * Used by plugins to obtain service objects.
+ * Used by ebean or plugins to obtain service objects.
*
* {@code
*
@@ -2691,6 +2725,17 @@ public List getServerConfigStartupListeners() {
return configStartupListeners;
}
+ /**
+ * Add a CustomDeployParser.
+ */
+ public void addCustomDeployParser(CustomDeployParser customDeployParser) {
+ customDeployParsers.add(customDeployParser);
+ }
+
+ public List getCustomDeployParsers() {
+ return customDeployParsers;
+ }
+
/**
* Register all the BeanPersistListener instances.
*
diff --git a/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java
new file mode 100644
index 0000000000..ad257c98ee
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java
@@ -0,0 +1,68 @@
+package io.ebean.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * TempFileProvider implementation, which deletes all temp files on shutdown.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class DeleteOnShutdownTempFileProvider implements TempFileProvider {
+
+ private static final Logger logger = LoggerFactory.getLogger(DeleteOnShutdownTempFileProvider.class);
+
+ List tempFiles = new ArrayList<>();
+ private final String prefix;
+ private final String suffix;
+ private final File directory;
+
+ /**
+ * Creates the TempFileProvider with default prefix "db-".
+ */
+ public DeleteOnShutdownTempFileProvider() {
+ this("db-", null, null);
+ }
+
+ /**
+ * Creates the TempFileProvider.
+ */
+ public DeleteOnShutdownTempFileProvider(String prefix, String suffix, File directory) {
+ this.prefix = prefix;
+ this.suffix = suffix;
+ this.directory = directory;
+ }
+
+ @Override
+ public File createTempFile() throws IOException {
+ File file = File.createTempFile(prefix, suffix, directory);
+ synchronized (tempFiles) {
+ tempFiles.add(file.getAbsolutePath());
+ }
+ return file;
+ }
+
+ /**
+ * Deletes all created files on shutdown.
+ */
+ @Override
+ public void shutdown() {
+ synchronized (tempFiles) {
+ for (String path : tempFiles) {
+ if (new File(path).delete()) {
+ logger.trace("deleted {}", path);
+ } else {
+ logger.warn("could not delete {}", path);
+ }
+ }
+ tempFiles.clear();
+ }
+ }
+
+}
diff --git a/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java
new file mode 100644
index 0000000000..4658b46c28
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java
@@ -0,0 +1,23 @@
+package io.ebean.config;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Creates a temp file for the ScalarTypeFile datatype.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public interface TempFileProvider {
+
+ /**
+ * Creates a tempFile.
+ */
+ File createTempFile() throws IOException;
+
+ /**
+ * Shutdown the tempFileProvider.
+ */
+ void shutdown();
+}
diff --git a/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java
new file mode 100644
index 0000000000..aa3ae82905
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java
@@ -0,0 +1,145 @@
+package io.ebean.config;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * WeakRefTempFileProvider will delete the tempFile if all references to the returned File
+ * object are collected by the garbage collection.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class WeakRefTempFileProvider implements TempFileProvider {
+
+ private static final Logger logger = LoggerFactory.getLogger(WeakRefTempFileProvider.class);
+
+ private final ReferenceQueue tempFiles = new ReferenceQueue<>();
+
+ private WeakFileReference root;
+
+ private final String prefix;
+ private final String suffix;
+ private final File directory;
+
+ /**
+ * We hold a linkedList of weak references. So we can remove stale files in O(1)
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+ private static class WeakFileReference extends WeakReference {
+
+ String path;
+ WeakFileReference prev;
+ WeakFileReference next;
+
+ WeakFileReference(File referent, ReferenceQueue q) {
+ super(referent, q);
+ path = referent.getAbsolutePath();
+ }
+
+ boolean delete(boolean shutdown) {
+ File file = new File(path);
+ if (!file.exists()) {
+ logger.trace("already deleted {}", path);
+ return true;
+ } else if (file.delete()) {
+ logger.trace("deleted {}", path);
+ return true;
+ } else {
+ if (shutdown) {
+ logger.warn("could not delete {}", path);
+ } else {
+ logger.info("could not delete {} - will delete on shutdown", path);
+ }
+ return false;
+ }
+ }
+ }
+
+
+ /**
+ * Creates the TempFileProvider with default prefix "db-".
+ */
+ public WeakRefTempFileProvider() {
+ this("db-", null, null);
+ }
+
+ /**
+ * Creates the TempFileProvider.
+ */
+ public WeakRefTempFileProvider(String prefix, String suffix, File directory) {
+ this.prefix = prefix;
+ this.suffix = suffix;
+ this.directory = directory;
+ }
+
+ @Override
+ public File createTempFile() throws IOException {
+ File tempFile = File.createTempFile(prefix, suffix, directory);
+ logger.trace("createTempFile: {}", tempFile);
+ synchronized (this) {
+ add(new WeakFileReference(tempFile, tempFiles));
+ }
+ return tempFile;
+ }
+
+ /**
+ * Will delete stale files.
+ * This is public to use in tests.
+ */
+ public void deleteStaleTempFiles() {
+ synchronized (this) {
+ deleteStaleTempFilesInternal();
+ }
+ }
+
+ private void deleteStaleTempFilesInternal() {
+ WeakFileReference ref;
+ while ((ref = (WeakFileReference) tempFiles.poll()) != null) {
+ if (ref.delete(false)) {
+ remove(ref); // remove from linkedList only, if delete was successful.
+ }
+ }
+ }
+
+ private void add(WeakFileReference ref) {
+ deleteStaleTempFilesInternal();
+
+ if (root == null) {
+ root = ref;
+ } else {
+ ref.next = root;
+ root.prev = ref;
+ root = ref;
+ }
+ }
+
+ private void remove(WeakFileReference ref) {
+ if (ref.next != null) {
+ ref.next.prev = ref.prev;
+ }
+ if (ref.prev != null) {
+ ref.prev.next = ref.next;
+ } else {
+ root = ref.next;
+ }
+ }
+
+ /**
+ * Deletes all created files on shutdown.
+ */
+ @Override
+ public void shutdown() {
+ while (root != null) {
+ root.delete(true);
+ root = root.next;
+ }
+ }
+
+}
diff --git a/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java b/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java
new file mode 100644
index 0000000000..4c854f2f1e
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java
@@ -0,0 +1,15 @@
+package io.ebean.plugin;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+
+/**
+ * Fired after all beans are parsed. You may implement own parsers to handle custom annotations.
+ * (See test case for example)
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+@FunctionalInterface
+public interface CustomDeployParser {
+
+ void parse(DeployBeanDescriptorMeta descriptor, DatabasePlatform databasePlatform);
+}
diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java
new file mode 100644
index 0000000000..4347a5057c
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java
@@ -0,0 +1,36 @@
+package io.ebean.plugin;
+
+import java.util.Collection;
+
+/**
+ * General deployment information. This is used in {@link CustomDeployParser}.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public interface DeployBeanDescriptorMeta {
+
+ /**
+ * Return a collection of all BeanProperty deployment information.
+ */
+ public Collection propertiesAll();
+
+ /**
+ * Get a BeanProperty by its name.
+ */
+ public DeployBeanPropertyMeta getBeanProperty(String secondaryBeanName);
+
+ /**
+ * Return the DeployBeanDescriptorMeta for the given bean class.
+ */
+ public DeployBeanDescriptorMeta getDeployBeanDescriptorMeta(Class propertyType);
+
+ /**
+ * Returns the discriminator column, if any.
+ * @return
+ */
+ public String getDiscriminatorColumn();
+
+ public String getBaseTable();
+
+ DeployBeanPropertyMeta idProperty();
+}
diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java
new file mode 100644
index 0000000000..d7d1d637a3
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java
@@ -0,0 +1,23 @@
+package io.ebean.plugin;
+
+public interface DeployBeanPropertyAssocMeta extends DeployBeanPropertyMeta {
+
+ /**
+ * Return the mappedBy deployment attribute.
+ *
+ * This is the name of the property in the 'detail' bean that maps back to
+ * this 'master' bean.
+ *
+ */
+ String getMappedBy();
+
+ /**
+ * Return the base table for this association.
+ *
+ * This has the table name which is used to determine the relationship for
+ * this association.
+ *
+ */
+ String getBaseTable();
+
+}
diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java
new file mode 100644
index 0000000000..4ba2d3e2a1
--- /dev/null
+++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java
@@ -0,0 +1,37 @@
+package io.ebean.plugin;
+
+import java.lang.reflect.Field;
+
+public interface DeployBeanPropertyMeta {
+
+ /**
+ * Return the name of the property.
+ */
+ String getName();
+
+ /**
+ * The database column name this is mapped to.
+ */
+ String getDbColumn();
+
+ /**
+ * Return the bean Field associated with this property.
+ */
+ Field getField();
+
+ /**
+ * The property is based on a formula.
+ */
+ void setSqlFormula(String sqlSelect, String sqlJoin);
+
+ /**
+ * Return the bean type.
+ */
+ Class getOwningType();
+
+ /**
+ * Return the property type.
+ */
+ Class getPropertyType();
+
+}
diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java
index a8fb4ea387..9349bd8882 100644
--- a/ebean-api/src/main/java/module-info.java
+++ b/ebean-api/src/main/java/module-info.java
@@ -41,5 +41,5 @@
exports io.ebean.text;
exports io.ebean.text.json;
exports io.ebean.util;
-
+ exports io.ebean.annotation.ext;
}
diff --git a/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java b/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java
new file mode 100644
index 0000000000..dc69cc6876
--- /dev/null
+++ b/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java
@@ -0,0 +1,171 @@
+package io.ebean;
+
+
+import io.ebean.config.WeakRefTempFileProvider;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.channels.FileLock;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for the WeakRefTempFileProvider. (Note: this test relies on an aggressive garbage collection.
+ * if GC implementation will change, the test may fail)
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public class TestWeakRefTempFileProvider {
+
+ WeakRefTempFileProvider prov = new WeakRefTempFileProvider();
+
+ @AfterEach
+ public void shutdown() {
+ prov.shutdown();
+ }
+
+ /**
+ * Run the garbage collection and delete stale files.
+ */
+ private void gc() throws InterruptedException {
+ System.gc();
+ Thread.sleep(100);
+ prov.deleteStaleTempFiles();
+ }
+
+ @Test
+ public void testStaleEntries() throws Exception {
+ File tempFile = prov.createTempFile();
+ String fileName = tempFile.getAbsolutePath();
+
+ gc();
+
+ assertThat(new File(fileName)).exists();
+
+ tempFile = null; // give up reference
+
+ gc();
+
+ assertThat(new File(fileName)).doesNotExist();
+
+
+ }
+
+ @Test
+ public void testLinkedListForward() throws Exception {
+ File tempFile1 = prov.createTempFile();
+ String fileName1 = tempFile1.getAbsolutePath();
+ File tempFile2 = prov.createTempFile();
+ String fileName2 = tempFile2.getAbsolutePath();
+ File tempFile3 = prov.createTempFile();
+ String fileName3 = tempFile3.getAbsolutePath();
+
+ assertThat(new File(fileName1)).exists();
+ assertThat(new File(fileName2)).exists();
+ assertThat(new File(fileName3)).exists();
+
+ gc();
+
+ // give up first ref
+ tempFile1 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).doesNotExist();
+ assertThat(new File(fileName2)).exists();
+ assertThat(new File(fileName3)).exists();
+
+ // give up second ref
+ tempFile2 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).doesNotExist();
+ assertThat(new File(fileName2)).doesNotExist();
+ assertThat(new File(fileName3)).exists();
+
+ // give up third ref
+ tempFile3 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).doesNotExist();
+ assertThat(new File(fileName2)).doesNotExist();
+ assertThat(new File(fileName3)).doesNotExist();
+
+ }
+
+
+ @Test
+ public void testLinkedListReverse() throws Exception {
+ File tempFile1 = prov.createTempFile();
+ String fileName1 = tempFile1.getAbsolutePath();
+ File tempFile2 = prov.createTempFile();
+ String fileName2 = tempFile2.getAbsolutePath();
+ File tempFile3 = prov.createTempFile();
+ String fileName3 = tempFile3.getAbsolutePath();
+
+ assertThat(new File(fileName1)).exists();
+ assertThat(new File(fileName2)).exists();
+ assertThat(new File(fileName3)).exists();
+
+ gc();
+
+ // give up third ref
+ tempFile3 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).exists();
+ assertThat(new File(fileName2)).exists();
+ assertThat(new File(fileName3)).doesNotExist();
+
+ // give up second ref
+ tempFile2 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).exists();
+ assertThat(new File(fileName2)).doesNotExist();
+ assertThat(new File(fileName3)).doesNotExist();
+
+ // give up first ref
+ tempFile1 = null;
+
+ gc();
+
+ assertThat(new File(fileName1)).doesNotExist();
+ assertThat(new File(fileName2)).doesNotExist();
+ assertThat(new File(fileName3)).doesNotExist();
+
+ }
+
+ @Test
+ @Disabled("Runs on Windows only")
+ public void testFileLocked() throws Exception {
+ File tempFile = prov.createTempFile();
+ String fileName = tempFile.getAbsolutePath();
+
+ try (FileOutputStream os = new FileOutputStream(fileName)) {
+ FileLock lock = os.getChannel().lock();
+ try {
+ os.write(42);
+
+ tempFile = null;
+ gc();
+ } finally {
+ lock.release();
+ }
+
+ }
+
+ assertThat(new File(fileName)).exists();
+
+ prov.shutdown();
+
+ assertThat(new File(fileName)).doesNotExist();
+ }
+}
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 90d0597124..fde3907e39 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -13,8 +13,8 @@
- scm:git:git@github.com:ebean-orm/ebean.git
- HEAD
+ scm:git:git@github.com:FOCONIS/ebean.git
+ ebean-parent-13.6.4-FOC1
ebean autotune
@@ -26,7 +26,7 @@
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
@@ -55,7 +55,7 @@
io.ebean
ebean-platform-h2
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 618e44ba02..dfa25d283a 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean bom
@@ -89,106 +89,106 @@
io.ebean
ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-joda-time
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-jackson-jsonnode
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-jackson-mapper
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-ddl-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-externalmapping-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-externalmapping-xml
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-autotune
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-querybean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
querybean-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
kotlin-querybean-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-postgis
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-redis
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 866d3ec569..8b5a7b6eee 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-core-type
@@ -16,7 +16,7 @@
io.ebean
ebean-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index ac73b3c697..86a115b5d4 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-core
@@ -14,15 +14,15 @@
https://ebean.io/
- scm:git:git@github.com:ebean-orm/ebean.git
- HEAD
+ scm:git:git@github.com:FOCONIS/ebean.git
+ ebean-parent-13.6.4-FOC1
io.ebean
ebean-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -37,6 +37,12 @@
7.1
+
+ io.ebean
+ ebean-api
+ 13.10.1-FOC4-SNAPSHOT
+
+
io.ebean
ebean-migration-auto
@@ -46,13 +52,13 @@
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-externalmapping-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -143,21 +149,21 @@
io.ebean
ebean-platform-h2
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-platform-postgres
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-platform-sqlserver
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java
index b3c4858139..d821e75b84 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java
@@ -12,4 +12,9 @@ public interface SpiDdlGenerator {
*/
void execute(boolean online);
+ /**
+ * Run DDL manually. This can be used to initialize multi tenant environments or if you plan not to run
+ * DDL on startup
+ */
+ void runDdl();
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index f15ab82ffc..ddafc8607e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -168,6 +168,7 @@ private BootupClasses bootupClasses(DatabaseConfig config) {
bootup.addPersistListeners(config.getPersistListeners());
bootup.addQueryAdapters(config.getQueryAdapters());
bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
+ bootup.addCustomDeployParser(config.getCustomDeployParsers());
bootup.addChangeLogInstances(config);
bootup.runServerConfigStartup(config);
return bootup;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2c604ed988..4f82437f7c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -79,6 +79,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
private final String serverName;
private final DatabasePlatform databasePlatform;
private final TransactionManager transactionManager;
+ private final TempFileProvider tempFileProvider;
private final QueryPlanManager queryPlanManager;
private final ExtraMetrics extraMetrics;
private final DataTimeZone dataTimeZone;
@@ -159,6 +160,7 @@ public DefaultServer(InternalConfiguration config, ServerCacheManager cache) {
this.metaInfoManager = new DefaultMetaInfoManager(this, this.config.getMetricNaming());
this.serverPlugins = config.getPlugins();
this.ddlGenerator = config.initDdlGenerator(this);
+ this.tempFileProvider = config.getConfig().getTempFileProvider();
this.scriptRunner = new DScriptRunner(this);
configureServerPlugins();
@@ -307,7 +309,10 @@ public void initialise() {
*/
public void start() {
if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) {
- final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+ AutoMigrationRunner migrationRunner = config.getServiceObject(AutoMigrationRunner.class);
+ if (migrationRunner == null) {
+ migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+ }
if (migrationRunner == null) {
throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");
}
@@ -388,6 +393,8 @@ private void shutdownInternal(boolean shutdownDataSource, boolean deregisterDriv
backgroundExecutor.shutdown();
// shutdown DataSource (if its an Ebean one)
transactionManager.shutdown(shutdownDataSource, deregisterDriver);
+
+ tempFileProvider.shutdown();
dumpMetrics();
shutdown = true;
if (shutdownDataSource) {
@@ -598,7 +605,11 @@ public void clearQueryStatistics() {
*/
@Override
public T createEntityBean(Class type) {
- return descriptor(type).createBean();
+ final BeanDescriptor desc = descriptor(type);
+ if (desc == null) {
+ throw new IllegalArgumentException("No bean type " + type.getName() + " registered");
+ }
+ return desc.createBean();
}
/**
@@ -1581,6 +1592,11 @@ public void save(Object bean, @Nullable Transaction transaction) {
persister.save(checkEntityBean(bean), transaction);
}
+ @Override
+ public void visitSave(Object start, PersistVisitor visitor) {
+ new VisitHandler(descriptorManager).visit(start, visitor);
+ }
+
@Override
public void markAsDirty(Object bean) {
if (!(bean instanceof EntityBean)) {
@@ -2249,4 +2265,9 @@ List queryPlanInit(QueryPlanInit initRequest) {
List queryPlanCollectNow(QueryPlanRequest request) {
return queryPlanManager.collect(request);
}
+
+ @Override
+ public void runDdl() {
+ ddlGenerator.runDdl();
+ }
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
index 3eb6dfe3a0..7dddf0d124 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
@@ -117,7 +117,10 @@ private DataSource create(DataSourceConfig dsConfig, boolean readOnly) {
* Attach DataSourceAlert via service loader if present.
*/
private void attachAlert(DataSourceConfig dsConfig) {
- DataSourceAlertFactory alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+ DataSourceAlertFactory alertFactory = config.getServiceObject(DataSourceAlertFactory.class);
+ if (alertFactory == null) {
+ alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+ }
if (alertFactory != null) {
dsConfig.setAlert(alertFactory.createAlert());
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index bce1339783..b31b6ed44a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -4,10 +4,7 @@
import io.ebean.ExpressionFactory;
import io.ebean.annotation.Platform;
import io.ebean.cache.*;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.ExternalTransactionManager;
-import io.ebean.config.ProfilingConfig;
-import io.ebean.config.SlowQueryListener;
+import io.ebean.config.*;
import io.ebean.config.dbplatform.DatabasePlatform;
import io.ebean.config.dbplatform.DbHistorySupport;
import io.ebean.event.changelog.ChangeLogListener;
@@ -37,6 +34,7 @@
import io.ebeaninternal.server.expression.DefaultExpressionFactory;
import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
+import io.ebeaninternal.server.json.DJsonContext;
import io.ebeaninternal.server.logger.DLogManager;
import io.ebeaninternal.server.logger.DLoggerFactory;
import io.ebeaninternal.server.persist.Binder;
@@ -46,7 +44,6 @@
import io.ebeaninternal.server.query.*;
import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
-import io.ebeaninternal.server.json.DJsonContext;
import io.ebeaninternal.server.transaction.*;
import io.ebeaninternal.server.type.DefaultTypeManager;
import io.ebeaninternal.server.type.TypeManager;
@@ -76,6 +73,7 @@ public final class InternalConfiguration {
private final DatabasePlatform databasePlatform;
private final DeployInherit deployInherit;
private final TypeManager typeManager;
+ private final TempFileProvider tempFileProvider;
private final DtoBeanManager dtoBeanManager;
private final ClockService clockService;
private final DataTimeZone dataTimeZone;
@@ -116,6 +114,7 @@ public final class InternalConfiguration {
this.databasePlatform = config.getDatabasePlatform();
this.expressionFactory = initExpressionFactory(config);
this.typeManager = new DefaultTypeManager(config, bootupClasses);
+ this.tempFileProvider = config.getTempFileProvider();
this.multiValueBind = createMultiValueBind(databasePlatform.platform());
this.deployInherit = new DeployInherit(bootupClasses);
this.deployCreateProperties = new DeployCreateProperties(typeManager);
@@ -144,7 +143,12 @@ private InternalConfigXmlMap initExternalMapping() {
}
private S service(Class cls) {
- return ServiceUtil.service(cls);
+ S service = config.getServiceObject(cls);
+ if (service != null) {
+ return service;
+ } else {
+ return ServiceUtil.service(cls);
+ }
}
private List readExternalMapping() {
@@ -512,6 +516,10 @@ SpiLogManager getLogManager() {
return logManager;
}
+ public TempFileProvider getTempFileProvider() {
+ return tempFileProvider;
+ }
+
private ServerCachePlugin initServerCachePlugin() {
if (config.isLocalOnlyL2Cache()) {
localL2Caching = true;
@@ -591,6 +599,8 @@ QueryPlanLogger queryPlanLogger(Platform platform) {
return new QueryPlanLoggerSqlServer();
case ORACLE:
return new QueryPlanLoggerOracle();
+ case DB2:
+ return new QueryPlanLoggerDb2();
default:
return new QueryPlanLoggerExplain();
}
@@ -611,6 +621,11 @@ private static class NoopDdl implements SpiDdlGenerator {
this.ddlRun = ddlRun;
}
+ @Override
+ public void runDdl() {
+ CoreLog.log.log(ERROR, "Manual DDL run not possible");
+ }
+
@Override
public void execute(boolean online) {
if (online && ddlRun) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index 0391582009..1743929189 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -121,7 +121,7 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ
Map findMap();
/**
- * Execute the findSingleAttributeList query.
+ * Execute the findSingleAttributeCollection query.
*/
> A findSingleAttributeCollection(A collection);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/VisitHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/VisitHandler.java
new file mode 100644
index 0000000000..fe267898c9
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/VisitHandler.java
@@ -0,0 +1,128 @@
+package io.ebeaninternal.server.core;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import io.ebean.PersistVisitor;
+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.BeanDescriptorManager;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+
+/**
+ * Handler to process persist graphs. It will allow you to visit a persist
+ * action (insert/update) and get information about all beans that will be
+ * affected by that action. This allows you to do validation and other things on
+ * a set of beans.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+class VisitHandler {
+
+ private final Set
*/
+ @Override
public String getMappedBy() {
return mappedBy;
}
@@ -173,4 +175,9 @@ public void setFetchPreference(int fetchPreference) {
public void setTargetType(Class targetType) {
this.targetType = (Class)targetType;
}
+
+ @Override
+ public String getBaseTable() {
+ return getBeanTable().getBaseTable();
+ }
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
index c201308e2d..45f61b77ee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java
@@ -2,6 +2,7 @@
import io.ebean.bean.BeanCollection.ModifyListenMode;
import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.deploy.IntersectionFactoryHelp;
import io.ebeaninternal.server.deploy.ManyType;
import io.ebeaninternal.server.deploy.TableJoin;
import io.ebeaninternal.server.type.TypeReflectHelper;
@@ -32,6 +33,12 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc {
* Join for manyToMany intersection table.
*/
private DeployTableJoin intersectionJoin;
+
+ /**
+ * Factory to create intersection beans (instead of rows). For managed intersections.
+ */
+ private IntersectionFactoryHelp intersectionFactory;
+
/**
* For ManyToMany this is the Inverse join used to build reference queries.
*/
@@ -113,6 +120,10 @@ public TableJoin createIntersectionTableJoin() {
}
}
+ public boolean isTableManaged() {
+ return intersectionJoin != null && desc.isTableManaged(intersectionJoin.getTable());
+ }
+
/**
* Create the immutable version of the inverse join.
*/
@@ -149,6 +160,20 @@ public void setInverseJoin(DeployTableJoin inverseJoin) {
this.inverseJoin = inverseJoin;
}
+ /**
+ * Return the intersection factory.
+ */
+ public IntersectionFactoryHelp getIntersectionFactory() {
+ return intersectionFactory;
+ }
+
+ /**
+ * Sets the intersection factory.
+ */
+ public void setIntersectionFactory(IntersectionFactoryHelp intersectionFactory) {
+ this.intersectionFactory = intersectionFactory;
+ }
+
/**
* Return the order by clause used to order the fetching of the data for
* this list, set or map.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 0d29c3ba41..586164ffd0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -4,15 +4,13 @@
import io.ebean.annotation.FetchPreference;
import io.ebean.annotation.HistoryExclude;
import io.ebean.annotation.Where;
+import io.ebean.annotation.ext.IntersectionFactory;
import io.ebean.bean.BeanCollection.ModifyListenMode;
import io.ebean.config.NamingConvention;
import io.ebean.config.TableName;
import io.ebean.core.type.ScalarType;
import io.ebean.util.CamelCaseHelper;
-import io.ebeaninternal.server.deploy.BeanDescriptorManager;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanTable;
-import io.ebeaninternal.server.deploy.PropertyForeignKey;
+import io.ebeaninternal.server.deploy.*;
import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
@@ -128,6 +126,11 @@ private void read(DeployBeanPropertyAssocMany prop) {
prop.getTableJoin().addJoinColumn(util, true, joinColumns, beanTable);
}
+ IntersectionFactory intersectionFactory = get(prop, IntersectionFactory.class);
+ if (intersectionFactory != null) {
+ readIntersectionFactory(prop, intersectionFactory);
+ }
+
JoinTable joinTable = get(prop, JoinTable.class);
if (joinTable != null) {
if (prop.isManyToMany()) {
@@ -165,6 +168,12 @@ private void read(DeployBeanPropertyAssocMany prop) {
}
}
+ private void readIntersectionFactory(DeployBeanPropertyAssocMany prop, IntersectionFactory factory) {
+ Class leftSide = descriptor.getBeanType();
+ Class rightSide = prop.getPropertyType();
+ prop.setIntersectionFactory(new IntersectionFactoryHelp(factory.value(), leftSide, rightSide, factory.factoryMethod()));
+ }
+
private void checkSelfManyToMany(DeployBeanPropertyAssocMany prop) {
if (prop.getTargetType().equals(descriptor.getBeanType())) {
throw new IllegalStateException("@ManyToMany mapping for " + prop.getFullBeanName() + " requires explicit @JoinTable with joinColumns & inverseJoinColumns. Refer issue #2157");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 598962fcfd..7424f4d1e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -122,7 +122,7 @@ private void readAssocOne(DeployBeanPropertyAssocOne prop) {
}
}
- prop.setJoinType(prop.isNullable());
+ prop.setJoinType(prop.isNullable() || prop.getForeignKey() != null && prop.getForeignKey().isNoConstraint());
if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 662b73be80..68087e4261 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -2,7 +2,10 @@
import io.ebean.annotation.Index;
import io.ebean.annotation.*;
+import io.ebean.annotation.ext.EntityImplements;
+import io.ebean.annotation.ext.EntityOverride;
import io.ebean.config.TableName;
+import io.ebean.util.AnnotationUtil;
import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
import io.ebeaninternal.server.deploy.IndexDefinition;
@@ -12,6 +15,7 @@
import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
import javax.persistence.*;
+import java.util.Set;
import static io.ebean.util.AnnotationUtil.typeGet;
import static java.lang.System.Logger.Level.ERROR;
@@ -68,7 +72,7 @@ public void parse() {
*/
private void setTableName() {
if (descriptor.isBaseTableType()) {
- Class beanType = descriptor.getBeanType();
+ Class beanType = descriptor.getBaseBeanType();
InheritInfo inheritInfo = descriptor.getInheritInfo();
if (inheritInfo != null) {
beanType = inheritInfo.getRoot().getType();
@@ -184,6 +188,18 @@ private void read(Class cls) {
for (NamedQuery namedQuery : annotationClassNamedQuery(cls)) {
descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
}
+
+ Set entityImplements = AnnotationUtil.typeGetAll(cls, EntityImplements.class);
+ for (EntityImplements ann : entityImplements) {
+ for (Class iface : ann.value()) {
+ descriptor.addInterface(iface);
+ }
+ }
+
+ EntityOverride entityOverride = AnnotationUtil.typeGet(cls, EntityOverride.class);
+ if (entityOverride != null) {
+ descriptor.setOverridePriority(entityOverride.priority());
+ }
}
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
index 21e34a8b3a..adbf5e0824 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -106,7 +106,7 @@ public UUID nextId(Transaction t) {
delta = current - last;
if (delta < -10000 * 20000) {
- log.log(INFO, "Clock skew of {} ms detected", delta / -10000);
+ log.log(INFO, "Clock skew of {0} ms detected", delta / -10000);
// The clock was adjusted back about 2 seconds, or we were generating a lot of ids too fast
// if so, we try to set the current as last and also increment the clockSeq.
lock.lock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
index 39e03eb95e..f8a3574cad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
@@ -506,6 +506,9 @@ private boolean isIncludeProperty(BeanProperty prop) {
return true;
if (currentIncludeProps != null) {
// explicitly controlled by pathProperties
+ if (prop.isId() && currentIncludeProps.contains("${identifier}")) {
+ return true;
+ }
return currentIncludeProps.contains(prop.name());
} else {
// include only loaded properties
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index f78e11ea83..7a27c3946b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -915,7 +915,7 @@ void deleteManyIntersection(EntityBean bean, BeanPropertyAssocMany many, SpiT
private SpiSqlUpdate deleteAllIntersection(EntityBean bean, BeanPropertyAssocMany many, boolean publish) {
IntersectionRow intRow = many.buildManyToManyDeleteChildren(bean, publish);
- return intRow.createDeleteChildren(server);
+ return intRow.createDeleteChildren(server, many.extraWhere());
}
/**
@@ -939,7 +939,10 @@ private void deleteAssocMany(PersistRequestBean request) {
for (BeanPropertyAssocOne prop : expOnes) {
// for soft delete check cascade type also supports soft delete
if (deleteMode.isHard() || prop.isTargetSoftDelete()) {
- if (request.isLoadedProperty(prop)) {
+ if (prop.isPrimaryKeyExport()) {
+ // we can delete by id, neither if property loaded or not
+ delete(prop.targetDescriptor(), prop.descriptor().id(parentBean), null, t, deleteMode);
+ } else if (request.isLoadedProperty(prop)) {
Object detailBean = prop.getValue(parentBean);
if (detailBean != null) {
deleteRecurse((EntityBean) detailBean, t, deleteMode);
@@ -1009,7 +1012,7 @@ void deleteManyDetails(SpiTransaction t, BeanDescriptor desc, EntityBean pare
if (targetDesc.isDeleteByStatement()) {
// Just delete all the children with one statement
IntersectionRow intRow = many.buildManyDeleteChildren(parentBean, excludeDetailIds);
- SqlUpdate sqlDelete = intRow.createDelete(server, deleteMode);
+ SqlUpdate sqlDelete = intRow.createDelete(server, deleteMode, many.extraWhere());
executeSqlUpdate(sqlDelete, t);
} else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 5b6858e784..7752245510 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -6,18 +6,10 @@
import io.ebeaninternal.api.CoreLog;
import io.ebeaninternal.api.SpiSqlUpdate;
import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.deploy.BeanCollectionUtil;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.IntersectionRow;
+import io.ebeaninternal.server.deploy.*;
import javax.persistence.PersistenceException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
@@ -96,6 +88,22 @@ private boolean isSaveIntersection() {
// OneToMany JoinTable
return true;
}
+ if (many.isTableManaged()) {
+ List tables = new ArrayList<>(3);
+ tables.add(many.descriptor().baseTable());
+ tables.add(many.targetDescriptor().baseTable());
+ tables.add(many.intersectionTableJoin().getTable());
+ // put all tables in a deterministic order
+ tables.sort(Comparator.naturalOrder());
+
+ if (transaction.isSaveAssocManyIntersection(String.join("-", tables), many.descriptor().rootName())) {
+ // notify others, that we do save this transaction
+ transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName());
+ return true;
+ } else {
+ return false;
+ }
+ }
return transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName());
}
@@ -299,14 +307,16 @@ private void saveAssocManyIntersection(boolean queue) {
}
transaction.depth(+1);
+ boolean needsFlush = false;
if (deletions != null && !deletions.isEmpty()) {
for (Object other : deletions) {
EntityBean otherDelete = (EntityBean) other;
// the object from the 'other' side of the ManyToMany
// build a intersection row for 'delete'
IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherDelete, publish);
- SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD);
+ SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD, many.extraWhere());
persister.executeOrQueue(sqlDelete, transaction, queue);
+ needsFlush = true;
}
}
if (additions != null && !additions.isEmpty()) {
@@ -322,6 +332,21 @@ private void saveAssocManyIntersection(boolean queue) {
} else {
if (!many.hasImportedId(otherBean)) {
throw new PersistenceException("ManyToMany bean " + otherBean + " does not have an Id value.");
+ } else if (many.getIntersectionFactory() != null) {
+ // build a intersection bean for 'insert'
+ // They need to be executed very late and would normally go to Queue#2, but we do not have
+ // a SpiSqlUpdate for now.
+ if (needsFlush) {
+ transaction.flushBatchOnCascade();
+ }
+ if (queue) {
+ transaction.depth(+100);
+ }
+ Object intersectionBean = many.getIntersectionFactory().invoke(parentBean, otherBean);
+ persister.saveRecurse((EntityBean) intersectionBean, transaction, parentBean, request.flags());
+ if (queue) {
+ transaction.depth(-100);
+ }
} else {
// build a intersection row for 'insert'
IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherBean, publish);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
index 4a4abe17d5..1b71bc1a09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
@@ -70,7 +70,8 @@ private int execute(PersistRequestBean request, PersistHandler handler) {
}
} catch (SQLException e) {
// log the error to the transaction log
- String msg = "Error: " + StringHelper.removeNewLines(e.getMessage());
+ String msg = "Error[" + StringHelper.removeNewLines(e.getMessage()) + "] " + handler;
+
if (request.transaction().isLogSummary()) {
request.transaction().logSummary(msg);
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 58ec931fc5..97c483fc51 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -263,4 +263,14 @@ PreparedStatement getPstmtBatch(SpiTransaction t, String sql, PersistRequestBean
return stmt;
}
+ @Override
+ public String toString() {
+ if (sql == null) {
+ return "not yet initialized";
+ } else if (bindLog == null || bindLog.length() == 0) {
+ return sql;
+ } else {
+ return Str.add(sql, " -- bind(", bindLog.toString(), ")");
+ }
+ }
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java
new file mode 100644
index 0000000000..d6cb3f4dd6
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java
@@ -0,0 +1,54 @@
+
+package io.ebeaninternal.server.query;
+
+import io.ebeaninternal.api.CoreLog;
+import io.ebeaninternal.api.SpiDbQueryPlan;
+import io.ebeaninternal.api.SpiQueryPlan;
+import io.ebeaninternal.server.bind.capture.BindCapture;
+
+import java.sql.*;
+import java.util.Random;
+
+import static java.lang.System.Logger.Level.WARNING;
+
+/**
+ * A QueryPlanLogger for DB2.
+ *
+ * To use query plan capturing, you have to install the explain tables with
+ * SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', CURRENT SCHEMA ).
+ * To do this in a repeatable script, you may use this statement:
+ *
+ *
+ * BEGIN
+ * IF NOT EXISTS (SELECT * FROM SYSCAT.TABLES WHERE TABSCHEMA = CURRENT SCHEMA AND TABNAME = 'EXPLAIN_STREAM') THEN
+ * call SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', CURRENT SCHEMA );
+ * END IF;
+ * END
+ *
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public final class QueryPlanLoggerDb2 extends QueryPlanLogger {
+
+ private Random rnd = new Random();
+
+ @Override
+ public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
+ try (Statement stmt = conn.createStatement()) {
+ int queryNo = rnd.nextInt(Integer.MAX_VALUE);
+ try (PreparedStatement explainStmt = conn
+ .prepareStatement("EXPLAIN PLAN SET QUERYNO=" + queryNo + " FOR " + plan.sql())) {
+ bind.prepare(explainStmt, conn);
+ explainStmt.execute();
+ }
+
+ try (ResultSet rset = stmt.executeQuery("select * from EXPLAIN_STATEMENT where QUERYNO=" + queryNo)) {
+ return readQueryPlan(plan, bind, rset);
+ }
+ } catch (SQLException e) {
+ CoreLog.log.log(WARNING, "Could not log query plan", e);
+ return null;
+ }
+ }
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 412c74fc85..a38cfc51b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -414,7 +414,7 @@ private void addProperty(SqlTreeProperties selectProps, STreeType desc, OrmQuery
// make sure we only included the base/embedded bean once
if (!selectProps.containsProperty(baseName)) {
- STreeProperty p = desc.findPropertyWithDynamic(baseName, null);
+ STreeProperty p = desc.findProperty(baseName);
if (p == null) {
// maybe dynamic formula with schema prefix
p = desc.findPropertyWithDynamic(propName, null);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 9fae2e21c8..4b8408c27a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -885,6 +885,9 @@ public final void postCommit() {
public final void preCommit() {
internalBatchFlush();
firePreCommit();
+ // we must flush the batch queue again, because the callback can
+ // modify current transaction
+ internalBatchFlush();
}
/**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index c60386f30a..fdf77e8293 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -56,7 +56,7 @@ public final class DefaultTypeManager implements TypeManager {
private final DefaultTypeFactory extraTypeFactory;
- private final ScalarType fileType = new ScalarTypeFile();
+ private final ScalarType fileType;
private final ScalarType hstoreType = new ScalarTypePostgresHstore();
private final JsonConfig.DateTime jsonDateTime;
@@ -94,6 +94,7 @@ public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) {
this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform());
this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
this.defaultEnumType = config.getDefaultEnumType();
+ this.fileType = new ScalarTypeFile(config.getTempFileProvider());
ServiceLoader mappers = ServiceLoader.load(ScalarJsonMapper.class);
jsonMapper = mappers.findFirst().orElse(null);
@@ -111,7 +112,10 @@ public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) {
}
private void loadGeoTypeBinder(DatabaseConfig config) {
- final GeoTypeProvider provider = ServiceUtil.service(GeoTypeProvider.class);
+ GeoTypeProvider provider = config.getServiceObject(GeoTypeProvider.class);
+ if (provider == null) {
+ provider = ServiceUtil.service(GeoTypeProvider.class);
+ }
if (provider != null) {
geoTypeBinder = provider.createBinder(config);
}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index 8ac56e5176..0331296cb5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -61,7 +61,7 @@ public Calendar convertFromInstant(Instant ts) {
@Override
protected String toJsonNanos(Calendar value) {
- return String.valueOf(value.getTime());
+ return String.valueOf(value.getTime().getTime());
}
@Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 5e4ad5df80..5dd6ff96e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.config.TempFileProvider;
import io.ebean.core.type.DataBinder;
import io.ebean.core.type.DataReader;
import io.ebean.core.type.DocPropertyType;
@@ -20,26 +21,22 @@
*/
final class ScalarTypeFile extends ScalarTypeBase {
- private final String prefix;
- private final String suffix;
- private final File directory;
+ private final TempFileProvider tempFileProvider;
private final int bufferSize;
/**
- * Construct with reasonable defaults of Blob and 8096 buffer size.
+ * Construct with reasonable defaults of Blob and 8192 buffer size.
*/
- ScalarTypeFile() {
- this(Types.LONGVARBINARY, "db-", null, null, 8096);
+ ScalarTypeFile(TempFileProvider tempFileProvider) {
+ this(Types.LONGVARBINARY, tempFileProvider, 8192);
}
/**
* Create the ScalarTypeFile.
*/
- ScalarTypeFile(int jdbcType, String prefix, String suffix, File directory, int bufferSize) {
+ ScalarTypeFile(int jdbcType, TempFileProvider tempFileProvider, int bufferSize) {
super(File.class, false, jdbcType);
- this.prefix = prefix;
- this.suffix = suffix;
- this.directory = directory;
+ this.tempFileProvider = tempFileProvider;
this.bufferSize = bufferSize;
}
@@ -66,7 +63,7 @@ public File read(DataReader reader) throws SQLException {
}
try {
// stream from db into our temp file
- File tempFile = File.createTempFile(prefix, suffix, directory);
+ File tempFile = tempFileProvider.createTempFile();
OutputStream os = getOutputStream(tempFile);
pump(is, os);
return tempFile;
@@ -109,7 +106,7 @@ public void jsonWrite(JsonGenerator writer, File value) throws IOException {
@Override
public File jsonRead(JsonParser parser) throws IOException {
- File tempFile = File.createTempFile(prefix, suffix, directory);
+ File tempFile = tempFileProvider.createTempFile();
try (OutputStream os = getOutputStream(tempFile)) {
parser.readBinaryValue(os);
os.flush();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 3de0184e1f..b5b523c149 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -11,6 +11,7 @@
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeParseException;
/**
* ScalarType for java.sql.Timestamp.
@@ -63,7 +64,11 @@ public String formatValue(LocalDateTime value) {
@Override
public LocalDateTime parse(String value) {
- return LocalDateTime.parse(value);
+ try {
+ return LocalDateTime.parse(value);
+ } catch (DateTimeParseException pe) {
+ return super.parse(value);
+ }
}
@Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
index 623402fb71..27aebb9d79 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java
@@ -3,6 +3,8 @@
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import io.ebean.config.JsonConfig;
+
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.StringWriter;
@@ -123,4 +125,20 @@ public void isoJsonFormatParse() {
LocalDateTime value = typeIso.fromJsonISO8601(asJson);
assertThat(localDateTime).isEqualToIgnoringNanos(value);
}
+
+ @Test
+ @Disabled("Does not work @github due different timezone")
+ // Expecting actual:
+ // 2018-02-03T03:05:06 (java.time.LocalDateTime)
+ // to have same year, month, day, hour, minute and second as:
+ // 2018-02-03T04:05:06 (java.time.LocalDateTime)
+ public void testParseEbean11() {
+
+ ScalarTypeLocalDateTime typeDefault = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601);
+
+ LocalDateTime fromMillis = typeDefault.parse("1517627106000");
+ LocalDateTime fromIso= typeDefault.parse("2018-02-03T04:05:06");
+
+ assertThat(fromMillis).isEqualToIgnoringNanos(fromIso);
+ }
}
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index fce50e8e76..dde65303a1 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-csv-reader
@@ -14,21 +14,21 @@
io.ebean
ebean-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
index 8a871a62da..6504c219e5 100644
--- a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
+++ b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
@@ -11,10 +11,11 @@
import java.net.URL;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.Locale;
class CsvReaderTest {
- final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy");
+ final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy", Locale.ENGLISH);
@Test
void test() throws Exception {
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ec4a234564..2291d4810b 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean ddl generation
@@ -28,14 +28,14 @@
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
@@ -58,7 +58,7 @@
io.ebean
ebean-platform-all
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java
new file mode 100644
index 0000000000..1839cf4917
--- /dev/null
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java
@@ -0,0 +1,56 @@
+package io.ebeaninternal.dbmigration;
+
+import java.io.IOException;
+
+import io.ebean.plugin.Plugin;
+import io.ebean.plugin.SpiServer;
+
+/**
+ * Plugin to generate db-migration scripts automatically.
+ * @author Roland Praml, FOCONIS AG
+ */
+public class DbMigrationPlugin implements Plugin {
+
+ private DefaultDbMigration dbMigration;
+
+ private static String lastMigration;
+ private static String lastInit;
+
+ @Override
+ public void configure(SpiServer server) {
+ dbMigration = new DefaultDbMigration();
+ dbMigration.setServer(server);
+ }
+
+ @Override
+ public void online(boolean online) {
+ try {
+ lastInit = null;
+ lastMigration = null;
+ if (dbMigration.generate) {
+ String tmp = lastMigration = dbMigration.generateMigration();
+ if (tmp == null) {
+ return;
+ }
+ }
+ if (dbMigration.generateInit) {
+ lastInit = dbMigration.generateInitMigration();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error while generating migration", e);
+ }
+ }
+
+ @Override
+ public void shutdown() {
+ dbMigration = null;
+ }
+
+ public static String getLastInit() {
+ return lastInit;
+ }
+
+ public static String getLastMigration() {
+ return lastMigration;
+ }
+}
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 7567ad4cf4..67c3b8f9a2 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -63,11 +63,10 @@ public DdlGenerator(SpiEbeanServer server) {
if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) {
log.log(WARNING, "DDL can't be run on startup with TenantMode " + config.getTenantMode());
this.runDdl = false;
- this.useMigrationStoredProcedures = false;
} else {
this.runDdl = config.isDdlRun();
- this.useMigrationStoredProcedures = config.getDatabasePlatform().useMigrationStoredProcedures();
}
+ this.useMigrationStoredProcedures = config.getDatabasePlatform() != null && config.getDatabasePlatform().useMigrationStoredProcedures();
this.scriptTransform = createScriptTransform(config);
this.baseDir = initBaseDir();
}
@@ -85,7 +84,7 @@ private File initBaseDir() {
@Override
public void execute(boolean online) {
generateDdl();
- if (online) {
+ if (online && runDdl) {
runDdl();
}
}
@@ -105,16 +104,15 @@ protected void generateDdl() {
/**
* Run the DDL drop and DDL create scripts if properties have been set.
*/
- protected void runDdl() {
- if (runDdl) {
- Connection connection = null;
- try {
- connection = obtainConnection();
- runDdlWith(connection);
- } finally {
- JdbcClose.rollback(connection);
- JdbcClose.close(connection);
- }
+ @Override
+ public void runDdl() {
+ Connection connection = null;
+ try {
+ connection = obtainConnection();
+ runDdlWith(connection);
+ } finally {
+ JdbcClose.rollback(connection);
+ JdbcClose.close(connection);
}
}
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index a96957d0ab..73857a05ee 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -1,6 +1,7 @@
package io.ebeaninternal.dbmigration;
import io.avaje.applog.AppLog;
+import io.avaje.classpath.scanner.core.Location;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.annotation.Platform;
@@ -12,6 +13,7 @@
import io.ebean.config.dbplatform.DatabasePlatformProvider;
import io.ebean.dbmigration.DbMigration;
import io.ebean.util.IOUtils;
+import io.ebean.util.StringHelper;
import io.ebeaninternal.api.DbOffline;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
@@ -26,10 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
import static java.lang.System.Logger.Level.*;
@@ -61,8 +60,8 @@ public class DefaultDbMigration implements DbMigration {
private static final String initialVersion = "1.0";
private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
- private final List platformProviders = new ArrayList<>();
- protected final boolean online;
+ private List platformProviders = new ArrayList<>();
+ protected boolean online;
private boolean logToSystemOut = true;
protected SpiEbeanServer server;
protected String pathToResources = "src/main/resources";
@@ -77,8 +76,10 @@ public class DefaultDbMigration implements DbMigration {
protected List platforms = new ArrayList<>();
protected DatabaseConfig databaseConfig;
protected DbConstraintNaming constraintNaming;
+ @Deprecated
protected Boolean strictMode;
- protected Boolean includeGeneratedFileComment;
+ protected boolean includeGeneratedFileComment;
+ @Deprecated
protected String header;
protected String applyPrefix = "";
protected String version;
@@ -88,6 +89,9 @@ public class DefaultDbMigration implements DbMigration {
private int lockTimeoutSeconds;
protected boolean includeBuiltInPartitioning = true;
protected boolean includeIndex;
+ protected boolean generate = false;
+ protected boolean generateInit = false;
+ private boolean keepLastInit = true;
/**
* Create for offline migration generation.
@@ -123,12 +127,66 @@ public void setServerConfig(DatabaseConfig config) {
if (constraintNaming == null) {
this.constraintNaming = databaseConfig.getConstraintNaming();
}
+ if (databasePlatform == null) {
+ this.databasePlatform = databaseConfig.getDatabasePlatform();
+ }
Properties properties = config.getProperties();
if (properties != null) {
- PropertiesWrapper props = new PropertiesWrapper("ebean", config.getName(), properties, null);
+ PropertiesWrapper props = new PropertiesWrapper("ebean", config.getName(), properties, config.getClassLoadConfig());
migrationPath = props.get("migration.migrationPath", migrationPath);
migrationInitPath = props.get("migration.migrationInitPath", migrationInitPath);
pathToResources = props.get("migration.pathToResources", pathToResources);
+ addForeignKeySkipCheck = props.getBoolean("migration.addForeignKeySkipCheck", addForeignKeySkipCheck);
+ applyPrefix = props.get("migration.applyPrefix",applyPrefix);
+ databasePlatform = props.createInstance(DatabasePlatform.class, "migration.databasePlatform", databasePlatform);
+ generatePendingDrop = props.get("migration.generatePendingDrop", generatePendingDrop);
+ includeBuiltInPartitioning = props.getBoolean("migration.includeBuiltInPartitioning", includeBuiltInPartitioning);
+ includeGeneratedFileComment = props.getBoolean("migration.includeGeneratedFileComment", includeGeneratedFileComment);
+ includeIndex = props.getBoolean("migration.includeIndex", includeIndex);
+ lockTimeoutSeconds = props.getInt("migration.lockTimeoutSeconds", lockTimeoutSeconds);
+ logToSystemOut = props.getBoolean("migration.logToSystemOut", logToSystemOut);
+ modelPath = props.get("migration.modelPath", modelPath);
+ modelSuffix = props.get("migration.modelSuffix", modelSuffix);
+ name = props.get("migration.name", name);
+ online = props.getBoolean("migration.online", online);
+ vanillaPlatform = props.getBoolean("migration.vanillaPlatform", vanillaPlatform);
+ version = props.get("migration.version", version);
+ generate = props.getBoolean("migration.generate", generate);
+ generateInit = props.getBoolean("migration.generateInit", generateInit);
+ // header & strictMode must be configured at DatabaseConfig level
+ parsePlatforms(props, config);
+ }
+ }
+
+ protected void parsePlatforms(PropertiesWrapper props, DatabaseConfig config) {
+ String platforms = props.get("migration.platforms");
+ if (platforms == null || platforms.isEmpty()) {
+ return;
+ }
+ String[] tmp = StringHelper.splitNames(platforms);
+ for (String plat : tmp) {
+ DatabasePlatform dbPlatform;
+ String platformName = plat;
+ String platformPrefix = null;
+ int pos = plat.indexOf('=');
+ if (pos != -1) {
+ platformName = plat.substring(0, pos);
+ platformPrefix = plat.substring(pos + 1);
+ }
+
+ if (platformName.indexOf('.') == -1) {
+ // parse platform as enum value
+ Platform platform = Enum.valueOf(Platform.class, platformName.toUpperCase());
+ dbPlatform = platform(platform);
+ } else {
+ // parse platform as class
+ dbPlatform = (DatabasePlatform) config.getClassLoadConfig().newInstance(platformName);
+ }
+ if (platformPrefix == null) {
+ platformPrefix = dbPlatform.platform().name().toLowerCase();
+ }
+
+ addDatabasePlatform(dbPlatform, platformPrefix);
}
}
@@ -319,7 +377,18 @@ private String generateMigrationFor(boolean initMigration) throws IOException {
}
String pendingVersion = generatePendingDrop();
- if (pendingVersion != null) {
+ if ("auto".equals(pendingVersion)) {
+ StringJoiner sj = new StringJoiner(",");
+ String diff = generateDiff(request);
+ if (diff != null) {
+ sj.add(diff);
+ request = createRequest(initMigration);
+ }
+ for (String pendingDrop : request.getPendingDrops()) {
+ sj.add(generatePendingDrop(request, pendingDrop));
+ }
+ return sj.length() == 0 ? null : sj.toString();
+ } else if (pendingVersion != null) {
return generatePendingDrop(request, pendingVersion);
} else {
return generateDiff(request);
@@ -376,6 +445,7 @@ private void configurePlatforms() {
private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, boolean tablePartitioning) throws IOException {
if (dbPlatform != null) {
if (tablePartitioning && includeBuiltInPartitioning) {
+
generateExtraDdlFor(migrationDir, dbPlatform, ExtraDdlXmlReader.readBuiltinTablePartitioning(), false);
}
// skip built-in migration stored procedures based on isUseMigrationStoredProcedures
@@ -384,6 +454,7 @@ private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform, bo
}
}
+
private void generateExtraDdlFor(File migrationDir, DatabasePlatform dbPlatform, ExtraDdl extraDdl, boolean checkSkip) throws IOException {
if (extraDdl != null) {
List ddlScript = extraDdl.getDdlScript();
@@ -554,7 +625,7 @@ private String generateMigration(Request request, Migration dbMigration, String
return null;
} else {
if (!platforms.isEmpty()) {
- writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
+ writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir, request.initMigration && keepLastInit);
} else if (databasePlatform != null) {
// writer needs the current model to provide table/column details for
@@ -634,12 +705,17 @@ private String toUnderScore(String name) {
/**
* Write any extra platform ddl.
*/
- private void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
+ private void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath, boolean clear) throws IOException {
DdlOptions options = new DdlOptions(addForeignKeySkipCheck);
for (Pair pair : platforms) {
DdlWrite writer = new DdlWrite(new MConfiguration(), currentModel.read(), options);
PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
File subPath = platformWriter.subPath(writePath, pair.prefix);
+ if (clear) {
+ for (File existing : subPath.listFiles()) {
+ existing.delete();
+ }
+ }
platformWriter.processMigration(dbMigration, writer, subPath, fullVersion);
}
}
@@ -657,7 +733,7 @@ private boolean writeMigrationXml(Migration dbMigration, File resourcePath, Stri
if (file.exists()) {
return false;
}
- String comment = Boolean.TRUE.equals(includeGeneratedFileComment) ? GENERATED_COMMENT : null;
+ String comment = includeGeneratedFileComment ? GENERATED_COMMENT : null;
MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
xmlWriter.write(dbMigration, file);
return true;
@@ -675,6 +751,7 @@ private void setDefaults() {
databasePlatform = server.databasePlatform();
}
if (databaseConfig != null) {
+ // FIXME: Copy header and StrictMode to databaseConfig
if (strictMode != null) {
databaseConfig.setDdlStrictMode(strictMode);
}
@@ -749,15 +826,20 @@ public File migrationDirectory() {
* Return the file path to write the xml and sql to.
*/
File migrationDirectory(boolean initMigration) {
- // path to src/main/resources in typical maven project
- File resourceRootDir = new File(pathToResources);
- if (!resourceRootDir.exists()) {
- String msg = String.format("Error - path to resources %s does not exist. Absolute path is %s", pathToResources, resourceRootDir.getAbsolutePath());
- throw new UnknownResourcePathException(msg);
- }
- String resourcePath = migrationPath(initMigration);
+ Location resourcePath = migrationPath(initMigration);
// expect to be a path to something like - src/main/resources/dbmigration
- File path = new File(resourceRootDir, resourcePath);
+ File path;
+ if (resourcePath.isClassPath()) {
+ // path to src/main/resources in typical maven project
+ File resourceRootDir = new File(pathToResources);
+ if (!resourceRootDir.exists()) {
+ String msg = String.format("Error - path to resources %s does not exist. Absolute path is %s", pathToResources, resourceRootDir.getAbsolutePath());
+ throw new UnknownResourcePathException(msg);
+ }
+ path = new File(resourceRootDir, resourcePath.path());
+ } else {
+ path = new File(resourcePath.path());
+ }
if (!path.exists()) {
if (!path.mkdirs()) {
logInfo("Warning - Unable to ensure migration directory exists at %s", path.getAbsolutePath());
@@ -766,8 +848,9 @@ File migrationDirectory(boolean initMigration) {
return path;
}
- private String migrationPath(boolean initMigration) {
- return initMigration ? migrationInitPath : migrationPath;
+ private Location migrationPath(boolean initMigration) {
+ // remove classpath: or filesystem: prefix
+ return new Location(initMigration ? migrationInitPath : migrationPath);
}
/**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index e9fafccc41..9d81397150 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -142,7 +142,7 @@ private String translate(String ddl, String tableName, String columnName, String
private void handleStrictError(String tableName, String columnName) {
if (strictMode) {
- String message = "DB Migration of non-null column with no default value specified for: " + tableName + "." + columnName+" Use @DbDefault to specify a default value or specify dbMigration.setStrictMode(false)";
+ String message = "DB Migration of non-null column with no default value specified for: " + tableName + "." + columnName+" Use @DbDefault to specify a default value or disable strict mode for migration";
throw new IllegalArgumentException(message);
}
}
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 3ff9034d18..350c584e8c 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -42,7 +42,7 @@ private static String buildExtra(Platform platform, boolean drops, ExtraDdl read
StringBuilder sb = new StringBuilder(300);
for (DdlScript script : read.getDdlScript()) {
if (script.isDrop() == drops && matchPlatform(platform, script.getPlatforms())) {
- logger.log(DEBUG, "include script {}", script.getName());
+ logger.log(DEBUG, "include script {0}", script.getName());
String value = script.getValue();
sb.append(value);
if (value.lastIndexOf(';') == -1) {
diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java
index 1a7ef332e4..c5b6af08b2 100644
--- a/ebean-ddl-generator/src/main/java/module-info.java
+++ b/ebean-ddl-generator/src/main/java/module-info.java
@@ -1,5 +1,6 @@
module io.ebean.ddl.generator {
+ uses io.ebean.plugin.Plugin;
exports io.ebean.dbmigration;
provides io.ebean.dbmigration.DbMigration with io.ebeaninternal.dbmigration.DefaultDbMigration;
diff --git a/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin
new file mode 100644
index 0000000000..83ec94df48
--- /dev/null
+++ b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin
@@ -0,0 +1 @@
+io.ebeaninternal.dbmigration.DbMigrationPlugin
diff --git a/ebean-ddl-generator/src/test/resources/application-test.properties b/ebean-ddl-generator/src/test/resources/application-test.properties
index dfcb052ab0..af973bb3a5 100644
--- a/ebean-ddl-generator/src/test/resources/application-test.properties
+++ b/ebean-ddl-generator/src/test/resources/application-test.properties
@@ -5,32 +5,12 @@ datasource.default=h2
datasource.h2.username=sa
datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:h2AutoTune
+datasource.h2.url=jdbc:h2:mem:h2AutoTune;NON_KEYWORDS=KEY,VALUE
+
+datasource.db2.username=migtest
+datasource.db2.password=migtest
+datasource.db2.url=jdbc:db2://localhost:50005/migtest
datasource.pg.username=sa
datasource.pg.password=
datasource.pg.url=jdbc:h2:mem:h2AutoTune
-
-# parameters for migration test
-datasource.migrationtest.username=SA
-datasource.migrationtest.password=SA
-datasource.migrationtest.url=jdbc:h2:mem:migration
-ebean.migrationtest.applyPrefix=V
-ebean.migrationtest.ddl.generate=false
-ebean.migrationtest.ddl.run=false
-ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest
-ebean.migrationtest.migration.appName=migrationtest
-ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest
-ebean.migrationtest.migration.strict=true
-
-# parameters for migration test
-datasource.migrationtest-history.username=SA
-datasource.migrationtest-history.password=SA
-datasource.migrationtest-history.url=jdbc:h2:mem:migration
-ebean.migrationtest-history.applyPrefix=V
-ebean.migrationtest-history.ddl.generate=false
-ebean.migrationtest-history.ddl.run=false
-ebean.migrationtest-history.ddl.header=-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest
-ebean.migrationtest-history.migration.appName=migrationtest-history
-ebean.migrationtest-history.migration.migrationPath=dbmigration/migrationtest-history
-ebean.migrationtest-history.migration.strict=true
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 90849e8418..6480c67d9f 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean external mapping api
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 4ad095b631..f6ad1507f4 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
- scm:git:git@github.com:ebean-orm/ebean.git
- HEAD
+ scm:git:git@github.com:FOCONIS/ebean.git
+ ebean-parent-13.6.4-FOC1
ebean external mapping xml
@@ -21,7 +21,7 @@
io.ebean
ebean-externalmapping-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -54,21 +54,21 @@
io.ebean
ebean-platform-h2
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-ddl-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index bb9959ba1f..93905497b1 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-jackson-jsonnode
@@ -14,7 +14,7 @@
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index 24e4f274b4..0e41387e38 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -3,7 +3,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
4.0.0
@@ -14,7 +14,7 @@
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index f1196b1409..e7332c4fe3 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
4.0.0
@@ -14,7 +14,7 @@
io.ebean
ebean-core-type
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
index e2520906da..61f71869b1 100644
--- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
@@ -23,7 +23,7 @@ final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate
@Override
protected String toIsoFormat(DateMidnight value) {
- return value.toString();
+ return value.toLocalDate().toString();
}
@Override
diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
index 3b0ec373b5..73b3c6e23b 100644
--- a/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
@@ -27,6 +27,11 @@ protected String toJsonNanos(LocalDateTime value) {
protected String toJsonISO8601(LocalDateTime value) {
return value.toString();
}
+
+ @Override
+ protected LocalDateTime fromJsonISO8601(String value) {
+ return LocalDateTime.parse(value);
+ }
@Override
public long convertToMillis(LocalDateTime value) {
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 1d6f391b48..9db4f9ac34 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -1,12 +1,10 @@
-
+
4.0.0
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-kotlin
@@ -28,7 +26,7 @@
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
@@ -50,7 +48,7 @@
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 4e6abbfad0..6082a55217 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean postgis
@@ -22,14 +22,14 @@
io.ebean
ebean-platform-postgres
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
@@ -65,7 +65,7 @@
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 7470185859..8262aad872 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean querybean
@@ -17,7 +17,7 @@
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
@@ -63,21 +63,21 @@
io.ebean
ebean-ddl-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
querybean-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 5fc9f258d2..5df930f7c0 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean-redis
@@ -22,35 +22,35 @@
io.ebean
ebean-api
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-querybean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
querybean-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 86f127f967..59b0218287 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
ebean test
@@ -28,20 +28,20 @@
io.ebean
ebean-platform-h2
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
provided
io.ebean
ebean-ddl-generator
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -105,28 +105,28 @@
io.ebean
ebean-joda-time
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-jackson-jsonnode
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-jackson-mapper
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-platform-all
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index 428c3b3f4a..ed64a809eb 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -1,5 +1,5 @@
-
-module io.ebean.test {
+// module must be open, so tests will pass
+open module io.ebean.test {
exports io.ebean.test;
exports io.ebean.test.config;
diff --git a/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java
new file mode 100644
index 0000000000..950fbc57dc
--- /dev/null
+++ b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java
@@ -0,0 +1,154 @@
+package io.ebean.test.config;
+
+
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.annotation.Platform;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.datasource.DataSourceAlert;
+import io.ebean.datasource.DataSourceInitialiseException;
+import io.ebean.xtest.ForPlatform;
+
+import io.ebean.xtest.base.PlatformCondition;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.tests.model.basic.EBasicVer;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+@ExtendWith(PlatformCondition.class)
+public class TestServerOffline {
+
+ @Test
+ @ForPlatform({Platform.H2})
+ public void testOffline_default() throws SQLException {
+
+ String url = "jdbc:h2:mem:testoffline1";
+ try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) {
+ Properties props = props(url);
+ DatabaseConfig config = config(props);
+
+ assertThatThrownBy(() -> DatabaseFactory.create(config))
+ .isInstanceOf(DataSourceInitialiseException.class);
+ }
+
+ }
+
+ private static class LazyDatasourceInitializer implements DataSourceAlert {
+
+ public Database server;
+
+ private boolean initialized;
+
+ @Override
+ public void dataSourceUp(DataSource dataSource) {
+ if (!initialized) {
+ initDatabase();
+ }
+ }
+
+ public synchronized void initDatabase() {
+ if (!initialized) {
+ server.runDdl();
+ initialized = true;
+ }
+ }
+
+ @Override
+ public void dataSourceDown(DataSource dataSource, SQLException reason) {}
+
+ @Override
+ public void dataSourceWarning(DataSource dataSource, String msg) {}
+
+ }
+
+ @Test
+ @ForPlatform({Platform.H2})
+ public void testOffline_recovery() throws SQLException {
+
+ String url = "jdbc:h2:mem:testoffline3";
+ try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) {
+
+ Properties props = props(url);
+
+ // to bring up ebean without a database, we must disable various things
+ // that happen on startup
+ props.setProperty("datasource.h2_offline.failOnStart", "false");
+ props.setProperty("ebean.h2_offline.skipDataSourceCheck", "true");
+ props.setProperty("ebean.h2_offline.ddl.run", "false");
+ DatabaseConfig config = config(props);
+
+ LazyDatasourceInitializer alert = new LazyDatasourceInitializer() ;
+ config.getDataSourceConfig().setAlert(alert);
+ config.getDataSourceConfig().setHeartbeatFreqSecs(1);
+
+ Database h2Offline = DatabaseFactory.create(config);
+ alert.server = h2Offline;
+ assertThat(h2Offline).isNotNull();
+ // DB is online now in offline mode
+
+ // Accessing the DB will throw a PE
+ assertThatThrownBy(() -> alert.initDatabase())
+ .isInstanceOf(PersistenceException.class)
+ .hasMessageContaining("Failed to obtain connection to run DDL");
+
+ assertThatThrownBy(() -> h2Offline.find(EBasicVer.class).findCount()).isInstanceOf(PersistenceException.class);
+
+ // so - reset the password so that the server can reconnect
+ try (Statement stmt = bootup.createStatement()) {
+ stmt.execute("alter user sa set password 'sa'");
+ }
+
+ assertThat(alert.initialized).isFalse();
+
+ // next access to ebean should bring DS online
+ h2Offline.find(EBasicVer.class).findCount();
+ assertThat(alert.initialized).isTrue();
+
+ // check if server is working (ie ddl was run)
+ EBasicVer bean = new EBasicVer("foo");
+ h2Offline.save(bean);
+ assertThat(h2Offline.find(EBasicVer.class).findCount()).isEqualTo(1);
+ h2Offline.delete(bean);
+ }
+ }
+
+ private Properties props(String url) {
+
+ Properties props = new Properties();
+
+ props.setProperty("datasource.h2_offline.username", "sa");
+ props.setProperty("datasource.h2_offline.password", "sa");
+ props.setProperty("datasource.h2_offline.url", url);
+ props.setProperty("datasource.h2_offline.driver", "org.h2.Driver");
+
+ props.setProperty("ebean.h2_offline.databasePlatformName", "h2");
+ props.setProperty("ebean.h2_offline.ddl.extra", "false");
+
+ props.setProperty("ebean.h2_offline.ddl.generate", "true");
+ props.setProperty("ebean.h2_offline.ddl.run", "true");
+
+ return props;
+ }
+
+ private DatabaseConfig config(Properties props) {
+ DatabaseConfig config = new DatabaseConfig();
+ config.setName("h2_offline");
+ config.loadFromProperties(props);
+ config.setDefaultServer(false);
+ config.setRegister(false);
+ config.getClasses().add(EBasicVer.class);
+ return config;
+ }
+
+}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java
index 0dcc4afc28..2915657281 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java
@@ -49,6 +49,39 @@ public void create_new_server_with_multi_tenancy_db() {
+ /**
+ * Tests using multi tenancy per database
+ */
+ @Test
+ public void create_new_server_with_multi_tenancy_db_with_master() {
+
+ String tenant = "customer";
+ CurrentTenantProvider tenantProvider = Mockito.mock(CurrentTenantProvider.class);
+ Mockito.doReturn(tenant).when(tenantProvider).currentId();
+
+ TenantDataSourceProvider dataSourceProvider = Mockito.mock(TenantDataSourceProvider.class);
+
+ DatabaseConfig config = new DatabaseConfig();
+
+ config.setName("h2");
+ config.loadFromProperties();
+ config.setRegister(false);
+ config.setDefaultServer(false);
+ config.setDdlGenerate(false);
+ config.setDdlRun(false);
+
+ config.setTenantMode(TenantMode.DB_WITH_MASTER);
+ config.setCurrentTenantProvider(tenantProvider);
+ config.setTenantDataSourceProvider(dataSourceProvider);
+
+ Mockito.doReturn(config.getDataSource()).when(dataSourceProvider).dataSource(tenant);
+
+ config.setDatabasePlatform(new PostgresPlatform());
+
+ final Database database = DatabaseFactory.create(config);
+ database.shutdown();
+ }
+
/**
* Tests using multi tenancy per schema
*/
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java
index e48034d9cd..1135963311 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java
@@ -4,13 +4,53 @@
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
import io.ebean.event.ServerConfigStartup;
+import io.ebeaninternal.api.SpiLogger;
+import io.ebeaninternal.api.SpiLoggerFactory;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.UTDetail;
+import java.util.HashSet;
+import java.util.Set;
+
import static org.assertj.core.api.Assertions.assertThat;
public class EbeanServerFactory_ServerConfigStart_Test {
+
+ /**
+ * Demo, how to intercept logging for a certain database.
+ * In conjunction to ServiceLoader, you can add different loggers to different databases
+ */
+ private static class MySpiLoggerFactory implements SpiLoggerFactory {
+ Set loggers = new HashSet<>();
+
+ @Override
+ public SpiLogger create(String name) {
+ loggers.add(name);
+ // just return a dummy here
+ return new SpiLogger() {
+ @Override
+ public boolean isDebug() {
+ return false;
+ }
+
+ @Override
+ public boolean isTrace() {
+ return false;
+ }
+
+ @Override
+ public void debug(String msg) {
+ }
+
+ @Override
+ public void trace(String msg) {
+ }
+ };
+
+ }
+ }
+
@Test
public void test() throws InterruptedException {
@@ -30,9 +70,13 @@ public void test() throws InterruptedException {
// act - register an instance
OnStartup onStartup = new OnStartup();
config.addServerConfigStartup(onStartup);
+ MySpiLoggerFactory loggerFactory = new MySpiLoggerFactory();
+ config.putServiceObject(SpiLoggerFactory.class, loggerFactory);
Database db = DatabaseFactory.create(config);
+ assertThat(loggerFactory.loggers).containsExactlyInAnyOrder("io.ebean.SQL", "io.ebean.SUM", "io.ebean.TXN");
+
assertThat(onStartup.calledWithConfig).isSameAs(config);
assertThat(OnStartupViaClass.calledWithConfig).isSameAs(config);
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java
new file mode 100644
index 0000000000..b0dfe787b9
--- /dev/null
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java
@@ -0,0 +1,15 @@
+package io.ebean.xtest.base;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import io.ebean.DatabaseFactory;
+
+public class ServerStartTest {
+
+ @Test
+ @Disabled("run manually")
+ void testServerStartAndMigrateDb2() throws Exception {
+ DatabaseFactory.create("db2-migration").shutdown();
+ }
+}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java
index 4f5471c62c..df9850d57f 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java
@@ -79,13 +79,11 @@ public static void main(String[] args) throws IOException {
List pendingDrops = migration.getPendingDrops();
assertThat(pendingDrops).contains("1.1");
- //System.setProperty("ddl.migration.pendingDropsFor", "1.1");
migration.setGeneratePendingDrop("1.1");
assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
assertThatThrownBy(()->migration.generateMigration())
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("No 'pendingDrops'"); // subsequent call
- System.clearProperty("ddl.migration.pendingDropsFor");
server.shutdown();
logger.info("end");
diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java
index df70742162..40706eb8b3 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java
@@ -4,6 +4,8 @@
import io.ebean.DatabaseFactory;
import io.ebean.annotation.Platform;
import io.ebean.config.DatabaseConfig;
+import io.ebeaninternal.api.DbOffline;
+
import io.ebean.dbmigration.DbMigration;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -17,7 +19,6 @@
import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
/**
@@ -96,7 +97,7 @@ public static void run(String pathToResources) throws IOException {
config.getProperties().put("ebean.hana.generateUniqueDdl", "true"); // need to generate unique statements to prevent them from being filtered out as duplicates by the DdlRunner
config.setPackages(Arrays.asList("misc.migration.v1_0"));
- Database server = DatabaseFactory.create(config);
+ Database server = createServer(config);
migration.setServer(server);
// then we generate migration scripts for v1_0
@@ -107,43 +108,28 @@ public static void run(String pathToResources) throws IOException {
// and now for v1_1
config.setPackages(Arrays.asList("misc.migration.v1_1"));
server.shutdown();
- server = DatabaseFactory.create(config);
+ server = createServer(config);
migration.setServer(server);
- assertThat(migration.generateMigration()).isEqualTo("1.1");
- assertThat(migration.generateMigration()).isNull(); // subsequent call
-
-
-
- System.setProperty("ddl.migration.pendingDropsFor", "1.1");
- assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1");
-
- assertThatThrownBy(()->migration.generateMigration())
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("No 'pendingDrops'"); // subsequent call
-
- System.clearProperty("ddl.migration.pendingDropsFor");
+ assertThat(migration.generateMigration()).isEqualTo("1.1,1.2__dropsFor_1.1");
assertThat(migration.generateMigration()).isNull(); // subsequent call
// and now for v1_2 with
config.setPackages(Arrays.asList("misc.migration.v1_2"));
server.shutdown();
- server = DatabaseFactory.create(config);
+ server = createServer(config);
migration.setServer(server);
- assertThat(migration.generateMigration()).isEqualTo("1.3");
- assertThat(migration.generateMigration()).isNull(); // subsequent call
-
-
- System.setProperty("ddl.migration.pendingDropsFor", "1.3");
- assertThat(migration.generateMigration()).isEqualTo("1.4__dropsFor_1.3");
- assertThatThrownBy(migration::generateMigration)
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("No 'pendingDrops'"); // subsequent call
-
- System.clearProperty("ddl.migration.pendingDropsFor");
+ assertThat(migration.generateMigration()).isEqualTo("1.3,1.4__dropsFor_1.3");
assertThat(migration.generateMigration()).isNull(); // subsequent call
server.shutdown();
logger.info("end");
}
+ private static Database createServer(DatabaseConfig config) {
+ DbOffline.setGenerateMigration();
+ Database server = DatabaseFactory.create(config);
+ DbOffline.reset();
+ return server;
+ }
+
}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
index 9a3cff37c5..4e85418f85 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
@@ -97,6 +97,10 @@ public void testRunMigration() throws IOException, SQLException {
runScript("I__create_tablespaces.sql");
}
+ if(isDb2()) {
+ runScript("I__create_tablespaces.sql");
+ }
+
if (!isOracle()) {
// oracle.getMetaData is too slow. So skip this test
assertThat(getTables()).doesNotContain("migtest_QuOtEd");
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
index 3fa7f84b8a..a7ac708037 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
@@ -278,6 +278,11 @@ public int saveAll(Object... beans) throws OptimisticLockException {
return 0;
}
+ @Override
+ public void visitSave(Object start, PersistVisitor visitor) {
+
+ }
+
@Override
public boolean delete(Object bean) throws OptimisticLockException {
return false;
@@ -627,4 +632,9 @@ public void loadBeanL2(EntityBeanIntercept ebi) {
public void loadBean(EntityBeanIntercept ebi) {
}
+
+ @Override
+ public void runDdl() {
+
+ }
}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java
index ce9e420b89..b306fef945 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java
@@ -105,4 +105,25 @@ public void preCommit() {
assertThat(postCommitCallCount.get()).isEqualTo(2); // postcommit executed twice
}
}
+
+ @Test
+ public void testFlushInCallback() {
+ try (Transaction transaction = DB.beginTransaction()) {
+ transaction.setBatchMode(true);
+ DB.currentTransaction().register(
+ new TransactionCallbackAdapter() {
+
+ @Override
+ public void preCommit() {
+ EBasic basic = new EBasic("binner1");
+ DB.save(basic);
+ }
+ }
+ );
+ EBasic basic = new EBasic("bouter1");
+ DB.save(basic);
+ transaction.commit(); // transaction will fail if recursive post-commit is failing
+ }
+ assertThat(DB.find(EBasic.class).where().eq("name", "binner1").exists()).isTrue();
+ }
}
diff --git a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java
index 379b5bd927..b4723dc66b 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java
@@ -1,5 +1,6 @@
package io.ebean.xtest.text;
+import io.ebean.CountDistinctOrder;
import io.ebean.xtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.Query;
@@ -10,6 +11,9 @@
import org.slf4j.LoggerFactory;
import org.tests.model.basic.Customer;
import org.tests.model.basic.ResetBasicData;
+import org.tests.model.composite.Model;
+import org.tests.model.composite.ModelSubEntity;
+import org.tests.model.composite.RCustomer;
import java.util.List;
@@ -48,4 +52,54 @@ void test_withAllPropsQuery() {
assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;");
}
+ @Test
+ void test_withConcat() {
+
+ LoggedSql.start();
+ Query query = DB.find(Customer.class)
+ .select("concat(name,billingAddress.line1)");
+ //.fetch("billingAddress", "concat(line1, line2, t0.name)");
+ //
+ query.findSingleAttributeList();
+ List sql = LoggedSql.stop();
+ assertThat(sql).hasSize(1);
+ assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;");
+ }
+
+ @Test
+ void test_withEmbedededId() {
+ ModelSubEntity entity1 = new ModelSubEntity();
+ DB.save(entity1);
+ ModelSubEntity entity2 = new ModelSubEntity();
+ DB.save(entity2);
+ ModelSubEntity entity3 = new ModelSubEntity();
+ DB.save(entity3);
+
+ Model model1 = new Model();
+ model1.setFrom(entity1);
+ model1.setTo(entity2);
+ model1.setDescription("model 1");
+ DB.save(model1);
+
+ Model model2 = new Model();
+ model2.setFrom(entity3);
+ model2.setTo(entity2);
+ model2.setDescription("model 2");
+ DB.save(model2);
+
+ Query defaultQuery = DB.find(Model.class);
+ PathProperties root = new PathProperties();
+ root.addToPath(null,"id.fromId");
+ //root.addToPath("id"","fromId"); so sah mein erster Versuch aus
+ LoggedSql.start();
+ Query query = defaultQuery.copy();
+ query.apply(root).where().isNotNull("id.fromId");
+ query.setDistinct(true).setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC);
+ query.setMaxRows(1);
+ List
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 97a4023e54..94328c5355 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
ebean-parent
io.ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
querybean generator
diff --git a/release.md b/release.md
new file mode 100644
index 0000000000..423bdb9ba6
--- /dev/null
+++ b/release.md
@@ -0,0 +1,18 @@
+## Release command
+
+We @foconis use this command to release.
+
+ mvn versions:set -DgenerateBackupPoms=false -DnewVersion=13.6.0-FOC2-SNAPSHOT
+ mvn release:prepare release:perform -Darguments="-Dgpg.skip -DskipTests" -PfoconisRelease
+
+ # RELEASE klappt nun, sollte es failen, ist wie folgt vorzugehen:
+ # um bei einen Fehler zu release ist dann ins target/checkout Verzeichnis zu gehen und
+ mvn clean source:jar install org.apache.maven.plugins:maven-deploy-plugin:deploy -DskipTests
+ # auszuführen. Aber auch das failed bei Kotlin.
+
+ # nach dem Release müssen die Versionen in ebean-kotlin/pom.xml, tests/test-java16/pom.xml und tests/test-kotlin/pom.xml manuell angepasst werden
+
+generate Java classes from .xsd:
+
+ export JAVA_TOOL_OPTIONS="-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8"
+ /c/Program\ Files/Java/jdk1.8.0_201/bin/xjc.exe src/main/resources/ebean-dbmigration-1.0.xsd -d src/main/java -p io.ebeaninternal.dbmigration.migration
diff --git a/tests/pom.xml b/tests/pom.xml
index ac7678298b..ca3d3d123e 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -5,7 +5,7 @@
org.avaje
java8-oss
3.3
- io.ebean
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index ad13be4672..a102ebcf7f 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -1,6 +1,5 @@
-
+
4.0.0
io.ebean
@@ -15,7 +14,7 @@
io.ebean
ebean
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
@@ -27,7 +26,7 @@
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 1d6caa2052..a65f752d10 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -1,13 +1,11 @@
-
+
4.0.0
org.avaje
java11-oss
3.7
-
test-kotlin
@@ -35,14 +33,14 @@
io.ebean
ebean-test
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
io.ebean
ebean-core
- 13.10.1-SNAPSHOT
+ 13.10.1-FOC4-SNAPSHOT
test
@@ -71,6 +69,11 @@
src/test/kotlin
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ false
+
org.jetbrains.kotlin
kotlin-maven-plugin
@@ -107,5 +110,4 @@
-