Reduce usages of DataType.getDataType()

h2/src/main/org/h2/table/MetaTable.java

@@ -832,6 +832,7 @@ public class MetaTable extends Table {
                 String collation = database.getCompareMode().getName();
                 for (int j = 0; j < cols.length; j++) {
                     Column c = cols[j];
+                    DataType dataType = c.getDataType();
                     Sequence sequence = c.getSequence();
                     add(rows,
                             // TABLE_CATALOG
@@ -849,7 +850,7 @@ public class MetaTable extends Table {
                             // IS_NULLABLE
                             c.isNullable() ? "YES" : "NO",
                             // DATA_TYPE
-                            "" + DataType.convertTypeToSQLType(c.getType()),
+                            "" + dataType.sqlType,
                             // CHARACTER_MAXIMUM_LENGTH
                             "" + c.getPrecisionAsInt(),
                             // CHARACTER_OCTET_LENGTH
@@ -865,7 +866,7 @@ public class MetaTable extends Table {
                             // COLLATION_NAME
                             collation,
                             // TYPE_NAME
-                            identifier(DataType.getDataType(c.getType()).name),
+                            identifier(dataType.name),
                             // NULLABLE
                             "" + (c.isNullable() ?
                                     DatabaseMetaData.columnNullable :

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

@@ -13,6 +13,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.sql.Types;
 
 import org.h2.engine.Mode;
 import org.h2.message.DbException;
@@ -160,7 +161,7 @@ public class ValueNull extends Value {
     @Override
     public void set(PreparedStatement prep, int parameterIndex)
             throws SQLException {
-        prep.setNull(parameterIndex, DataType.convertTypeToSQLType(Value.NULL));
+        prep.setNull(parameterIndex, Types.NULL);
     }
 
     @Override