Skip to content

Commit dedb62a

Browse files
committed
Merge branch 'development' into pytest
# Conflicts: # pysimplesql/pysimplesql.py
2 parents d494d67 + d29cfc0 commit dedb62a

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

pysimplesql/pysimplesql.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -7473,7 +7473,9 @@ class Sqlserver(SQLDriver):
74737473
def __init__(
74747474
self, host, user, password, database, sql_script=None, sql_commands=None
74757475
):
7476-
super().__init__(name="Sqlserver", table_quote="[]", placeholder="?")
7476+
super().__init__(
7477+
name="Sqlserver", requires=["pyodbc"], table_quote="[]", placeholder="?"
7478+
)
74777479

74787480
self.import_required_modules()
74797481

ruff.toml

+1
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@ ignore = [
6565
"I",
6666
]
6767
"doc_examples/*" = ["F821"]
68+
"tests/*" = ["BLE001", "F405", "PT011", "PT012", "PT015", "PT017", "SIM114"]
6869
"pysimplesql/language_pack.py" = ["E501"]
6970
"pysimplesql/theme_pack.py" = ["E501"]

tests/sqldriver_test.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,20 @@ def sqlserver_container():
9595
def driver(request):
9696
driver_class = request.param
9797

98+
# Use an in-memory database for sqlite tests
9899
if driver_class == ss.Driver.sqlite:
99-
return driver_class(
100-
db_path=":memory:"
101-
) # Use an in-memory database for sqlite tests
102-
elif driver_class == ss.Driver.flatfile:
100+
return driver_class(db_path=":memory:")
101+
if driver_class == ss.Driver.flatfile:
103102
return driver_class(file_path="test.csv")
104-
elif driver_class == ss.Driver.mysql:
103+
if driver_class == ss.Driver.mysql:
105104
return driver_class(**mysql_docker)
106-
elif driver_class == ss.Driver.postgres:
105+
if driver_class == ss.Driver.postgres:
107106
return driver_class(**postgres_docker)
108-
elif driver_class == ss.Driver.sqlserver:
107+
if driver_class == ss.Driver.sqlserver:
109108
return driver_class(**sqlserver_docker)
110-
elif driver_class == ss.Driver.msaccess:
109+
if driver_class == ss.Driver.msaccess:
111110
return driver_class(database_file="test.accdb")
112-
else:
113-
raise NotImplementedError("Driver class not supported in tests.")
111+
raise NotImplementedError("Driver class not supported in tests.")
114112

115113

116114
# --------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)