Skip to content

H
h2database
提交 daa2b0bf authored 作者: Thomas Mueller's avatar Thomas Mueller
浏览文件
操作

Cleanup: 

- Replace inner classes with static initializers
上级 c2b7d146
显示空白字符变更
内嵌 并排
正在显示 包含 309 行增加 和 343 行删除
h2/src/tools/org/h2/jaqu/ModelUtils.java
浏览文件 @ daa2b0bf
......@@ -9,7 +9,7 @@ package org.h2.jaqu;
import static org.h2.jaqu.util.StringUtils.isNullOrEmpty;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -22,6 +22,92 @@ import org.h2.jaqu.TableDefinition.FieldDefinition;
*/
public class ModelUtils {
/**
* The list of supported data types. It is used by the runtime mapping for
* CREATE statements.
*/
private static final Map<Class<?>, String> SUPPORTED_TYPES = new HashMap<Class<?>, String>();
static {
Map<Class<?>, String> m = SUPPORTED_TYPES;
m.put(String.class, "VARCHAR");
m.put(Boolean.class, "BIT");
m.put(Byte.class, "TINYINT");
m.put(Short.class, "SMALLINT");
m.put(Integer.class, "INT");
m.put(Long.class, "BIGINT");
m.put(Float.class, "REAL");
m.put(Double.class, "DOUBLE");
m.put(BigDecimal.class, "DECIMAL");
m.put(java.sql.Timestamp.class, "TIMESTAMP");
m.put(java.util.Date.class, "TIMESTAMP");
m.put(java.sql.Date.class, "DATE");
m.put(java.sql.Time.class, "TIME");
// TODO add blobs, binary types, custom types?
}
/**
* Marshall SQL type aliases to the list of supported types.
* This map is used by Generation and Validation.
*/
private static final Map<String, String> SQL_TYPES = new HashMap<String, String>();
static {
Map<String, String> m = SQL_TYPES;
m.put("CHAR", "VARCHAR");
m.put("CHARACTER", "VARCHAR");
m.put("NCHAR", "VARCHAR");
m.put("VARCHAR_CASESENSITIVE", "VARCHAR");
m.put("VARCHAR_IGNORECASE", "VARCHAR");
m.put("LONGVARCHAR", "VARCHAR");
m.put("VARCHAR2", "VARCHAR");
m.put("NVARCHAR", "VARCHAR");
m.put("NVARCHAR2", "VARCHAR");
m.put("TEXT", "VARCHAR");
m.put("NTEXT", "VARCHAR");
m.put("TINYTEXT", "VARCHAR");
m.put("MEDIUMTEXT", "VARCHAR");
m.put("LONGTEXT", "VARCHAR");
m.put("CLOB", "VARCHAR");
m.put("NCLOB", "VARCHAR");
// logic
m.put("BOOL", "BIT");
m.put("BOOLEAN", "BIT");
// numberic
m.put("BYTE", "TINYINT");
m.put("INT2", "SMALLINT");
m.put("YEAR", "SMALLINT");
m.put("INTEGER", "INT");
m.put("MEDIUMINT", "INT");
m.put("INT4", "INT");
m.put("SIGNED", "INT");
m.put("INT8", "BIGINT");
m.put("IDENTITY", "BIGINT");
// decimal
m.put("NUMBER", "DECIMAL");
m.put("DEC", "DECIMAL");
m.put("NUMERIC", "DECIMAL");
m.put("FLOAT", "DOUBLE");
m.put("FLOAT4", "DOUBLE");
m.put("FLOAT8", "DOUBLE");
// date
m.put("DATETIME", "TIMESTAMP");
m.put("SMALLDATETIME", "TIMESTAMP");
}
private static final List<String> KEYWORDS = Arrays.asList("abstract", "assert", "boolean", "break", "byte", "case",
"catch", "char", "class", "const", "continue", "default", "do", "double", "else", "enum", "extends",
"final", "finally", "float", "for", "goto", "if", "implements", "import", "instanceof", "int", "interface",
"long", "native", "new", "package", "private", "protected", "public", "return", "short", "static",
"strictfp", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "try", "void",
"volatile", "while", "false", "null", "true");
private int todoReviewWholeClass;
/**
* Returns a SQL type mapping for a Java class.
*
......@@ -31,125 +117,54 @@ public class ModelUtils {
*/
public static String getDataType(FieldDefinition fieldDef, boolean strictTypeMapping) {
Class<?> fieldClass = fieldDef.field.getType();
if (supportedTypes.containsKey(fieldClass)) {
String sqltype = supportedTypes.get(fieldClass);
if (sqltype.equals("VARCHAR") && fieldDef.maxLength <= 0)
if (SUPPORTED_TYPES.containsKey(fieldClass)) {
String type = SUPPORTED_TYPES.get(fieldClass);
if (type.equals("VARCHAR") && fieldDef.maxLength <= 0) {
// Unspecified length strings are TEXT, not VARCHAR
return "TEXT";
return sqltype;
}
if (!strictTypeMapping)
return type;
}
if (!strictTypeMapping) {
return "VARCHAR";
else
throw new RuntimeException("Unsupported type " + fieldClass.getName());
}
@SuppressWarnings("serial")
// Used by Runtime Mapping for CREATE statements
static Map<Class<?>, String>
supportedTypes = new HashMap<Class<?>, String>() {
{
put(String.class, "VARCHAR");
put(Boolean.class, "BIT");
put(Byte.class, "TINYINT");
put(Short.class, "SMALLINT");
put(Integer.class, "INT");
put(Long.class, "BIGINT");
put(Float.class, "REAL");
put(Double.class, "DOUBLE");
put(BigDecimal.class, "DECIMAL");
put(java.sql.Timestamp.class, "TIMESTAMP");
put(java.util.Date.class, "TIMESTAMP");
put(java.sql.Date.class, "DATE");
put(java.sql.Time.class, "TIME");
// TODO add blobs, binary types, custom types?
throw new RuntimeException("Unsupported type " + fieldClass.getName());
}
};
/**
* Returns the Java class type for a given SQL type.
*
* @param sqlType
* @param dateClass the preferred date class (java.util.Date or java.sql.Timestamp)
* @param dateClass the preferred date class (java.util.Date or
* java.sql.Timestamp)
* @return
*/
public static Class<?> getClassType(String sqlType,
Class<? extends java.util.Date> dateClass) {
sqlType = sqlType.toUpperCase();
// FIXME dropping "UNSIGNED" or parts like that. could be trouble.
// TODO dropping "UNSIGNED" or parts like that could be trouble
sqlType = sqlType.split(" ")[0].trim();
if (sqlTypes.containsKey(sqlType))
// Marshall sqlType to a standard type
sqlType = sqlTypes.get(sqlType);
Class<?> mappedClass = null;
for (Class<?> clazz : supportedTypes.keySet())
if (supportedTypes.get(clazz).equalsIgnoreCase(sqlType)) {
mappedClass = clazz;
if (SQL_TYPES.containsKey(sqlType)) {
// marshall sqlType to a standard type
sqlType = SQL_TYPES.get(sqlType);
}
Class<?> mappedClazz = null;
for (Class<?> clazz : SUPPORTED_TYPES.keySet()) {
if (SUPPORTED_TYPES.get(clazz).equalsIgnoreCase(sqlType)) {
mappedClazz = clazz;
break;
}
if (mappedClass != null) {
if (mappedClass.equals(java.util.Date.class)
|| mappedClass.equals(java.sql.Timestamp.class))
}
if (mappedClazz != null) {
if (mappedClazz.equals(java.util.Date.class)
|| mappedClazz.equals(java.sql.Timestamp.class)) {
return dateClass;
return mappedClass;
}
return null;
return mappedClazz;
}
// Marshall SQL type aliases to the list of supported types.
// Used by Generation and Validation
static Map<String, String> sqlTypes = new HashMap<String, String>() {
{
// Strings
put("CHAR", "VARCHAR");
put("CHARACTER", "VARCHAR");
put("NCHAR", "VARCHAR");
put("VARCHAR_CASESENSITIVE", "VARCHAR");
put("VARCHAR_IGNORECASE", "VARCHAR");
put("LONGVARCHAR", "VARCHAR");
put("VARCHAR2", "VARCHAR");
put("NVARCHAR", "VARCHAR");
put("NVARCHAR2", "VARCHAR");
put("TEXT", "VARCHAR");
put("NTEXT", "VARCHAR");
put("TINYTEXT", "VARCHAR");
put("MEDIUMTEXT", "VARCHAR");
put("LONGTEXT", "VARCHAR");
put("CLOB", "VARCHAR");
put("NCLOB", "VARCHAR");
// Logic
put("BOOL", "BIT");
put("BOOLEAN", "BIT");
// Whole Numbers
put("BYTE", "TINYINT");
put("INT2", "SMALLINT");
put("YEAR", "SMALLINT");
put("INTEGER", "INT");
put("MEDIUMINT", "INT");
put("INT4", "INT");
put("SIGNED", "INT");
put("INT8", "BIGINT");
put("IDENTITY", "BIGINT");
// Decimals
put("NUMBER", "DECIMAL");
put("DEC", "DECIMAL");
put("NUMERIC", "DECIMAL");
put("FLOAT", "DOUBLE");
put("FLOAT4", "DOUBLE");
put("FLOAT8", "DOUBLE");
// Dates
put("DATETIME", "TIMESTAMP");
put("SMALLDATETIME", "TIMESTAMP");
return null;
}
};
/**
* Tries to create a CamelCase class name from a table.
......@@ -161,9 +176,10 @@ public class ModelUtils {
String[] chunks = name.split("_");
StringBuilder newName = new StringBuilder();
for (String chunk : chunks) {
if (chunk.length() == 0)
if (chunk.length() == 0) {
// leading or trailing _
continue;
}
newName.append(Character.toUpperCase(chunk.charAt(0)));
newName.append(chunk.substring(1).toLowerCase());
}
......@@ -178,78 +194,22 @@ public class ModelUtils {
*/
public static String createFieldName(String col) {
String cn = col.toLowerCase();
if (keywords.contains(cn))
if (KEYWORDS.contains(cn)) {
cn += "_value";
return cn;
}
@SuppressWarnings("serial")
static List<String> keywords = new ArrayList<String>() {
{
add("abstract");
add("assert");
add("boolean");
add("break");
add("byte");
add("case");
add("catch");
add("char");
add("class");
add("const");
add("continue");
add("default");
add("do");
add("double");
add("else");
add("enum");
add("extends");
add("final");
add("finally");
add("float");
add("for");
add("goto");
add("if");
add("implements");
add("import");
add("instanceof");
add("int");
add("interface");
add("long");
add("native");
add("new");
add("package");
add("private");
add("protected");
add("public");
add("return");
add("short");
add("static");
add("strictfp");
add("super");
add("switch");
add("synchronized");
add("this");
add("throw");
add("throws");
add("transient");
add("try");
add("void");
add("volatile");
add("while");
add("false");
add("null");
add("true");
return cn;
}
};
/**
* Checks the formatting of JQColumn.defaultValue()
*
* @param defaultValue
* @return
*/
public static boolean isProperlyFormattedDefaultValue(String defaultValue) {
if (isNullOrEmpty(defaultValue))
if (isNullOrEmpty(defaultValue)) {
return true;
}
Pattern literalDefault = Pattern.compile("'.*'");
Pattern functionDefault = Pattern.compile("[^'].*[^']");
return literalDefault.matcher(defaultValue).matches()
......@@ -266,22 +226,26 @@ public class ModelUtils {
public static boolean isValidDefaultValue(Class<?> modelClazz,
String defaultValue) {
if (defaultValue == null)
if (defaultValue == null) {
// NULL
return true;
if (defaultValue.trim().length() == 0)
}
if (defaultValue.trim().length() == 0) {
// NULL (effectively)
return true;
}
// FIXME H2 single-quotes literal values. Very Useful.
// TODO H2 single-quotes literal values, which is useful.
// MySQL does not single-quote literal values so its hard to
// differentiate a FUNCTION/VARIABLE from a literal value.
// Function/Variable
// function / variable
Pattern functionDefault = Pattern.compile("[^'].*[^']");
if (functionDefault.matcher(defaultValue).matches())
// Hard to validate this since its in the DB. Assume its good.
if (functionDefault.matcher(defaultValue).matches()) {
// hard to validate this since its in the database
// assume it is good
return true;
}
// STRING
if (modelClazz == String.class) {
......@@ -292,10 +256,10 @@ public class ModelUtils {
String dateRegex = "[0-9]{1,4}[-/\\.][0-9]{1,2}[-/\\.][0-9]{1,2}";
String timeRegex = "[0-2]{1}[0-9]{1}:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}";
// TIMESTAMPs
// TIMESTAMP
if (modelClazz == java.util.Date.class
|| modelClazz == java.sql.Timestamp.class) {
// This may be a little loose....
// this may be a little loose....
// 00-00-00 00:00:00
// 00/00/00T00:00:00
// 00.00.00T00:00:00
......@@ -305,7 +269,7 @@ public class ModelUtils {
// DATE
if (modelClazz == java.sql.Date.class) {
// This may be a little loose....
// this may be a little loose....
// 00-00-00
// 00/00/00
// 00.00.00
......@@ -322,18 +286,20 @@ public class ModelUtils {
// NUMBER
if (Number.class.isAssignableFrom(modelClazz)) {
// Strip single quotes
// strip single quotes
String unquoted = defaultValue;
if (unquoted.charAt(0) == '\'')
if (unquoted.charAt(0) == '\'') {
unquoted = unquoted.substring(1);
if (unquoted.charAt(unquoted.length() - 1) == '\'')
}
if (unquoted.charAt(unquoted.length() - 1) == '\'') {
unquoted = unquoted.substring(0, unquoted.length() - 1);
}
try {
// Delegate to static valueOf() method to parse string
// delegate to static valueOf() method to parse string
Method m = modelClazz.getMethod("valueOf", String.class);
Object o = m.invoke(null, unquoted);
} catch (NumberFormatException nex) {
} catch (NumberFormatException ex) {
return false;
} catch (Throwable t) {
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论