#1176 - Allow script in extra-ddl.xml ... to not have trailing semi-colon

This commit is contained in:
rob bygrave
2017-10-19 01:11:14 +13:00
parent 00fdb632d7
commit a355f66561
7 changed files with 13 additions and 7 deletions
@@ -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();
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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">