diff --git a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java index fd74d55..418f453 100644 --- a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java +++ b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java @@ -275,6 +275,13 @@ private void configureSession(Map sessionConfMap) throws HiveSQL throw new HiveSQLException(e); } } else if (key.startsWith("use:")) { + try { + if (sessionHive.getDatabase(entry.getValue()) == null) { + throw new HiveSQLException("Database " + entry.getValue() + " does not exist"); + } + } catch (HiveException e) { + throw new HiveSQLException(e); + } SessionState.get().setCurrentDatabase(entry.getValue()); } else { sessionConf.verifyAndSet(key, entry.getValue());