2 files changed, 20 insertions, 1 deletions
diff --git a/src/test/java/com/amazon/carbonado/repo/jdbc/H2SchemaResolver.java b/src/test/java/com/amazon/carbonado/repo/jdbc/H2SchemaResolver.java
index 8eddb5b..a5ca1e7 100644
--- a/src/test/java/com/amazon/carbonado/repo/jdbc/H2SchemaResolver.java
+++ b/src/test/java/com/amazon/carbonado/repo/jdbc/H2SchemaResolver.java
@@ -18,6 +18,9 @@
 
 package com.amazon.carbonado.repo.jdbc;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -115,6 +118,8 @@ public class H2SchemaResolver implements SchemaResolver {
                 typeName = "BLOB";
             } else if (type == Clob.class) {
                 typeName = "CLOB";
+            } else if (type == BigDecimal.class || type == BigInteger.class) {
+                typeName = "NUMBER";
             } else {
                 return false;
             }
diff --git a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
index 2682f53..f7b5580 100644
--- a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
+++ b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
@@ -18,6 +18,9 @@
 
 package com.amazon.carbonado.repo.jdbc;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 import java.io.*;
 
 import java.sql.DriverManager;
@@ -341,7 +344,18 @@ public class TestH2 extends com.amazon.carbonado.TestStorables {
 
     @Override
     public void test_insertLobBig() throws Exception {
-	// Not a useful test.
+        // Not a useful test.
+    }
+
+    @Override
+    protected BigInteger expected(BigInteger bi) {
+        // Used to detect that BigIntegerAdapter was selected.
+        return bi.add(BigInteger.ONE);
+    }
+
+    @Override
+    protected BigDecimal expected(BigDecimal bd) {
+        return bd;
     }
 
     private RepositoryBuilder jdbcBuilder(boolean isMaster) throws RepositoryException {