github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#824 - Refactor com.avaje.ebean.config.dbplatform DbType & DbPlatformType

Browse Source
This commit is contained in:
Robin Bygrave
2016-09-23 00:17:51 +12:00
parent bc4a246f33
commit d0ad5f6c48
40 changed files with 652 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java
+53
View File
@@ -0,0 +1,53 @@
package com.avaje.ebean.config.dbplatform;
import org.junit.Test;
import java.sql.Types;
import static org.junit.Assert.*;
public class DbPlatformTypeLookupTest {
DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
@Test
public void byName() throws Exception {
assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL);
assertEquals(lookup.byName("Decimal"), DbType.DECIMAL);
assertEquals(lookup.byName("decimal"), DbType.DECIMAL);
assertEquals(lookup.byName("varchar"), DbType.VARCHAR);
assertEquals(lookup.byName("varchar2"), DbType.VARCHAR);
assertEquals(lookup.byName("float"), DbType.REAL);
assertEquals(lookup.byName("real"), DbType.REAL);
assertEquals(lookup.byName("uuid"), DbType.UUID);
assertEquals(lookup.byName("hstore"), DbType.HSTORE);
assertEquals(lookup.byName("json"), DbType.JSON);
assertEquals(lookup.byName("jsonb"), DbType.JSONB);
assertEquals(lookup.byName("jsonclob"), DbType.JSONCLOB);
assertEquals(lookup.byName("jsonblob"), DbType.JSONBLOB);
assertEquals(lookup.byName("jsonVarchar"), DbType.JSONVARCHAR);
}
@Test
public void byId() throws Exception {
assertEquals(lookup.byId(Types.ARRAY), DbType.ARRAY);
assertEquals(lookup.byId(Types.BIGINT), DbType.BIGINT);
assertEquals(lookup.byId(ExtraDbTypes.UUID), DbType.UUID);
assertEquals(lookup.byId(ExtraDbTypes.HSTORE), DbType.HSTORE);
assertEquals(lookup.byId(ExtraDbTypes.JSON), DbType.JSON);
assertEquals(lookup.byId(ExtraDbTypes.JSONB), DbType.JSONB);
assertEquals(lookup.byId(ExtraDbTypes.JSONClob), DbType.JSONCLOB);
assertEquals(lookup.byId(ExtraDbTypes.JSONBlob), DbType.JSONBLOB);
assertEquals(lookup.byId(ExtraDbTypes.JSONVarchar), DbType.JSONVARCHAR);
}
}
src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java
+4 -4
View File
@@ -11,7 +11,7 @@ public class DbTypeMapTest {
public void testLookupRender_given_postgresPlatformType() throws Exception {
PostgresPlatform pg = new PostgresPlatform();
DbTypeMap dbTypeMap = pg.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
assertThat(dbTypeMap.lookup("clob", false).renderType(0,0)).isEqualTo("text");
assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("text");
@@ -29,9 +29,9 @@ public class DbTypeMapTest {
@Test
public void testPlatformTypes() {
DbTypeMap dbTypeMap = DbTypeMap.logicalTypes();
DbType dbType = dbTypeMap.get(DbType.JSON);
DbType json = dbTypeMap.lookup("json", false);
DbPlatformTypeMapping dbTypeMap = DbPlatformTypeMapping.logicalTypes();
DbPlatformType dbType = dbTypeMap.get(DbPlatformType.JSON);
DbPlatformType json = dbTypeMap.lookup("json", false);
assertThat(dbType).isSameAs(json);
}
src/test/java/com/avaje/ebean/config/dbplatform/MySqlPlatformTest.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class MySqlPlatformTest {
MySqlPlatform platform = new MySqlPlatform();
platform.configure(new ServerConfig());
DbType dbType = platform.getDbTypeMap().get(DbType.UUID);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
}
@@ -40,7 +40,7 @@ public class MySqlPlatformTest {
serverConfig.setDbUuid(ServerConfig.DbUuid.AUTO_BINARY);
platform.configure(serverConfig);
DbType dbType = platform.getDbTypeMap().get(DbType.UUID);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
}
src/test/java/com/avaje/ebean/config/dbplatform/OraclePlatformTest.java
+2 -2
View File
@@ -35,7 +35,7 @@ public class OraclePlatformTest {
OraclePlatform platform = new OraclePlatform();
platform.configure(new ServerConfig());
DbType dbType = platform.getDbTypeMap().get(DbType.UUID);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("varchar2(40)");
}
@@ -50,7 +50,7 @@ public class OraclePlatformTest {
platform.configure(serverConfig);
DbType dbType = platform.getDbTypeMap().get(DbType.UUID);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
assertThat(dbType.renderType(0, 0)).isEqualTo("raw(16)");
}
}
src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class PostgresPlatformTest {
PostgresPlatform platform = new PostgresPlatform();
platform.configure(new ServerConfig());
DbType dbType = platform.getDbTypeMap().get(DbType.UUID);
DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
String columnDefn = dbType.renderType(0, 0);
assertThat(columnDefn).isEqualTo("uuid");
src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
+6 -6
View File
@@ -1,6 +1,6 @@
package com.avaje.ebean.dbmigration.ddlgeneration.platform;
import com.avaje.ebean.config.dbplatform.DbTypeMap;
import com.avaje.ebean.config.dbplatform.DbPlatformTypeMapping;
import com.avaje.ebean.config.dbplatform.H2Platform;
import com.avaje.ebean.config.dbplatform.PostgresPlatform;
import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
@@ -14,7 +14,7 @@ public class PlatformTypeConverterTest {
public void convert_withSuffix_expect_suffix() {
PostgresPlatform pg = new PostgresPlatform();
DbTypeMap dbTypeMap = pg.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
@@ -30,7 +30,7 @@ public class PlatformTypeConverterTest {
public void testConvert_given_postgres() throws Exception {
PostgresPlatform pg = new PostgresPlatform();
DbTypeMap dbTypeMap = pg.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
@@ -52,7 +52,7 @@ public class PlatformTypeConverterTest {
H2Platform platform = new H2Platform();
DbTypeMap dbTypeMap = platform.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
@@ -69,7 +69,7 @@ public class PlatformTypeConverterTest {
public void testConvertJsonTypes_given_postgres() {
PostgresPlatform platform = new PostgresPlatform();
DbTypeMap dbTypeMap = platform.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
@@ -84,7 +84,7 @@ public class PlatformTypeConverterTest {
public void testConvertJsonTypes_given_h2() {
H2Platform platform = new H2Platform();
DbTypeMap dbTypeMap = platform.getDbTypeMap();
DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);