Skip to content

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

Cleanup: 

- Make fields and methods private where possible
- Add missing Javadocs
- Remove @throws Javadocs (all other languages don't have throws, and it doesn't help much documenting them)
- Use camel case for metaData
- Remove initializing to default values (null, 0, false) because that's anyway done automatically
- Remove @Override to let it compile with JDK 5
- Mark as 'work in progress'
上级 4c5b1c44
隐藏空白字符变更
内嵌 并排
正在显示 包含 160 行增加 和 138 行删除
h2/src/tools/org/h2/jaqu/TableInspector.java
浏览文件 @ dd7cdf0d
...@@ -38,16 +38,19 @@ import org.h2.jaqu.util.Utils; ...@@ -38,16 +38,19 @@ import org.h2.jaqu.util.Utils;
* validation. * validation.
*/ */
public class TableInspector { public class TableInspector {
String schema;
String table; private String schema;
boolean forceUpperCase; private String table;
Class<? extends java.util.Date> dateClazz; private boolean forceUpperCase;
List<String> primaryKeys = Utils.newArrayList(); private Class<? extends java.util.Date> dateClazz;
Map<String, IndexInspector> indexes; private List<String> primaryKeys = Utils.newArrayList();
Map<String, ColumnInspector> columns; private Map<String, IndexInspector> indexes;
final String eol = "\n"; private Map<String, ColumnInspector> columns;
private final String eol = "\n";
TableInspector(String schema, String table, boolean forceUpperCase,
private int todoReviewWholeClass;
TableInspector(String schema, String table, boolean forceUpperCase,
Class<? extends java.util.Date> dateClazz) { Class<? extends java.util.Date> dateClazz) {
this.schema = schema; this.schema = schema;
this.table = table; this.table = table;
...@@ -58,60 +61,62 @@ public class TableInspector { ...@@ -58,60 +61,62 @@ public class TableInspector {
/** /**
* Tests to see if this TableInspector represents schema.table. * Tests to see if this TableInspector represents schema.table.
* <p> * <p>
* @param schema * @param schema the schema name
* @param table * @param table the table name
* @return * @return true if the table matches
*/ */
boolean matches(String schema, String table) { boolean matches(String schema, String table) {
if (isNullOrEmpty(schema)) if (isNullOrEmpty(schema)) {
// table name matching // table name matching
return this.table.equalsIgnoreCase(table); return this.table.equalsIgnoreCase(table);
else if (isNullOrEmpty(table)) } else if (isNullOrEmpty(table)) {
// schema name matching // schema name matching
return this.schema.equalsIgnoreCase(schema); return this.schema.equalsIgnoreCase(schema);
else } else {
// exact table matching // exact table matching
return this.schema.equalsIgnoreCase(schema) return this.schema.equalsIgnoreCase(schema)
&& this.table.equalsIgnoreCase(table); && this.table.equalsIgnoreCase(table);
}
} }
/** /**
* Reads the DatabaseMetaData for the details of this table including * Reads the DatabaseMetaData for the details of this table including
* primary keys and indexes. * primary keys and indexes.
* <p> *
* @param metadata * @param metaData the database meta data
* @throws SQLException
*/ */
void read(DatabaseMetaData metadata) throws SQLException { void read(DatabaseMetaData metaData) throws SQLException {
ResultSet rs = null; ResultSet rs = null;
// Primary Keys // Primary Keys
try { try {
rs = metadata.getPrimaryKeys(null, schema, table); rs = metaData.getPrimaryKeys(null, schema, table);
while (rs.next()) { while (rs.next()) {
String c = rs.getString("COLUMN_NAME"); String c = rs.getString("COLUMN_NAME");
primaryKeys.add(c); primaryKeys.add(c);
} }
closeSilently(rs); closeSilently(rs);
// Indexes // Indexes
rs = metadata.getIndexInfo(null, schema, table, false, true); rs = metaData.getIndexInfo(null, schema, table, false, true);
indexes = Utils.newHashMap(); indexes = Utils.newHashMap();
while (rs.next()) { while (rs.next()) {
IndexInspector info = new IndexInspector(rs); IndexInspector info = new IndexInspector(rs);
if (info.type.equals(IndexType.UNIQUE) if (info.type.equals(IndexType.UNIQUE)
&& info.name.toLowerCase().startsWith("primary")) && info.name.toLowerCase().startsWith("primary")) {
// Skip PrimaryKey indexes // Skip PrimaryKey indexes
continue; continue;
if (indexes.containsKey(info.name)) }
if (indexes.containsKey(info.name)) {
indexes.get(info.name).addColumn(rs); indexes.get(info.name).addColumn(rs);
else } else {
indexes.put(info.name, info); indexes.put(info.name, info);
}
} }
closeSilently(rs); closeSilently(rs);
// Columns // Columns
rs = metadata.getColumns(null, schema, table, null); rs = metaData.getColumns(null, schema, table, null);
columns = Utils.newHashMap(); columns = Utils.newHashMap();
while (rs.next()) { while (rs.next()) {
ColumnInspector col = new ColumnInspector(); ColumnInspector col = new ColumnInspector();
...@@ -119,25 +124,25 @@ public class TableInspector { ...@@ -119,25 +124,25 @@ public class TableInspector {
col.type = rs.getString("TYPE_NAME"); col.type = rs.getString("TYPE_NAME");
col.clazz = ModelUtils.getClassType(col.type, dateClazz); col.clazz = ModelUtils.getClassType(col.type, dateClazz);
col.size = rs.getInt("COLUMN_SIZE"); col.size = rs.getInt("COLUMN_SIZE");
// Allow Null // Allow Null
try { try {
col.allowNull = (rs.getInt("NULLABLE") == DatabaseMetaData.columnNullable); col.allowNull = rs.getInt("NULLABLE") == DatabaseMetaData.columnNullable;
} catch (SQLException x) { } catch (SQLException x) {
} }
// AutoIncrement // AutoIncrement
try { try {
col.isAutoIncrement = rs.getBoolean("IS_AUTOINCREMENT"); col.isAutoIncrement = rs.getBoolean("IS_AUTOINCREMENT");
} catch (SQLException x) { } catch (SQLException x) {
} }
// Primary Key // Primary Key
if (primaryKeys.size() == 1) { if (primaryKeys.size() == 1) {
if (col.name.equalsIgnoreCase(primaryKeys.get(0))) if (col.name.equalsIgnoreCase(primaryKeys.get(0)))
col.isPrimaryKey = true; col.isPrimaryKey = true;
} }
// Default Value // Default Value
if (!col.isAutoIncrement) { if (!col.isAutoIncrement) {
try { try {
...@@ -158,7 +163,7 @@ public class TableInspector { ...@@ -158,7 +163,7 @@ public class TableInspector {
/** /**
* Generates a model (class definition) from this table. * Generates a model (class definition) from this table.
* The model includes indexes, primary keys, default values, maxLengths, * The model includes indexes, primary keys, default values, maxLengths,
* and allowNull information. * and allowNull information.
* <p> * <p>
* The caller may optionally set a destination package name, whether or not * The caller may optionally set a destination package name, whether or not
...@@ -180,13 +185,14 @@ public class TableInspector { ...@@ -180,13 +185,14 @@ public class TableInspector {
imports.add(JQTable.class.getCanonicalName()); imports.add(JQTable.class.getCanonicalName());
imports.add(JQIndex.class.getCanonicalName()); imports.add(JQIndex.class.getCanonicalName());
imports.add(JQColumn.class.getCanonicalName()); imports.add(JQColumn.class.getCanonicalName());
// Table Fields // Table Fields
StringBuilder fields = new StringBuilder(); StringBuilder fields = new StringBuilder();
List<ColumnInspector> sortedColumns = Utils.newArrayList(columns.values()); List<ColumnInspector> sortedColumns = Utils.newArrayList(columns.values());
Collections.sort(sortedColumns); Collections.sort(sortedColumns);
for (ColumnInspector col : sortedColumns) for (ColumnInspector col : sortedColumns) {
fields.append(generateColumn(imports, col, trimStrings)); fields.append(generateColumn(imports, col, trimStrings));
}
// Build Complete Class Definition // Build Complete Class Definition
StringBuilder model = new StringBuilder(); StringBuilder model = new StringBuilder();
...@@ -195,36 +201,38 @@ public class TableInspector { ...@@ -195,36 +201,38 @@ public class TableInspector {
model.append("package " + packageName + ";"); model.append("package " + packageName + ";");
model.append(eol).append(eol); model.append(eol).append(eol);
} }
// Imports // Imports
List<String> sortedImports = new ArrayList<String>(imports); List<String> sortedImports = new ArrayList<String>(imports);
Collections.sort(sortedImports); Collections.sort(sortedImports);
for (String imp : sortedImports) for (String imp : sortedImports) {
model.append("import ").append(imp).append(';').append(eol); model.append("import ").append(imp).append(';').append(eol);
}
model.append(eol); model.append(eol);
// @JQSchema // @JQSchema
if (annotateSchema && !isNullOrEmpty(schema)) { if (annotateSchema && !isNullOrEmpty(schema)) {
model.append('@').append(JQSchema.class.getSimpleName()); model.append('@').append(JQSchema.class.getSimpleName());
model.append('('); model.append('(');
AnnotationBuilder ap = new AnnotationBuilder(); AnnotationBuilder ap = new AnnotationBuilder();
ap.addParameter("name", schema); ap.addParameter("name", schema);
model.append(ap); model.append(ap);
model.append(')').append(eol); model.append(')').append(eol);
} }
// @JQTable // @JQTable
model.append('@').append(JQTable.class.getSimpleName()); model.append('@').append(JQTable.class.getSimpleName());
model.append('('); model.append('(');
// JQTable Annotation Parameters // JQTable Annotation Parameters
AnnotationBuilder ap = new AnnotationBuilder(); AnnotationBuilder ap = new AnnotationBuilder();
ap.addParameter("name", table); ap.addParameter("name", table);
if (primaryKeys.size() > 1) { if (primaryKeys.size() > 1) {
StringBuilder pk = new StringBuilder(); StringBuilder pk = new StringBuilder();
for (String key : primaryKeys) for (String key : primaryKeys) {
pk.append(key).append(' '); pk.append(key).append(' ');
}
pk.trimToSize(); pk.trimToSize();
ap.addParameter("primaryKey", pk.toString()); ap.addParameter("primaryKey", pk.toString());
} }
...@@ -232,7 +240,7 @@ public class TableInspector { ...@@ -232,7 +240,7 @@ public class TableInspector {
// Finish @JQTable annotation // Finish @JQTable annotation
model.append(ap); model.append(ap);
model.append(')').append(eol); model.append(')').append(eol);
// @JQIndex // @JQIndex
ap = new AnnotationBuilder(); ap = new AnnotationBuilder();
generateIndexAnnotations(ap, "standard", IndexType.STANDARD); generateIndexAnnotations(ap, "standard", IndexType.STANDARD);
...@@ -250,40 +258,42 @@ public class TableInspector { ...@@ -250,40 +258,42 @@ public class TableInspector {
String clazzName = ModelUtils.createClassName(table); String clazzName = ModelUtils.createClassName(table);
model.append(format("public class {0} '{'", clazzName)).append(eol); model.append(format("public class {0} '{'", clazzName)).append(eol);
model.append(eol); model.append(eol);
// Field Declarations // Field Declarations
model.append(fields); model.append(fields);
// Default Constructor // Default Constructor
model.append("\tpublic ").append(clazzName).append("() {").append(eol); model.append("\tpublic ").append(clazzName).append("() {").append(eol);
model.append("\t}").append(eol); model.append("\t}").append(eol);
// End of Class Body // End of Class Body
model.append('}'); model.append('}');
model.trimToSize(); model.trimToSize();
return model.toString(); return model.toString();
} }
/** /**
* Generates the specified index annotation. * Generates the specified index annotation.
* @param ap * @param ap
*/ */
void generateIndexAnnotations(AnnotationBuilder ap, String parameter, IndexType type) { void generateIndexAnnotations(AnnotationBuilder ap, String parameter, IndexType type) {
List<IndexInspector> list = getIndexes(type); List<IndexInspector> list = getIndexes(type);
if (list.size() == 0) if (list.size() == 0) {
// No matching indexes // No matching indexes
return; return;
}
if (list.size() == 1) { if (list.size() == 1) {
ap.addParameter(parameter, list.get(0).getColumnsString()); ap.addParameter(parameter, list.get(0).getColumnsString());
} else { } else {
List<String> parameters = Utils.newArrayList(); List<String> parameters = Utils.newArrayList();
for (IndexInspector index:list) for (IndexInspector index:list) {
parameters.add(index.getColumnsString()); parameters.add(index.getColumnsString());
}
ap.addParameter(parameter, parameters); ap.addParameter(parameter, parameters);
} }
} }
/** /**
* Returns indexes of a specific type from the map. * Returns indexes of a specific type from the map.
* <p> * <p>
...@@ -292,13 +302,15 @@ public class TableInspector { ...@@ -292,13 +302,15 @@ public class TableInspector {
*/ */
List<IndexInspector> getIndexes(IndexType type) { List<IndexInspector> getIndexes(IndexType type) {
List<IndexInspector> list = Utils.newArrayList(); List<IndexInspector> list = Utils.newArrayList();
for (IndexInspector index:indexes.values()) for (IndexInspector index:indexes.values()) {
if (index.type.equals(type)) if (index.type.equals(type)) {
list.add(index); list.add(index);
}
}
return list; return list;
} }
/** /**
* Generates a column field definition with annotations. * Generates a column field definition with annotations.
* <p> * <p>
...@@ -307,7 +319,7 @@ public class TableInspector { ...@@ -307,7 +319,7 @@ public class TableInspector {
* @param trimStrings * @param trimStrings
* @return * @return
*/ */
StatementBuilder generateColumn(Set<String> imports, ColumnInspector col, StatementBuilder generateColumn(Set<String> imports, ColumnInspector col,
boolean trimStrings) { boolean trimStrings) {
StatementBuilder sb = new StatementBuilder(); StatementBuilder sb = new StatementBuilder();
Class<?> clazz = col.clazz; Class<?> clazz = col.clazz;
...@@ -321,26 +333,26 @@ public class TableInspector { ...@@ -321,26 +333,26 @@ public class TableInspector {
// @JQColumn // @JQColumn
imports.add(clazz.getCanonicalName()); imports.add(clazz.getCanonicalName());
sb.append('@').append(JQColumn.class.getSimpleName()); sb.append('@').append(JQColumn.class.getSimpleName());
// JQColumn Annotation Parameters // JQColumn Annotation Parameters
AnnotationBuilder ap = new AnnotationBuilder(); AnnotationBuilder ap = new AnnotationBuilder();
// JQColumn.name // JQColumn.name
if (!col.name.equalsIgnoreCase(cname)) { if (!col.name.equalsIgnoreCase(cname)) {
ap.addParameter("name", col.name); ap.addParameter("name", col.name);
} }
// JQColumn.primaryKey // JQColumn.primaryKey
// Composite Primary Keys are annotated on the Table // Composite Primary Keys are annotated on the Table
if (col.isPrimaryKey && primaryKeys.size() == 1) { if (col.isPrimaryKey && primaryKeys.size() == 1) {
ap.addParameter("primaryKey=true"); ap.addParameter("primaryKey=true");
} }
// JQColumn.maxLength // JQColumn.maxLength
if ((clazz == String.class) && (col.size > 0) if ((clazz == String.class) && (col.size > 0)
&& (col.size < Integer.MAX_VALUE)) { && (col.size < Integer.MAX_VALUE)) {
ap.addParameter("maxLength", col.size); ap.addParameter("maxLength", col.size);
// JQColumn.trimStrings // JQColumn.trimStrings
if (trimStrings) { if (trimStrings) {
ap.addParameter("trimString=true"); ap.addParameter("trimString=true");
...@@ -351,16 +363,17 @@ public class TableInspector { ...@@ -351,16 +363,17 @@ public class TableInspector {
ap.addParameter("autoIncrement=true"); ap.addParameter("autoIncrement=true");
} }
} }
// JQColumn.allowNull // JQColumn.allowNull
if (!col.allowNull) { if (!col.allowNull) {
ap.addParameter("allowNull=false"); ap.addParameter("allowNull=false");
} }
// JQColumn.defaultValue // JQColumn.defaultValue
if (!isNullOrEmpty(col.defaultValue)) if (!isNullOrEmpty(col.defaultValue)) {
ap.addParameter("defaultValue=\"" + col.defaultValue + "\""); ap.addParameter("defaultValue=\"" + col.defaultValue + "\"");
}
// Add leading and trailing () // Add leading and trailing ()
if (ap.length() > 0) { if (ap.length() > 0) {
ap.insert(0, '('); ap.insert(0, '(');
...@@ -398,14 +411,14 @@ public class TableInspector { ...@@ -398,14 +411,14 @@ public class TableInspector {
<T> List<Validation> validate(TableDefinition<T> def, <T> List<Validation> validate(TableDefinition<T> def,
boolean throwError) { boolean throwError) {
List<Validation> remarks = Utils.newArrayList(); List<Validation> remarks = Utils.newArrayList();
// Model Class Definition Validation // Model Class Definition Validation
if (!Modifier.isPublic(def.getModelClass().getModifiers())) { if (!Modifier.isPublic(def.getModelClass().getModifiers())) {
remarks.add(ERROR(table, "SCHEMA", remarks.add(ERROR(table, "SCHEMA",
format("Class {0} MUST BE PUBLIC!", format("Class {0} MUST BE PUBLIC!",
def.getModelClass().getCanonicalName())).throwError(throwError)); def.getModelClass().getCanonicalName())).throwError(throwError));
} }
// Schema Validation // Schema Validation
if (!isNullOrEmpty(schema)) { if (!isNullOrEmpty(schema)) {
if (isNullOrEmpty(def.schemaName)) { if (isNullOrEmpty(def.schemaName)) {
...@@ -419,15 +432,17 @@ public class TableInspector { ...@@ -419,15 +432,17 @@ public class TableInspector {
schema)).throwError(throwError)); schema)).throwError(throwError));
} }
} }
// Index Validation // Index Validation
for (IndexInspector index:indexes.values()) for (IndexInspector index:indexes.values()) {
validate(remarks, def, index, throwError); validate(remarks, def, index, throwError);
}
// Field Column Validation
// Field Column Validation
List<FieldDefinition> fieldDefs = def.getFields(); List<FieldDefinition> fieldDefs = def.getFields();
for (FieldDefinition fieldDef : fieldDefs) for (FieldDefinition fieldDef : fieldDefs) {
validate(remarks, fieldDef, throwError); validate(remarks, fieldDef, throwError);
}
return remarks; return remarks;
} }
...@@ -456,39 +471,39 @@ public class TableInspector { ...@@ -456,39 +471,39 @@ public class TableInspector {
// Need to actually compare index types and columns within each index. // Need to actually compare index types and columns within each index.
// At this point my head was starting to hurt. // At this point my head was starting to hurt.
} }
/** /**
* Validates a column against the model's field definition. Checks for * Validates a column against the model's field definition. Checks for
* existence, supported type, type mapping, default value, defined lengths, * existence, supported type, type mapping, default value, defined lengths,
* primary key, autoincrement. * primary key, autoincrement.
* <p> * <p>
* @param remarks * @param remarks
* @param fieldDef * @param fieldDef
* @param throwError * @param throwError
*/ */
void validate(List<Validation> remarks, FieldDefinition fieldDef, void validate(List<Validation> remarks, FieldDefinition fieldDef,
boolean throwError) { boolean throwError) {
// Unknown Field // Unknown Field
String fname = forceUpperCase ? String fname = forceUpperCase ?
fieldDef.columnName.toUpperCase() : fieldDef.columnName; fieldDef.columnName.toUpperCase() : fieldDef.columnName;
if (!columns.containsKey(fname)) { if (!columns.containsKey(fname)) {
// Unknown column mapping! // Unknown column mapping!
remarks.add(ERROR(table, fieldDef, remarks.add(ERROR(table, fieldDef,
"Does not exist in database!").throwError(throwError)); "Does not exist in database!").throwError(throwError));
return; return;
} }
ColumnInspector col = columns.get(fname); ColumnInspector col = columns.get(fname);
Class<?> fieldClazz = fieldDef.field.getType(); Class<?> fieldClazz = fieldDef.field.getType();
Class<?> jdbcClazz = ModelUtils.getClassType(col.type, dateClazz); Class<?> jdbcClazz = ModelUtils.getClassType(col.type, dateClazz);
// Supported Type Check // Supported Type Check
// JaQu maps to VARCHAR for unsupported types. // JaQu maps to VARCHAR for unsupported types.
if (fieldDef.dataType.equals("VARCHAR") if (fieldDef.dataType.equals("VARCHAR")
&& (fieldClazz != String.class)) && (fieldClazz != String.class)) {
remarks.add(ERROR(table, fieldDef, remarks.add(ERROR(table, fieldDef,
"JaQu does not currently implement support for " "JaQu does not currently implement support for "
+ fieldClazz.getName()).throwError(throwError)); + fieldClazz.getName()).throwError(throwError));
}
// Number Types // Number Types
if (!fieldClazz.equals(jdbcClazz)) { if (!fieldClazz.equals(jdbcClazz)) {
if (Number.class.isAssignableFrom(fieldClazz)) { if (Number.class.isAssignableFrom(fieldClazz)) {
...@@ -507,27 +522,28 @@ public class TableInspector { ...@@ -507,27 +522,28 @@ public class TableInspector {
// String Types // String Types
if (fieldClazz == String.class) { if (fieldClazz == String.class) {
if ((fieldDef.maxLength != col.size) if ((fieldDef.maxLength != col.size)
&& (col.size < Integer.MAX_VALUE)) && (col.size < Integer.MAX_VALUE)) {
remarks.add(WARN(table, col, remarks.add(WARN(table, col,
format("{0}.maxLength={1}, ColumnMaxLength={2}", format("{0}.maxLength={1}, ColumnMaxLength={2}",
JQColumn.class.getSimpleName(), JQColumn.class.getSimpleName(),
fieldDef.maxLength, col.size))); fieldDef.maxLength, col.size)));
}
if (fieldDef.maxLength > 0 && !fieldDef.trimString) if (fieldDef.maxLength > 0 && !fieldDef.trimString) {
remarks.add(CONSIDER(table, col, remarks.add(CONSIDER(table, col,
format("{0}.truncateToMaxLength=true" format("{0}.truncateToMaxLength=true"
+ " will prevent RuntimeExceptions on" + " will prevent RuntimeExceptions on"
+ " INSERTs or UPDATEs, but will clip data!", + " INSERTs or UPDATEs, but will clip data!",
JQColumn.class.getSimpleName()))); JQColumn.class.getSimpleName())));
}
} }
// Numeric AutoIncrement // Numeric AutoIncrement
if (fieldDef.isAutoIncrement != col.isAutoIncrement) if (fieldDef.isAutoIncrement != col.isAutoIncrement) {
remarks.add(WARN(table, col, format("{0}.isAutoIncrement={1}" remarks.add(WARN(table, col, format("{0}.isAutoIncrement={1}"
+ " while Column autoIncrement={2}", + " while Column autoIncrement={2}",
JQColumn.class.getSimpleName(), fieldDef.isAutoIncrement, JQColumn.class.getSimpleName(), fieldDef.isAutoIncrement,
col.isAutoIncrement))); col.isAutoIncrement)));
}
// Last Check // Last Check
// Default Value... // Default Value...
if (!col.isAutoIncrement && !col.isPrimaryKey) { if (!col.isAutoIncrement && !col.isPrimaryKey) {
...@@ -541,19 +557,19 @@ public class TableInspector { ...@@ -541,19 +557,19 @@ public class TableInspector {
return; return;
} }
// Compare Model.defaultValue to Column.defaultValue // Compare Model.defaultValue to Column.defaultValue
if (isNullOrEmpty(fieldDef.defaultValue) if (isNullOrEmpty(fieldDef.defaultValue)
&& !isNullOrEmpty(col.defaultValue)) { && !isNullOrEmpty(col.defaultValue)) {
// Model.defaultValue is NULL, Column.defaultValue is NOT NULL // Model.defaultValue is NULL, Column.defaultValue is NOT NULL
remarks.add(WARN(table, col, format("{0}.defaultValue=\"\"" remarks.add(WARN(table, col, format("{0}.defaultValue=\"\""
+ " while Column default=\"{1}\"", + " while Column default=\"{1}\"",
JQColumn.class.getSimpleName(), col.defaultValue))); JQColumn.class.getSimpleName(), col.defaultValue)));
} else if (!isNullOrEmpty(fieldDef.defaultValue) } else if (!isNullOrEmpty(fieldDef.defaultValue)
&& isNullOrEmpty(col.defaultValue)) { && isNullOrEmpty(col.defaultValue)) {
// Column.defaultValue is NULL, Model.defaultValue is NOT NULL // Column.defaultValue is NULL, Model.defaultValue is NOT NULL
remarks.add(WARN(table, col, format("{0}.defaultValue=\"{1}\"" remarks.add(WARN(table, col, format("{0}.defaultValue=\"{1}\""
+ " while Column default=\"\"", + " while Column default=\"\"",
JQColumn.class.getSimpleName(), fieldDef.defaultValue))); JQColumn.class.getSimpleName(), fieldDef.defaultValue)));
} else if (!isNullOrEmpty(fieldDef.defaultValue) } else if (!isNullOrEmpty(fieldDef.defaultValue)
&& !isNullOrEmpty(col.defaultValue)) { && !isNullOrEmpty(col.defaultValue)) {
if (!fieldDef.defaultValue.equals(col.defaultValue)) { if (!fieldDef.defaultValue.equals(col.defaultValue)) {
// Model.defaultValue != Column.defaultValue // Model.defaultValue != Column.defaultValue
...@@ -563,18 +579,18 @@ public class TableInspector { ...@@ -563,18 +579,18 @@ public class TableInspector {
col.defaultValue))); col.defaultValue)));
} }
} }
// Sanity Check Model.defaultValue Literal Value // Sanity Check Model.defaultValue Literal Value
if (!ModelUtils.isValidDefaultValue(fieldDef.field.getType(), if (!ModelUtils.isValidDefaultValue(fieldDef.field.getType(),
fieldDef.defaultValue)) { fieldDef.defaultValue)) {
remarks.add(ERROR(table, col, remarks.add(ERROR(table, col,
format("{0}.defaultValue=\"{1}\" is invalid!!", format("{0}.defaultValue=\"{1}\" is invalid!!",
JQColumn.class.getSimpleName(), JQColumn.class.getSimpleName(),
fieldDef.defaultValue))); fieldDef.defaultValue)));
} }
} }
} }
/** /**
* Represents an index as it exists in the database. * Represents an index as it exists in the database.
* *
...@@ -588,20 +604,20 @@ public class TableInspector { ...@@ -588,20 +604,20 @@ public class TableInspector {
public IndexInspector(ResultSet rs) throws SQLException { public IndexInspector(ResultSet rs) throws SQLException {
name = rs.getString("INDEX_NAME"); name = rs.getString("INDEX_NAME");
// Determine Index Type // Determine Index Type
boolean hash = rs.getInt("TYPE") == DatabaseMetaData.tableIndexHashed; boolean hash = rs.getInt("TYPE") == DatabaseMetaData.tableIndexHashed;
boolean unique = !rs.getBoolean("NON_UNIQUE"); boolean unique = !rs.getBoolean("NON_UNIQUE");
if (!hash && !unique) if (!hash && !unique) {
type = IndexType.STANDARD; type = IndexType.STANDARD;
else if (hash && unique) } else if (hash && unique) {
type = IndexType.UNIQUE_HASH; type = IndexType.UNIQUE_HASH;
else if (unique) } else if (unique) {
type = IndexType.UNIQUE; type = IndexType.UNIQUE;
else if (hash) } else if (hash) {
type = IndexType.HASH; type = IndexType.HASH;
}
columns.add(rs.getString("COLUMN_NAME")); columns.add(rs.getString("COLUMN_NAME"));
} }
...@@ -618,40 +634,40 @@ public class TableInspector { ...@@ -618,40 +634,40 @@ public class TableInspector {
return sb.toString().trim(); return sb.toString().trim();
} }
} }
/** /**
* Represents a column as it exists in the database. * Represents a column as it exists in the database.
* *
*/ */
public static class ColumnInspector implements Comparable<ColumnInspector> { public static class ColumnInspector implements Comparable<ColumnInspector> {
String name = null; String name;
String type = null; String type;
int size = 0; int size;
boolean allowNull = false; boolean allowNull;
Class<?> clazz = null; Class<?> clazz;
boolean isPrimaryKey = false; boolean isPrimaryKey;
boolean isAutoIncrement = false; boolean isAutoIncrement;
String defaultValue = null; String defaultValue;
@Override
public int compareTo(ColumnInspector o) { public int compareTo(ColumnInspector o) {
if (isPrimaryKey && o.isPrimaryKey) if (isPrimaryKey && o.isPrimaryKey) {
// both primary sort by name // both primary sort by name
return name.compareTo(o.name); return name.compareTo(o.name);
else if (isPrimaryKey && !o.isPrimaryKey) } else if (isPrimaryKey && !o.isPrimaryKey) {
// primary first // primary first
return -1; return -1;
else if (!isPrimaryKey && o.isPrimaryKey) } else if (!isPrimaryKey && o.isPrimaryKey) {
// primary first // primary first
return 1; return 1;
else } else {
// Neither primary, sort by name // Neither primary, sort by name
return name.compareTo(o.name); return name.compareTo(o.name);
}
} }
} }
/** /**
* Convenience class based on StatementBuilder for creating the * Convenience class based on StatementBuilder for creating the
* annotation parameter list. * annotation parameter list.
* *
*/ */
...@@ -659,12 +675,12 @@ public class TableInspector { ...@@ -659,12 +675,12 @@ public class TableInspector {
AnnotationBuilder() { AnnotationBuilder() {
super(); super();
} }
void addParameter(String parameter) { void addParameter(String parameter) {
appendExceptFirst(", "); appendExceptFirst(", ");
append(parameter); append(parameter);
} }
<T> void addParameter(String parameter, T value) { <T> void addParameter(String parameter, T value) {
appendExceptFirst(", "); appendExceptFirst(", ");
append(parameter); append(parameter);
...@@ -675,20 +691,26 @@ public class TableInspector { ...@@ -675,20 +691,26 @@ public class TableInspector {
StatementBuilder flat = new StatementBuilder(); StatementBuilder flat = new StatementBuilder();
for (Object o:list) { for (Object o:list) {
flat.appendExceptFirst(", "); flat.appendExceptFirst(", ");
if (o instanceof String) if (o instanceof String) {
flat.append('\"'); flat.append('\"');
}
int todoEscape;
flat.append(o.toString().trim()); flat.append(o.toString().trim());
if (o instanceof String) if (o instanceof String) {
flat.append('\"'); flat.append('\"');
}
} }
append(flat); append(flat);
append(" }"); append(" }");
} else { } else {
if (value instanceof String) if (value instanceof String) {
append('\"'); append('\"');
}
int todoEscape;
append(value.toString().trim()); append(value.toString().trim());
if (value instanceof String) if (value instanceof String) {
append('\"'); append('\"');
}
} }
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论