Skip to content

Commit

Permalink
fix: improve error msg (#997)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiashenC authored Aug 30, 2023
1 parent 8706ad3 commit 5d3abbb
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 0 deletions.
5 changes: 5 additions & 0 deletions evadb/executor/use_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ def exec(self, *args, **kwargs) -> Iterator[Batch]:
self._database_name
)

if db_catalog_entry is None:
raise ExecutorError(
f"{self._database_name} data source does not exist. Use CREATE DATABASE to add a new data source."
)

handler = get_database_handler(
db_catalog_entry.engine,
**db_catalog_entry.params,
Expand Down
43 changes: 43 additions & 0 deletions test/integration_tests/short/test_use_executor.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# coding=utf-8
# Copyright 2018-2023 EvaDB
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import unittest
from test.util import get_evadb_for_testing, shutdown_ray

from evadb.executor.executor_utils import ExecutorError
from evadb.server.command_handler import execute_query_fetch_all


class CreateDatabaseTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.evadb = get_evadb_for_testing()
# reset the catalog manager before running each test
cls.evadb.catalog().reset()

@classmethod
def tearDownClass(cls):
shutdown_ray()

def test_use_should_raise_executor_error(self):
query = """USE not_available_ds {
SELECT * FROM table
}"""

with self.assertRaises(ExecutorError):
execute_query_fetch_all(self.evadb, query)


if __name__ == "__main__":
unittest.main()

0 comments on commit 5d3abbb

Please # to comment.