From 83384c6f0e3f87d2f9dd458674f86eef58fe4a36 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 21 Feb 2018 11:04:04 +1300 Subject: [PATCH] #323 - DDL Generation support for foreign key cascade options Tidy up, no GLOBAL_DEFAULT. --- pom.xml | 2 +- .../dbmigration/ddlgeneration/platform/PlatformDdl.java | 2 +- .../io/ebeaninternal/server/deploy/PropertyForeignKey.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 28d25e71c..1a19a7abd 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ io.ebean ebean-annotation - 3.7 + 3.8 diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java index 3088e49c1..55057bddf 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -389,7 +389,7 @@ public class PlatformDdl { } protected ConstraintMode withDefault(ConstraintMode mode) { - return (mode == null || mode == ConstraintMode.GLOBAL_DEFAULT) ? ConstraintMode.RESTRICT : mode; + return (mode == null) ? ConstraintMode.RESTRICT : mode; } protected void appendForeignKeyOnDelete(StringBuilder buffer, ConstraintMode mode) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java index 8badce0ce..480362e2a 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java +++ b/src/main/java/io/ebeaninternal/server/deploy/PropertyForeignKey.java @@ -16,8 +16,8 @@ public class PropertyForeignKey { public PropertyForeignKey() { this.noConstraint = true; this.noIndex = false; - this.onDelete = ConstraintMode.GLOBAL_DEFAULT; - this.onUpdate = ConstraintMode.GLOBAL_DEFAULT; + this.onDelete = ConstraintMode.RESTRICT; + this.onUpdate = ConstraintMode.RESTRICT; } /**