GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-19 19:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1364 from billduan/fix_sql_response_print

Browse Source 
fix: support None/dict/list format when printing sql response
This commit is contained in:
debugtalk
2022-06-17 12:24:25 +08:00
committed by GitHub
parent 769213a5ab 385e1c8281
commit c77bcd02c0
4 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
httprunner/database/engine.py
View File

@@ -13,7 +13,7 @@ class DBEngine(object):
"""
engine = create_engine(db_uri)
self.session = sessionmaker(bind=engine)()
self.session = sessionmaker(bind=engine, autocommit=True)()
@staticmethod
def value_decode(row: dict):
@@ -38,11 +38,12 @@ class DBEngine(object):
def _fetch(self, query, size=-1, commit=True):
result = self.session.execute(query)
self.session.commit() if commit else 0
if query.upper()[:6] == "SELECT":
if size < 0:
al = result.fetchall()
al = [dict(el) for el in al]
for el in al:
self.value_decode(el)
return al or None
elif size == 1:
on = dict(result.fetchone())
@@ -51,6 +52,8 @@ class DBEngine(object):
else:
mny = result.fetchmany(size)
mny = [dict(el) for el in mny]
for el in mny:
self.value_decode(el)
return mny or None
elif query.upper()[:6] in ("UPDATE", "DELETE", "INSERT"):
return {"rowcount": result.rowcount}
@@ -75,4 +78,7 @@ class DBEngine(object):
if __name__ == "__main__":
db = DBEngine(f"mysql+pymysql://xxxxx:xxxxx@10.0.0.1:3306/dbname?charset=utf8mb4")
# db = DBEngine(f"mysql+pymysql://xxxxx:xxxxx@10.0.0.1:3306/dbname?charset=utf8mb4")
db = DBEngine(f"sqlite:////Users/bytedance/HttpRunner/examples/data/sqlite.db")
print(db.fetchmany("select* from student", 5))
print(db.fetchmany("select* from student", 5))

33
httprunner/step_sql_request.py
View File

@@ -105,7 +105,12 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
if USE_ALLURE:
import allure
allure.attach(sql_request_print, name="sql request details", attachment_type=allure.attachment_type.TEXT)
allure.attach(
sql_request_print,
name="sql request details",
attachment_type=allure.attachment_type.TEXT,
)
logger.info(f"Executing SQL: {parsed_request_dict['sql']}")
if step.sql_request.method == SqlMethodEnum.FETCHONE:
sql_resp = runner.db_engine.fetchone(parsed_request_dict["sql"])
@@ -125,15 +130,31 @@ def run_step_sql_request(runner: HttpRunner, step: TStep) -> StepResult:
raise SqlMethodNotSupport(
f"step.sql_request.method {parsed_request_dict['method']} not support"
)
# log response
sql_response_print = "====== sql response details ======\n"
for k, v in sql_resp.items():
v = utils.omit_long_data(v)
sql_response_print += f"{k}: {repr(v)}\n"
if isinstance(sql_resp, dict):
for k, v in sql_resp.items():
v = utils.omit_long_data(v)
sql_response_print += f"{k}: {repr(v)}\n"
elif isinstance(sql_resp, list):
sql_response_print += f"count: {len(sql_resp)}\n"
sql_response_print += "-" * 34 + "\n"
for el in sql_resp:
for k, v in el.items():
v = utils.omit_long_data(v)
sql_response_print += f"{k}: {repr(v)}\n"
sql_response_print += "-" * 34 + "\n"
elif sql_resp is None:
sql_response_print += "None\n"
if USE_ALLURE:
import allure
allure.attach(sql_request_print, name="sql response details", attachment_type=allure.attachment_type.TEXT)
allure.attach(
sql_response_print,
name="sql response details",
attachment_type=allure.attachment_type.TEXT,
)
resp_obj = SqlResponseObject(sql_resp, parser=runner.parser)
step_variables["sql_response"] = resp_obj