From 14dedb7b9aa00008626bb643db9524adbd36e89a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 3 Dec 2016 13:18:33 +1300 Subject: [PATCH] #910 - SQL Server update --- .../config/dbplatform/MsSqlServer2005Platform.java | 2 +- src/test/java/com/avaje/ebean/BaseTestCase.java | 2 +- src/test/resources/extra-ddl.xml | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/MsSqlServer2005Platform.java b/src/main/java/com/avaje/ebean/config/dbplatform/MsSqlServer2005Platform.java index 2a9c76cc5..f3292c90c 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/MsSqlServer2005Platform.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/MsSqlServer2005Platform.java @@ -17,7 +17,7 @@ public class MsSqlServer2005Platform extends DatabasePlatform { public MsSqlServer2005Platform() { super(); - this.name = "mssqlserver2005"; + this.name = "sqlserver"; // effectively disable persistBatchOnCascade mode for SQL Server // due to lack of support for getGeneratedKeys in batch mode this.persistBatchOnCascade = PersistBatch.NONE; diff --git a/src/test/java/com/avaje/ebean/BaseTestCase.java b/src/test/java/com/avaje/ebean/BaseTestCase.java index c85bd477a..253f2f9cc 100644 --- a/src/test/java/com/avaje/ebean/BaseTestCase.java +++ b/src/test/java/com/avaje/ebean/BaseTestCase.java @@ -52,7 +52,7 @@ public class BaseTestCase { * so tests that do this need to be skipped for SQL Server. */ public boolean isMsSqlServer() { - return platformName().startsWith("mssqlserver"); + return platformName().startsWith("sqlserver"); } public boolean isH2() { diff --git a/src/test/resources/extra-ddl.xml b/src/test/resources/extra-ddl.xml index 78e4aa9bd..15b0418c2 100644 --- a/src/test/resources/extra-ddl.xml +++ b/src/test/resources/extra-ddl.xml @@ -1,7 +1,7 @@ - + create or replace view order_agg_vw as select d.order_id, sum(d.order_qty * d.unit_price) as order_total, @@ -11,6 +11,17 @@ + + IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'order_agg_vw') + DROP VIEW order_agg_vw; + + create view order_agg_vw as + 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; + + -- h2 and postgres script