From a355f665612f0fa91a1f9f89a4458dc9d1f77e2d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 19 Oct 2017 01:11:14 +1300
Subject: [PATCH] #1176 - Allow script in extra-ddl.xml ... to not have
 trailing semi-colon

---
 .../ebeaninternal/extraddl/model/ExtraDdlXmlReader.java   | 8 +++++++-
 .../dbmigration/migrationtest/db2/R__order_views.sql      | 2 +-
 .../dbmigration/migrationtest/h2/R__order_views.sql       | 2 +-
 .../dbmigration/migrationtest/mysql/R__order_views.sql    | 2 +-
 .../dbmigration/migrationtest/oracle/R__order_views.sql   | 2 +-
 .../dbmigration/migrationtest/postgres/R__order_views.sql | 2 +-
 src/test/resources/extra-ddl.xml                          | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 48cee9129..1d3fdd723 100644
--- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -30,7 +30,13 @@ public class ExtraDdlXmlReader {
     for (DdlScript script : read.getDdlScript()) {
       if (matchPlatform(platformName, script.getPlatforms())) {
         logger.debug("include script {}", script.getName());
-        sb.append(script.getValue()).append("\n");
+        String value = script.getValue();
+        sb.append(value);
+        if (value.lastIndexOf(';') == -1) {
+          // add statement terminator as we didn't find one
+          sb.append(";");
+        }
+        sb.append("\n");
       }
     }
     return sb.toString();
diff --git a/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
index c22cb7533..2872cc37e 100644
--- a/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/db2/R__order_views.sql
@@ -4,5 +4,5 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
index c22cb7533..2872cc37e 100644
--- a/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/h2/R__order_views.sql
@@ -4,5 +4,5 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
index c22cb7533..2872cc37e 100644
--- a/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/mysql/R__order_views.sql
@@ -4,5 +4,5 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
index c22cb7533..2872cc37e 100644
--- a/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/oracle/R__order_views.sql
@@ -4,5 +4,5 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   
\ No newline at end of file
diff --git a/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql b/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
index c22cb7533..2872cc37e 100644
--- a/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
+++ b/src/test/resources/dbmigration/migrationtest/postgres/R__order_views.sql
@@ -4,5 +4,5 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   
\ No newline at end of file
diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml
index d90265d34..42e27bcd3 100644
--- a/src/test/resources/extra-ddl.xml
+++ b/src/test/resources/extra-ddl.xml
@@ -7,7 +7,7 @@
     select d.order_id, sum(d.order_qty * d.unit_price) as order_total,
            sum(d.ship_qty * d.unit_price) as ship_total
     from o_order_detail d
-    group by d.order_id;
+    group by d.order_id
   </ddl-script>
 
   <ddl-script name="order views hsqldb" platforms="hsqldb">