lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Looly 2020-12-23 16:30:31 +08:00
parent 9a181facc2
commit 718c6f48ab
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,7 +3,7 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.5.5 (2020-12-22) # 5.5.5 (2020-12-23)
### 新特性 ### 新特性
* 【core 】 URLUtil.normalize新增重载（pr#233@Gitee） * 【core 】 URLUtil.normalize新增重载（pr#233@Gitee）
@ -15,6 +15,7 @@
### Bug修复 ### Bug修复
* 【core 】 FileUtil.isSub相对路径判断问题（pr#1315@Github） * 【core 】 FileUtil.isSub相对路径判断问题（pr#1315@Github）
* 【core 】 TreeUtil增加空判定（issue#I2ACCW@Gitee） * 【core 】 TreeUtil增加空判定（issue#I2ACCW@Gitee）
* 【db 】 解决Hive获取表名失败问题（issue#I2AGLU@Gitee）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.5.4 (2020-12-16) # 5.5.4 (2020-12-16)

7
hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
View File

@ -154,7 +154,12 @@ public class HandleHelper {
row.put(meta.getColumnLabel(i), getColumnValue(rs, i, type, null)); row.put(meta.getColumnLabel(i), getColumnValue(rs, i, type, null));
} }
if (withMetaInfo) { if (withMetaInfo) {
row.setTableName(meta.getTableName(1)); try {
row.setTableName(meta.getTableName(1));
} catch (SQLException ignore){
//issue#I2AGLU@Gitee
// Hive等NoSQL中无表的概念，此处报错，跳过。
}
row.setFieldNames(row.keySet()); row.setFieldNames(row.keySet());
} }
return row; return row;

2
hutool-extra/pom.xml
View File

@ -19,7 +19,7 @@
<properties> <properties>
<!-- versions --> <!-- versions -->
<velocity.version>2.2</velocity.version> <velocity.version>2.2</velocity.version>
<beetl.version>3.2.4.RELEASE</beetl.version> <beetl.version>3.3.1.RELEASE</beetl.version>
<rythm.version>1.3.0</rythm.version> <rythm.version>1.3.0</rythm.version>
<freemarker.version>2.3.30</freemarker.version> <freemarker.version>2.3.30</freemarker.version>
<enjoy.version>4.9.03</enjoy.version> <enjoy.version>4.9.03</enjoy.version>