From ff3c5b3d8282436195b02d66ffdb89a2f0050116 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Wed, 27 Jun 2018 00:23:36 +1200 Subject: [PATCH] #1441 - Update ebean-dbmigration.xsd adding missing alterForeignKey element --- .../dbmigration/migration/AlterForeignKey.java | 4 ++-- src/main/resources/ebean-dbmigration-1.0.xsd | 14 ++++++++++++++ .../dbmigration/model/ModelContainerTest.java | 7 +++++++ .../model/4.0__alterForeignKey.model.xml | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml diff --git a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java index 4286b3132..ed0ccf000 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java +++ b/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java @@ -25,9 +25,9 @@ public class AlterForeignKey { protected String name; @XmlAttribute(name = "columnNames", required = true) protected String columnNames; - @XmlAttribute(name = "refColumnNames", required = true) + @XmlAttribute(name = "refColumnNames") protected String refColumnNames; - @XmlAttribute(name = "refTableName", required = true) + @XmlAttribute(name = "refTableName") protected String refTableName; @XmlAttribute(name = "indexName") protected String indexName; diff --git a/src/main/resources/ebean-dbmigration-1.0.xsd b/src/main/resources/ebean-dbmigration-1.0.xsd index ade3fc9a7..58959aa46 100644 --- a/src/main/resources/ebean-dbmigration-1.0.xsd +++ b/src/main/resources/ebean-dbmigration-1.0.xsd @@ -141,6 +141,19 @@ + + + + + + + + + + + + + @@ -300,6 +313,7 @@ + diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java index fc37f02da..ae05f368b 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerTest.java @@ -72,6 +72,13 @@ public class ModelContainerTest { assertThat(container.getPendingDrops()).isEmpty(); } + @Test + public void apply_alterForeignKey() { + ModelContainer container = new ModelContainer(); + container.apply(mig("4.0__alterForeignKey.model.xml"), ver("4.0")); + assertThat(container.getPendingDrops()).isEmpty(); + } + private ModelContainer container_2_1() { ModelContainer container = new ModelContainer(); container.apply(mig("2.0.model.xml"), ver("2.0")); diff --git a/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml b/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml new file mode 100644 index 000000000..2581ec698 --- /dev/null +++ b/src/test/resources/io/ebeaninternal/dbmigration/model/4.0__alterForeignKey.model.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +