Merge pull request #308 from tillahoffmann/deps

Update dependencies.

Author: tillahoffmann

mssql/testcontainers/mssql/__init__.py

@@ -15,8 +15,9 @@ class SqlServerContainer(DbContainer):
             >>> from testcontainers.mssql import SqlServerContainer
 
             >>> with SqlServerContainer() as mssql:
-            ...    e = sqlalchemy.create_engine(mssql.get_connection_url())
-            ...    result = e.execute("select @@VERSION")
+            ...    engine = sqlalchemy.create_engine(mssql.get_connection_url())
+            ...    with engine.begin() as connection:
+            ...        result = connection.execute(sqlalchemy.text("select @@VERSION"))
     """
 
     def __init__(self, image: str = "mcr.microsoft.com/mssql/server:2019-latest", user: str = "SA",

mssql/tests/test_mssql.py

@@ -6,13 +6,15 @@ def test_docker_run_mssql():
     image = 'mcr.microsoft.com/azure-sql-edge'
     dialect = 'mssql+pymssql'
     with SqlServerContainer(image, dialect=dialect) as mssql:
-        e = sqlalchemy.create_engine(mssql.get_connection_url())
-        result = e.execute('select @@servicename')
-        for row in result:
-            assert row[0] == 'MSSQLSERVER'
+        engine = sqlalchemy.create_engine(mssql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text('select @@servicename'))
+            for row in result:
+                assert row[0] == 'MSSQLSERVER'
 
     with SqlServerContainer(image, password="1Secure*Password2", dialect=dialect) as mssql:
-        e = sqlalchemy.create_engine(mssql.get_connection_url())
-        result = e.execute('select @@servicename')
-        for row in result:
-            assert row[0] == 'MSSQLSERVER'
+        engine = sqlalchemy.create_engine(mssql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text('select @@servicename'))
+            for row in result:
+                assert row[0] == 'MSSQLSERVER'

mysql/testcontainers/mysql/__init__.py

@@ -32,9 +32,10 @@ class MySqlContainer(DbContainer):
             >>> from testcontainers.mysql import MySqlContainer
 
             >>> with MySqlContainer('mysql:5.7.17') as mysql:
-            ...     e = sqlalchemy.create_engine(mysql.get_connection_url())
-            ...     result = e.execute("select version()")
-            ...     version, = result.fetchone()
+            ...     engine = sqlalchemy.create_engine(mysql.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select version()"))
+            ...         version, = result.fetchone()
     """
 
     def __init__(self, image: str = "mysql:latest", MYSQL_USER: Optional[str] = None,

mysql/tests/test_mysql.py

@@ -10,18 +10,20 @@
 def test_docker_run_mysql():
     config = MySqlContainer('mysql:5.7.17')
     with config as mysql:
-        e = sqlalchemy.create_engine(mysql.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].startswith('5.7.17')
+        engine = sqlalchemy.create_engine(mysql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].startswith('5.7.17')
 
 
 def test_docker_run_mariadb():
     with MySqlContainer("mariadb:10.6.5").maybe_emulate_amd64() as mariadb:
-        e = sqlalchemy.create_engine(mariadb.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].startswith('10.6.5')
+        engine = sqlalchemy.create_engine(mariadb.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].startswith('10.6.5')
 
 
 def test_docker_env_variables():

oracle/testcontainers/oracle/__init__.py

@@ -13,8 +13,9 @@ class OracleDbContainer(DbContainer):
             >>> from testcontainers.oracle import OracleDbContainer
 
             >>> with OracleDbContainer() as oracle:
-            ...     e = sqlalchemy.create_engine(oracle.get_connection_url())
-            ...     result = e.execute("select * from V$VERSION")
+            ...     engine = sqlalchemy.create_engine(oracle.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select * from V$VERSION"))
     """
 
     def __init__(self, image: str = "wnameless/oracle-xe-11g-r2:latest", **kwargs) -> None:

oracle/tests/test_oracle.py

@@ -5,12 +5,13 @@
 
 @pytest.mark.skip(reason="needs oracle client libraries unavailable on Travis")
 def test_docker_run_oracle():
+    versions = {'Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production',
+                'PL/SQL Release 11.2.0.2.0 - Production',
+                'CORE\t11.2.0.2.0\tProduction',
+                'TNS for Linux: Version 11.2.0.2.0 - Production',
+                'NLSRTL Version 11.2.0.2.0 - Production'}
     with OracleDbContainer() as oracledb:
-        e = sqlalchemy.create_engine(oracledb.get_connection_url())
-        result = e.execute("select * from V$VERSION")
-        versions = {'Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production',
-                    'PL/SQL Release 11.2.0.2.0 - Production',
-                    'CORE\t11.2.0.2.0\tProduction',
-                    'TNS for Linux: Version 11.2.0.2.0 - Production',
-                    'NLSRTL Version 11.2.0.2.0 - Production'}
-        assert {row[0] for row in result} == versions
+        engine = sqlalchemy.create_engine(oracledb.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select * from V$VERSION"))
+            assert {row[0] for row in result} == versions

postgres/testcontainers/postgres/__init__.py

@@ -31,9 +31,10 @@ class PostgresContainer(DbContainer):
 
             >>> postgres_container = PostgresContainer("postgres:9.5")
             >>> with postgres_container as postgres:
-            ...     e = sqlalchemy.create_engine(postgres.get_connection_url())
-            ...     result = e.execute("select version()")
-            ...     version, = result.fetchone()
+            ...     engine = sqlalchemy.create_engine(postgres.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select version()"))
+            ...         version, = result.fetchone()
             >>> version
             'PostgreSQL 9.5...'
     """

postgres/tests/test_postgres.py

@@ -5,14 +5,16 @@
 def test_docker_run_postgres():
     postgres_container = PostgresContainer("postgres:9.5")
     with postgres_container as postgres:
-        e = sqlalchemy.create_engine(postgres.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].lower().startswith("postgresql 9.5")
+        engine = sqlalchemy.create_engine(postgres.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].lower().startswith("postgresql 9.5")
 
 
 def test_docker_run_postgres_with_driver_pg8000():
     postgres_container = PostgresContainer("postgres:9.5", driver="pg8000")
     with postgres_container as postgres:
-        e = sqlalchemy.create_engine(postgres.get_connection_url())
-        e.execute("select 1=1")
+        engine = sqlalchemy.create_engine(postgres.get_connection_url())
+        with engine.begin() as connection:
+            connection.execute(sqlalchemy.text("select 1=1"))