Alter relative order of UUID vs JAVA_OBJECT in type conversion for comparison,

h2/src/main/org/h2/value/Value.java

@@ -314,9 +314,9 @@ public abstract class Value {
             return 40;
         case BLOB:
             return 41;
-        case UUID:
-            return 42;
         case JAVA_OBJECT:
+            return 42;
+        case UUID:
             return 43;
         case GEOMETRY:
             return 44;

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -470,7 +470,7 @@ public class TestPreparedStatement extends TestBase {
         prep.execute();
 
         prep = conn.prepareStatement("select * from test_uuid where id=?");
-        prep.setObject(1, origUUID);
+        prep.setObject(1, origUUID, java.sql.Types.JAVA_OBJECT);
         ResultSet rs = prep.executeQuery();
         rs.next();
         Object o = rs.getObject(1);