Skip to content

Commit 6fde1fe

Browse files
johnbywaterjohnbywater
committed
Added tests for MSSQL.
1 parent 167a943 commit 6fde1fe

11 files changed

Lines changed: 417 additions & 47 deletions

File tree

‎.github/workflows/github-actions.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,22 @@ jobs:
9595
path: /home/runner/.local
9696
key: os-${{ matrix.os }}-python-${{ matrix.python-version }}-${{matrix.sqlalchemy-version }}-${{ hashFiles('**/poetry.lock') }}-poetry-1.6.1
9797

98-
- name: Setup database
98+
- name: Setup PostgreSQL database
9999
run: |
100100
PGPASSWORD=postgres psql -c 'CREATE DATABASE eventsourcing_sqlalchemy;' -U postgres -h localhost
101101
PGPASSWORD=postgres psql -c "CREATE USER eventsourcing WITH PASSWORD 'eventsourcing';" -U postgres -h localhost
102102
PGPASSWORD=postgres psql -c "ALTER DATABASE eventsourcing_sqlalchemy OWNER TO eventsourcing;" -U postgres -h localhost
103103
PGPASSWORD=postgres psql eventsourcing_sqlalchemy -c "CREATE SCHEMA myschema AUTHORIZATION eventsourcing" -U postgres -h localhost
104104
105+
- name: Install Microsoft ODBC
106+
run: sudo ACCEPT_EULA=Y apt-get install msodbcsql18 -y
107+
108+
- name: Setup MSSQL database
109+
run: |
110+
make start-mssql
111+
sleep 10
112+
make create-mssql-database
113+
make create-mssql-schema
105114
106115
- name: Print SQLAlchemy version
107116
run: poetry run python -c "import sqlalchemy; print(f'Using sqlalchemy {sqlalchemy.__version__}')"

‎Makefile‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,58 @@ build:
117117
.PHONY: publish
118118
publish:
119119
$(POETRY) publish
120+
121+
.PHONY: start-mssql
122+
start-mssql:
123+
docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=Password1" \
124+
-p 1433:1433 --name sql2022 --hostname localhost \
125+
-d \
126+
mcr.microsoft.com/mssql/server:2022-latest
127+
128+
.PHONY: stop-mssql
129+
stop-mssql:
130+
docker stop sql2022
131+
docker rm sql2022
132+
133+
.PHONY: mssql-sqlcmd-help
134+
mssql-sqlcmd-help:
135+
docker exec -it sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
136+
-?
137+
138+
.PHONY: mssql-sqlcmd
139+
mssql-sqlcmd:
140+
docker exec -it sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
141+
-S localhost -U sa -P Password1 -No
142+
143+
.PHONY: create-mssql-database
144+
create-mssql-database:
145+
docker exec sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
146+
-S localhost -U sa -P Password1 -No \
147+
-q "CREATE DATABASE eventsourcing_sqlalchemy;"
148+
149+
.PHONY: drop-mssql-database
150+
drop-mssql-database:
151+
docker exec sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
152+
-S localhost -U sa -P Password1 -No \
153+
-q "DROP DATABASE eventsourcing_sqlalchemy;"
154+
155+
.PHONY: create-mssql-schema
156+
create-mssql-schema:
157+
docker exec sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
158+
-S localhost -U sa -P Password1 -No \
159+
-d eventsourcing_sqlalchemy \
160+
-q "CREATE SCHEMA myschema;"
161+
162+
.PHONY: drop-mssql-schema
163+
drop-mssql-schema:
164+
docker exec sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
165+
-S localhost -U sa -P Password1 -No \
166+
-d eventsourcing_sqlalchemy \
167+
-q "DROP SCHEMA myschema;"
168+
169+
.PHONY: drop-mssql-table
170+
drop-mssql-table:
171+
docker exec sql2022 "/opt/mssql-tools18/bin/sqlcmd" \
172+
-S localhost -U sa -P Password1 -No \
173+
-d eventsourcing_sqlalchemy \
174+
-q "DROP TABLE $(name);"

‎eventsourcing_sqlalchemy/datastore.py‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ def __init__(
5555
def __enter__(self) -> Session:
5656
if self.nested_level == 0:
5757
if not self.is_scoped_session:
58+
# This doesn't work to ensure commit and insert order are the same:
59+
# if self.commit:
60+
# self.session.execute(text("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE"))
61+
# else:
62+
# self.session.begin()
5863
self.session.begin()
5964
self.nested_level += 1
6065
return self.session
@@ -77,26 +82,26 @@ def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None: # noqa C9
7782
if not self.is_scoped_session:
7883
self.session.commit()
7984
except sqlalchemy.exc.InterfaceError as e:
80-
raise InterfaceError from e
85+
raise InterfaceError(e) from e
8186
except sqlalchemy.exc.DataError as e:
82-
raise DataError from e
87+
raise DataError(e) from e
8388
except sqlalchemy.exc.OperationalError as e:
8489
if isinstance(e.args[0], sqlite3.OperationalError) and self.lock:
8590
pass
8691
else:
87-
raise OperationalError from e
92+
raise OperationalError(e) from e
8893
except sqlalchemy.exc.IntegrityError as e:
89-
raise IntegrityError from e
94+
raise IntegrityError(e) from e
9095
except sqlalchemy.exc.InternalError as e:
91-
raise InternalError from e
96+
raise InternalError(e) from e
9297
except sqlalchemy.exc.ProgrammingError as e:
93-
raise ProgrammingError from e
98+
raise ProgrammingError(e) from e
9499
except sqlalchemy.exc.NotSupportedError as e:
95-
raise NotSupportedError from e
100+
raise NotSupportedError(e) from e
96101
except sqlalchemy.exc.DatabaseError as e:
97-
raise DatabaseError from e
102+
raise DatabaseError(e) from e
98103
except sqlalchemy.exc.SQLAlchemyError as e:
99-
raise PersistenceError from e
104+
raise PersistenceError(e) from e
100105
finally:
101106
if self.lock is not None:
102107
# print(get_ident(), "releasing lock")

‎eventsourcing_sqlalchemy/recorders.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,27 @@ def _insert_events(
9595

9696
def _lock_table(self, session: Session) -> None:
9797
assert self.datastore.engine is not None
98+
events_table_name = self.events_table_name
99+
if self.schema_name is not None:
100+
events_table_name = f"{self.schema_name}.{events_table_name}"
98101
if self.datastore.engine.dialect.name == "postgresql":
99-
events_table_name = self.events_table_name
100-
if self.schema_name is not None:
101-
events_table_name = f"{self.schema_name}.{events_table_name}"
102102
session.execute(text(f"LOCK TABLE {events_table_name} IN EXCLUSIVE MODE"))
103+
elif self.datastore.engine.dialect.name == "mssql":
104+
pass
105+
# This doesn't work to ensure insert and commit order are the same:
106+
# session.connection(execution_options={"isolation_level": "SERIALIZABLE"})
107+
# This avoids deadlocks from TABLOCK but together still doesn't ensure
108+
# insert and commit order are the same:
109+
# session.execute(text(f"SET LOCK_TIMEOUT 18;"))
110+
# This gives deadlocks:
111+
# session.execute(
112+
# text(
113+
# f"DECLARE @HideSelectFromOutput TABLE ( DoNotOutput INT); " # noqa E702
114+
# f"INSERT INTO @HideSelectFromOutput "
115+
# f"SELECT TOP 1 Id FROM {events_table_name} "
116+
# f"WITH (TABLOCK);" # noqa E231
117+
# )
118+
# )
103119

104120
def select_events(
105121
self,

0 commit comments

Comments
 (0)