From 5d89897bbdbc698bc8dd152baa42d0c715cbf4f8 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Sep 2019 17:02:53 +1200
Subject: [PATCH] #1817 - Rename @DbHstore to @DbMap

---
 .../io/ebeaninternal/server/core/InternalConfiguration.java   | 2 +-
 .../java/io/ebeaninternal/server/query/CQueryBuilder.java     | 2 +-
 src/test/java/io/ebean/BaseTestCase.java                      | 4 ++--
 src/test/java/org/tests/model/json/EBasicHstore.java          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index b6b034f57..f7623916b 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -527,7 +527,7 @@ public class InternalConfiguration {
   }
 
   private boolean isMySql(Platform platform) {
-     return platform == Platform.MYSQL || platform == Platform.MYSQL55;
+     return platform.base() == Platform.MYSQL;
   }
 
   public DataTimeZone getDataTimeZone() {
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index b75ea391e..557499fe7 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -151,7 +151,7 @@ class CQueryBuilder {
   }
 
   private boolean isMySql(Platform platform) {
-    return platform == Platform.MYSQL || platform == Platform.MYSQL55;
+    return platform.base() == Platform.MYSQL;
   }
 
   private String alias(String rootTableAlias) {
diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java
index 581dfa0aa..c9bcd6064 100644
--- a/src/test/java/io/ebean/BaseTestCase.java
+++ b/src/test/java/io/ebean/BaseTestCase.java
@@ -155,7 +155,7 @@ public abstract class BaseTestCase {
    * so tests that do this need to be skipped for SQL Server.
    */
   public boolean isSqlServer() {
-    return Platform.SQLSERVER17 == platform();
+    return Platform.SQLSERVER == platform().base();
   }
 
   public boolean isH2() {
@@ -183,7 +183,7 @@ public abstract class BaseTestCase {
   }
 
   public boolean isMySql() {
-    return Platform.MYSQL == platform() || Platform.MYSQL55 == platform();
+    return Platform.MYSQL == platform().base();
   }
 
   public boolean isHana() {
diff --git a/src/test/java/org/tests/model/json/EBasicHstore.java b/src/test/java/org/tests/model/json/EBasicHstore.java
index 0c25a6e5c..ec14bf136 100644
--- a/src/test/java/org/tests/model/json/EBasicHstore.java
+++ b/src/test/java/org/tests/model/json/EBasicHstore.java
@@ -1,6 +1,6 @@
 package org.tests.model.json;
 
-import io.ebean.annotation.DbHstore;
+import io.ebean.annotation.DbMap;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -17,7 +17,7 @@ public class EBasicHstore {
   String name;
 
   // fallback to varchar(800) for non-Postgres
-  @DbHstore(length = 800)
+  @DbMap(length = 800)
   Map<String, String> map;
 
   @Version