Merge "Add standalone orm.close_all method and deprecate SessionMaker.close_all"

6 files changed, 56 insertions, 5 deletions

diff --git a/test/ext/declarative/test_basic.py b/test/ext/declarative/test_basic.py
index 990262f2c..0f0035019 100644
--- a/test/ext/declarative/test_basic.py
+++ b/test/ext/declarative/test_basic.py
@@ -19,6 +19,7 @@ from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import backref
 from sqlalchemy.orm import class_mapper
 from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import column_property
 from sqlalchemy.orm import composite
 from sqlalchemy.orm import configure_mappers
@@ -60,7 +61,7 @@ class DeclarativeTestBase(
         Base = decl.declarative_base(testing.db)
 
     def teardown(self):
-        Session.close_all()
+        close_all_sessions()
         clear_mappers()
         Base.metadata.drop_all()
 
diff --git a/test/ext/declarative/test_inheritance.py b/test/ext/declarative/test_inheritance.py
index 97c7dcd7c..17b915da0 100644
--- a/test/ext/declarative/test_inheritance.py
+++ b/test/ext/declarative/test_inheritance.py
@@ -10,6 +10,7 @@ from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.declarative import has_inherited_table
 from sqlalchemy.orm import class_mapper
 from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import configure_mappers
 from sqlalchemy.orm import create_session
 from sqlalchemy.orm import deferred
@@ -39,7 +40,7 @@ class DeclarativeTestBase(fixtures.TestBase, testing.AssertsExecutionResults):
         Base = decl.declarative_base(testing.db)
 
     def teardown(self):
-        Session.close_all()
+        close_all_sessions()
         clear_mappers()
         Base.metadata.drop_all()
 
diff --git a/test/ext/declarative/test_mixin.py b/test/ext/declarative/test_mixin.py
index 7fec77270..ef9bbd354 100644
--- a/test/ext/declarative/test_mixin.py
+++ b/test/ext/declarative/test_mixin.py
@@ -11,6 +11,7 @@ from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import base as orm_base
 from sqlalchemy.orm import class_mapper
 from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import column_property
 from sqlalchemy.orm import configure_mappers
 from sqlalchemy.orm import create_session
@@ -41,7 +42,7 @@ class DeclarativeTestBase(fixtures.TestBase, testing.AssertsExecutionResults):
         Base = decl.declarative_base(testing.db)
 
     def teardown(self):
-        Session.close_all()
+        close_all_sessions()
         clear_mappers()
         Base.metadata.drop_all()
 
diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py
index 2b53e5ae8..ea8ae764d 100644
--- a/test/orm/test_eager_relations.py
+++ b/test/orm/test_eager_relations.py
@@ -14,6 +14,7 @@ from sqlalchemy import testing
 from sqlalchemy import text
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm import backref
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import column_property
 from sqlalchemy.orm import contains_eager
 from sqlalchemy.orm import create_session
@@ -5054,7 +5055,7 @@ class CyclicalInheritingEagerTestTwo(
         session.add_all([rscott, alien, brunner])
         session.commit()
 
-        session.close_all()
+        close_all_sessions()
         self.d = session.query(Director).options(joinedload("*")).first()
         assert len(list(session)) == 3
 
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 1f36578df..03b18df6a 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -7,6 +7,7 @@ from sqlalchemy import String
 from sqlalchemy import testing
 from sqlalchemy.orm import attributes
 from sqlalchemy.orm import backref
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import create_session
 from sqlalchemy.orm import exc as orm_exc
 from sqlalchemy.orm import joinedload
@@ -148,6 +149,51 @@ class TransScopingTest(_fixtures.FixtureTest):
 class SessionUtilTest(_fixtures.FixtureTest):
     run_inserts = None
 
+    def test_close_all_sessions(self):
+        users, User = self.tables.users, self.classes.User
+
+        mapper(User, users)
+
+        s1 = Session()
+        u1 = User()
+        s1.add(u1)
+
+        s2 = Session()
+        u2 = User()
+        s2.add(u2)
+
+        assert u1 in s1
+        assert u2 in s2
+
+        close_all_sessions()
+
+        assert u1 not in s1
+        assert u2 not in s2
+
+    def test_session_close_all_deprecated(self):
+        users, User = self.tables.users, self.classes.User
+
+        mapper(User, users)
+
+        s1 = Session()
+        u1 = User()
+        s1.add(u1)
+
+        s2 = Session()
+        u2 = User()
+        s2.add(u2)
+
+        assert u1 in s1
+        assert u2 in s2
+
+        with assertions.expect_deprecated(
+                r"The Session.close_all\(\) method is deprecated and will "
+                "be removed in a future release. "):
+            Session.close_all()
+
+        assert u1 not in s1
+        assert u2 not in s2
+
     def test_object_session_raises(self):
         User = self.classes.User
 
diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py
index 1374d55d8..a4ee2d804 100644
--- a/test/orm/test_subquery_relations.py
+++ b/test/orm/test_subquery_relations.py
@@ -7,6 +7,7 @@ from sqlalchemy import String
 from sqlalchemy import testing
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm import clear_mappers
+from sqlalchemy.orm import close_all_sessions
 from sqlalchemy.orm import create_session
 from sqlalchemy.orm import deferred
 from sqlalchemy.orm import joinedload
@@ -2666,7 +2667,7 @@ class CyclicalInheritingEagerTestTwo(
         session.add_all([rscott, alien, brunner])
         session.commit()
 
-        session.close_all()
+        close_all_sessions()
         d = session.query(Director).options(subqueryload("*")).first()
         assert len(list(session)) == 3