From 718c6f48ab533574f3b670fc1a25fe28bb07fa94 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Wed, 23 Dec 2020 16:30:31 +0800
Subject: [PATCH] fix bugs

---
 CHANGELOG.md                                               | 3 ++-
 .../src/main/java/cn/hutool/db/handler/HandleHelper.java   | 7 ++++++-
 hutool-extra/pom.xml                                       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a42db8bd..b6dfb104c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.5.5 (2020-12-22)
+# 5.5.5 (2020-12-23)
 
 ### 新特性
 * 【core   】     URLUtil.normalize新增重载（pr#233@Gitee）
@@ -15,6 +15,7 @@
 ### Bug修复
 * 【core   】     FileUtil.isSub相对路径判断问题（pr#1315@Github）
 * 【core   】     TreeUtil增加空判定（issue#I2ACCW@Gitee）
+* 【db     】     解决Hive获取表名失败问题（issue#I2AGLU@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.5.4 (2020-12-16)
diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java b/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
index 5fb86e344..0a3ce2a95 100644
--- a/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
+++ b/hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
@@ -154,7 +154,12 @@ public class HandleHelper {
 			row.put(meta.getColumnLabel(i), getColumnValue(rs, i, type, null));
 		}
 		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());
 		}
 		return row;
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index c760a920d..e1f6d2b76 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -19,7 +19,7 @@
 	<properties>
 		<!-- versions -->
 		<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>
 		<freemarker.version>2.3.30</freemarker.version>
 		<enjoy.version>4.9.03</enjoy.version>