wutta/wuttjamaican
3
0
Fork 0
Code Issues Activity

feat: remove version cap for SQLAlchemy (allow 1.x or 2.x)

Browse source 
hoping this does not break things terribly, but it needs to be done
regardless so will just have to pick up pieces if so
This commit is contained in:
Lance Edgar 2025-06-29 19:38:29 -05:00
parent 706ea80926
commit 650dc8ff4d
5 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/test_install.py
View file

@ -92,6 +92,8 @@ class TestInstallHandler(ConfigTestCase):
except ImportError:
pytest.skip("test is not relevant without sqlalchemy")
from wuttjamaican.db.util import SA2
handler = self.make_handler()
def prompt_generic(info, default=None, is_password=False):
@ -112,6 +114,8 @@ class TestInstallHandler(ConfigTestCase):
self.assertRaises(RuntimeError, handler.get_dbinfo)
sys.exit.assert_called_once_with(1)
seekrit = '***' if SA2 else 'seekrit'
# good dbinfo
sys.exit.reset_mock()
test_db_connection.return_value = None
@ -119,7 +123,7 @@ class TestInstallHandler(ConfigTestCase):
self.assertFalse(sys.exit.called)
rprint.assert_called_with("[bold green]good[/bold green]")
self.assertEqual(str(dbinfo['dburl']),
'postgresql+psycopg2://poser:seekrit@localhost:5432/poser')
f'postgresql+psycopg2://poser:{seekrit}@localhost:5432/poser')
def test_make_db_url(self):
try:
@ -127,13 +131,16 @@ class TestInstallHandler(ConfigTestCase):
except ImportError:
pytest.skip("test is not relevant without sqlalchemy")
from wuttjamaican.db.util import SA2
handler = self.make_handler()
seekrit = '***' if SA2 else 'seekrit'
url = handler.make_db_url('postgresql', 'localhost', '5432', 'poser', 'poser', 'seekrit')
self.assertEqual(str(url), 'postgresql+psycopg2://poser:seekrit@localhost:5432/poser')
self.assertEqual(str(url), f'postgresql+psycopg2://poser:{seekrit}@localhost:5432/poser')
url = handler.make_db_url('mysql', 'localhost', '3306', 'poser', 'poser', 'seekrit')
self.assertEqual(str(url), 'mysql+mysqlconnector://poser:seekrit@localhost:3306/poser')
self.assertEqual(str(url), f'mysql+mysqlconnector://poser:{seekrit}@localhost:3306/poser')
def test_test_db_connection(self):
try: