From 073ea9c550304aab192d72a2e1355788353bdcc9 Mon Sep 17 00:00:00 2001 From: Nagy Vilmos Date: Sun, 1 Jan 2017 07:52:57 +0100 Subject: [PATCH 1/5] SQL Server boolean mapping fix (#932) --- .../ebean/config/dbplatform/sqlserver/SqlServerPlatform.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java index 20b59882d..a3ca1e1a7 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java @@ -8,6 +8,8 @@ import io.ebean.config.dbplatform.DbType; import io.ebean.config.dbplatform.IdType; import io.ebean.dbmigration.ddlgeneration.platform.SqlServerDdl; +import java.sql.Types; + /** * Microsoft SQL Server platform. */ @@ -32,6 +34,7 @@ public class SqlServerPlatform extends DatabasePlatform { this.openQuote = "["; this.closeQuote = "]"; + booleanDbType = Types.INTEGER; dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0")); dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false)); From 33d66ea9d11745118b059af70433d4911cce1c80 Mon Sep 17 00:00:00 2001 From: Thibault Meyer <0xbaadf00d@users.noreply.github.com> Date: Sun, 1 Jan 2017 07:54:25 +0100 Subject: [PATCH 2/5] Upgrade antlr4-runtime to prior version 4.6 (#934) Signed-off-by: Thibault Meyer --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d57b6e2d..1e56c3d63 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ org.antlr antlr4-runtime - 4.5.3 + 4.6 From 2893d73fad28cb36a9a891c37810da72750be1b9 Mon Sep 17 00:00:00 2001 From: Thibault Meyer <0xbaadf00d@users.noreply.github.com> Date: Sun, 1 Jan 2017 07:55:56 +0100 Subject: [PATCH 3/5] Upgrade test dependencies (#935) - avaje-agentloader from 2.1.1 to 2.1.2 - avaje-moduuid from 1.2 to 2.1 - commons-io from 2.4 to 2.5 - hsqldb from 2.0.0 to 2.3.4 - mysql-connector-java from 5.1.36 to 6.0.5 - sqlite-jdbc from 3.8.11.2 to 3.15.1 Signed-off-by: Thibault Meyer --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1e56c3d63..b1c9e5980 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.avaje avaje-agentloader - 2.1.1 + 2.1.2 test @@ -180,21 +180,21 @@ org.xerial sqlite-jdbc - 3.8.11.2 + 3.15.1 test org.hsqldb hsqldb - 2.0.0 + 2.3.4 test mysql mysql-connector-java - 5.1.36 + 6.0.5 test @@ -209,14 +209,14 @@ commons-io commons-io - 2.4 + 2.5 test org.avaje.moduuid avaje-moduuid - 1.2 + 2.1 test From 9be0d22cfb42a9d3cd8ccdde8efd015c321510f2 Mon Sep 17 00:00:00 2001 From: Thibault Meyer <0xbaadf00d@users.noreply.github.com> Date: Sun, 1 Jan 2017 07:57:02 +0100 Subject: [PATCH 4/5] Upgrade provided dependencies (#936) - javax.validation from 1.0.0.GA to 1.1.0.Final - servlet-api from 2.4 to javax.servlet-api 3.1.0 - joda-time from 1.6 to 2.9.7 - postgresql from 9.4.1202-jdbc41 to 9.4.1212.jre7 - h2 from 1.4.192 to 1.4.193 Signed-off-by: Thibault Meyer --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b1c9e5980..b47f20c13 100644 --- a/pom.xml +++ b/pom.xml @@ -112,21 +112,21 @@ javax.validation validation-api - 1.0.0.GA + 1.1.0.Final provided javax.servlet - servlet-api - 2.4 + javax.servlet-api + 3.1.0 provided joda-time joda-time - 1.6 + 2.9.7 provided @@ -134,7 +134,7 @@ org.postgresql postgresql - 9.4-1202-jdbc41 + 9.4.1212.jre7 provided @@ -173,7 +173,7 @@ com.h2database h2 - 1.4.192 + 1.4.193 provided From 4c40962f04d28483bae49b680ce7a1bbe3164fc7 Mon Sep 17 00:00:00 2001 From: Michael Benz Date: Wed, 4 Jan 2017 21:16:39 +0100 Subject: [PATCH 5/5] MigrationXmlWriter adds DOCTYPE xml to avoid warning of missing external DTD in eclipse IDE. (#937) --- .../ebean/dbmigration/migrationreader/MigrationXmlWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java index 2aa8cbf29..67071d3cd 100644 --- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java @@ -22,7 +22,7 @@ public class MigrationXmlWriter { } /** - * Write a Migration to a file as an xml document to the file. + * Write a Migration as a standalone XML document to a file. */ public void write(Migration migration, File file) { @@ -30,6 +30,7 @@ public class MigrationXmlWriter { FileWriter writer = new FileWriter(file); writer.write("\n"); + writer.write("\n"); if (comment != null) { writer.write("