Merge branch 'master' of github.com:ebean-orm/ebean

src/test/java/io/ebean/DtoQueryFromOrmTest.java

@@ -143,7 +143,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
 
     } else {
       assertThat(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
@@ -175,7 +175,7 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     if (isSqlServer()) {
       assertThat(sql.get(0)).contains("select top 10 t0.id, t0.email, "
           + concat("t0.last_name", ", ", "t0.first_name")
-          + " fullName from contact t0 where t0.email is not null  and t0.last_name is not null  order by t0.last_name");
+          + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     } else {
       assertThat(sql.get(0)).contains("select t0.id, t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
           + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");

src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java

@@ -364,6 +364,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchLimit() {
 
     Query<Customer> query = parse("select name fetch billingAddress (line1, city) fetch shippingAddress (line1) limit 10");
@@ -392,6 +393,7 @@ public class EqlParserTest extends BaseTestCase {
   }
 
   @Test
+  @IgnorePlatform(Platform.SQLSERVER)
   public void selectFetchFetchManyPropertiesLimit() {
 
     ResetBasicData.reset();