fix: fix unit test and some code typos (#2717)

Author: chenliang15405

packages/dbgpt-app/src/dbgpt_app/scene/chat_data/chat_excel/excel_analyze/prompt.py

@@ -140,7 +140,7 @@
 	4.优先使用数据分析的方式回答，如果用户问题不涉及数据分析内容，你可以按你的理解进行回答
 	5.输出内容中sql部分转换为：
 	<api-call><name>[数据显示方式]</name><args><sql>\
-	[正确的duckdb数据分析sql]</sql></args></api- call> \
+	[正确的duckdb数据分析sql]</sql></args></api-call> \
 	这样的格式，参考返回格式要求
 	
 请一步一步思考，给出回答，并确保你的回答内容格式如下:

packages/dbgpt-app/src/dbgpt_app/scene/chat_data/chat_excel/excel_learning/chat.py

@@ -38,12 +38,11 @@ def __init__(
 
     @trace()
     async def generate_input_values(self) -> Dict:
-        # colunms, datas = self.excel_reader.get_sample_data()
-        colunms, datas = await blocking_func_to_async(
+        columns, datas = await blocking_func_to_async(
             self._executor, self.excel_reader.get_sample_data, self._curr_table
         )
-        self.prompt_template.output_parser.update(colunms)
-        datas.insert(0, colunms)
+        self.prompt_template.output_parser.update(columns)
+        datas.insert(0, columns)
 
         table_schema = await blocking_func_to_async(
             self._executor, self.excel_reader.get_create_table_sql, self._curr_table

packages/dbgpt-app/src/dbgpt_app/scene/chat_knowledge/v1/prompt.py

@@ -25,7 +25,7 @@
      表格格式:|xxx|xxx|xxx|, 代码格式:```xxx```.
      2.如果无法从提供的内容中获取答案, 请说: "知识库中提供的内容不足以回答此问题" \
      禁止胡乱编造.
-     3.回答的时候最好按照1.2.3.点进行总结, 并以markdwon格式显示.
+     3.回答的时候最好按照1.2.3.点进行总结, 并以markdown格式显示.
             已知内容: 
             {context}
             问题:
@@ -43,7 +43,7 @@
     question, state clearly: "The content provided in the knowledge base is not enough \
     to answer this question," and avoid making up answers.
     3.When responding, it is best to summarize the points in the order of 1, 2, 3, And \
-    displayed in markdwon format.
+    displayed in markdown format.
             known information: 
             {context}
             question:

packages/dbgpt-core/src/dbgpt/datasource/rdbms/base.py

@@ -744,7 +744,7 @@ def __sql_parse(self, sql):
         sql = sql.strip()
         parsed = sqlparse.parse(sql)[0]
         sql_type = parsed.get_type()
-        if sql_type == "CREATE":
+        if sql_type == "CREATE" or sql_type == "DROP":
             table_name = self._extract_table_name_from_ddl(parsed)
         else:
             table_name = parsed.get_name()

packages/dbgpt-ext/src/dbgpt_ext/datasource/rdbms/conn_oracle.py

@@ -110,6 +110,10 @@ def from_uri_db(
 
         return cls.from_uri(db_url, engine_args=engine_args, **kwargs)
 
+    def get_simple_fields(self, table_name):
+        """Get column fields about specified table."""
+        return self.get_fields(table_name)
+
     def get_fields(self, table_name: str, db_name=None) -> List[Tuple]:
         with self.session_scope() as session:
             query = f"""

tests/intetration_tests/datasource/test_conn_mysql.py

@@ -20,7 +20,7 @@
 
 import pytest
 
-from dbgpt.datasource.rdbms.conn_mysql import MySQLConnector
+from dbgpt_ext.datasource.rdbms.conn_mysql import MySQLConnector
 
 _create_table_sql = """
             CREATE TABLE IF NOT EXISTS `test` (

tests/intetration_tests/datasource/test_conn_oracle.py

@@ -1,11 +1,10 @@
 """
-Run unit test with command: pytest dbgpt/datasource/rdbms/tests/test_conn_mysql.py
-docker run -itd --name mysql-test -p 3307:3306 -e MYSQL_ROOT_PASSWORD=12345678 mysql:5.7
-mysql -h 127.0.0.1 -uroot -p -P3307
-Enter password:
-Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 2
-Server version: 5.7.41 MySQL Community Server (GPL)
+Run unit test with command: pytest dbgpt/datasource/rdbms/tests/test_conn_oracle.py
+
+Install Oracle With Docker
+docker run -d -p 1521:1521  -p 5502:5500   -e ORACLE_SID=ORCLCDB  -e ORACLE_PDB=ORCLPDB
+-e ORACLE_PWD=oracle  -e ORACLE_EDITION=standard  -e ORACLE_CHARACTERSET=AL32UTF8
+--name  oracle_19c registry.cn-hangzhou.aliyuncs.com/zhuyijun/oracle:19c
 
 Copyright (c) 2000, 2023, Oracle and/or its affiliates.
 
@@ -50,14 +49,21 @@ def db():
 
 def test_get_usable_table_names(db):
     db.run(_create_table_sql)
-    db.run("COMMIT")
+    # db.run("COMMIT") DML not need commit
+    db._inspector.clear_cache()
+    print(db._sync_tables_from_db())
     table_names = db.get_usable_table_names()
     assert "TEST" in map(str.upper, table_names)
 
 
 def test_get_table_info(db):
     db.run(_create_table_sql)
-    db.run("COMMIT")
+    # clean cache
+    db._inspector.clear_cache()
+    db._metadata.clear()
+    db._metadata.reflect(bind=db._engine)
+    # refresh table
+    print(db._sync_tables_from_db())
     table_info = db.get_table_info()
     assert "CREATE TABLE TEST" in table_info.upper()
 
@@ -70,7 +76,7 @@ def test_run_no_throw(db):
 
 def test_get_index_empty(db):
     db.run(_create_table_sql)
-    db.run("COMMIT")
+    # db.run("COMMIT")
     indexes = db.get_indexes("TEST")
     assert indexes == []
 
@@ -110,4 +116,4 @@ def test_get_database_lists(db):
         pdb_names = [name[0] for name in databases[1:]]
     else:
         pdb_names = ["ORCL"]
-    assert any(name in ("ORCLPDB1", "ORCL") for name in pdb_names)
+    assert any(name in ("ORCLPDB", "ORCL") for name in pdb_names)