Skip to content

Commit cd3192c

Browse files
Reset Snowflake connection to None when closed
1 parent 20a0296 commit cd3192c

5 files changed

Lines changed: 20 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
## v1.11.1 5/20/26
3+
- Reset Snowflake connection to None when it's closed
4+
25
## v1.11.0 4/27/26
36
- Allow Snowflake client to connect using any parameters
47

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "nypl_py_utils"
7-
version = "1.11.0"
7+
version = "1.11.1"
88
authors = [
99
{ name="Aaron Friedman", email="aaronfriedman@nypl.org" },
1010
]

src/nypl_py_utils/classes/s3_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def set_cache(self, state):
5858
except ClientError as e:
5959
error_msg = (
6060
f'Error uploading {self.resource} to S3 bucket '
61-
f'{self.s3_bucket}: {e}')
61+
f'{self.bucket}: {e}')
6262
self.logger.error(error_msg)
6363
raise S3ClientError(error_msg) from None
6464

@@ -83,7 +83,7 @@ def upload_file(self, content, file_path):
8383
except ClientError as e:
8484
error_msg = (
8585
f'Error uploading {file_path} to S3 bucket '
86-
f'{self.s3_bucket}: {e}')
86+
f'{self.bucket}: {e}')
8787
self.logger.error(error_msg)
8888
raise S3ClientError(error_msg) from None
8989

src/nypl_py_utils/classes/snowflake_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def close_connection(self):
8787
"""Closes the connection"""
8888
self.logger.info('Closing Snowflake connection')
8989
self.conn.close()
90+
self.conn = None
9091

9192

9293
class SnowflakeClientError(Exception):

tests/test_snowflake_client.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,27 @@ def test_execute_query(
3838
def test_execute_query_with_exception(
3939
self, mock_snowflake_conn, test_instance, mocker):
4040
test_instance.connect()
41+
test_conn = test_instance.conn
4142

4243
mock_cursor = mocker.MagicMock()
4344
mock_cursor.execute.side_effect = Exception()
44-
test_instance.conn.cursor.return_value = mock_cursor
45+
test_conn.cursor.return_value = mock_cursor
4546

4647
with pytest.raises(SnowflakeClientError):
4748
test_instance.execute_query('test query')
4849

4950
mock_cursor.close.assert_called()
50-
test_instance.conn.close.assert_called_once()
51+
test_conn.close.assert_called_once()
52+
53+
def test_close_connection(self, mock_snowflake_conn, test_instance, mocker):
54+
assert test_instance.conn is None
5155

52-
def test_close_connection(self, mock_snowflake_conn, test_instance):
5356
test_instance.connect()
57+
58+
test_conn = test_instance.conn
59+
assert test_conn is not None
60+
5461
test_instance.close_connection()
55-
test_instance.conn.close.assert_called_once()
62+
63+
test_conn.close.assert_called_once()
64+
assert test_instance.conn is None

0 commit comments

Comments
 (0)