Skip to content

Commit 129520a

Browse files
committed
refactor: 优化
Signed-off-by: zhouhao <[email protected]>
1 parent 1bd2fbe commit 129520a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/mapping/defaults/DefaultRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public String[] getProperties() {
7777
.stream()
7878
.filter(kv -> getTable().getColumn(kv.getKey()).isPresent())
7979
.map(Map.Entry::getValue)
80-
.distinct()
8180
.toArray(String[]::new);
8281
}
8382
return properties;

hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/metadata/AbstractTableOrViewMetadata.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ public RDBSchemaMetadata getSchema() {
142142
public void addColumn(RDBColumnMetadata column) {
143143
columnCache = null;
144144
column.setOwner(this);
145+
if (getDialect().isColumnToUpperCase()) {
146+
allColumns.put(column.getName().toUpperCase(), column);
147+
}
145148
allColumns.put(column.getName(), column);
146149
allColumns.put(column.getAlias(), column);
147150
allColumns.put(column.getRealName(), column);
@@ -196,7 +199,7 @@ public Optional<RDBColumnMetadata> findColumn(String name) {
196199
}
197200
Optional<RDBColumnMetadata> col = this.getColumn(name);
198201

199-
if(col.isPresent()){
202+
if (col.isPresent()) {
200203
return col;
201204
}
202205

@@ -210,7 +213,7 @@ private Optional<RDBColumnMetadata> findNestColumn(String name) {
210213
}
211214

212215
if (name.contains(".")) {
213-
String[] arr = StringUtils.getPlainName(StringUtils.split(name,'.'));
216+
String[] arr = StringUtils.getPlainName(StringUtils.split(name, '.'));
214217
if (arr.length == 2) { //table.name
215218
return findColumnFromSchema(schema, arr[0], arr[1]);
216219

@@ -241,11 +244,11 @@ private Optional<RDBColumnMetadata> findColumnFromSchema(RDBSchemaMetadata schem
241244
Optional<RDBColumnMetadata> col =
242245
schema.getTableOrView(tableName)
243246
.flatMap(meta -> meta.getColumn(column));
244-
if(col.isPresent()){
247+
if (col.isPresent()) {
245248
return col;
246249
}
247250
return getForeignKey(tableName) //查找外键关联信息
248-
.flatMap(key -> key.getTarget().getColumn(column));
251+
.flatMap(key -> key.getTarget().getColumn(column));
249252

250253
}
251254

0 commit comments

Comments
 (0)