]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Revert "search for pickle failures"
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 13 May 2022 14:53:07 +0000 (10:53 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 13 May 2022 14:53:07 +0000 (10:53 -0400)
This reverts commit 48ccecbe69795753baac1ca6d351c1af5ebcdd7b.

not being careful w/ the commandline as I eat breakfast today

lib/sqlalchemy/testing/pickleable.py
test/orm/_fixtures.py
test/orm/test_selectin_relations.py

index fb02157780ecd67bcb77a0aa99c932685c042250..04405e539749e3277b4c3d3681b00df00b2a11cb 100644 (file)
@@ -20,14 +20,6 @@ class Order(fixtures.ComparableEntity):
     pass
 
 
-class Item(fixtures.ComparableEntity):
-    pass
-
-
-class Keyword(fixtures.ComparableEntity):
-    pass
-
-
 class Dingaling(fixtures.ComparableEntity):
     pass
 
index 64a86ce7e59f77ae494002a83af5f824a22f962d..6715cb7feae203ad1d9b5224fd3751daae01cee5 100644 (file)
@@ -396,23 +396,6 @@ class FixtureTest(fixtures.MappedTest):
         return CannedResults(self)
 
 
-class PickleFixtureMixin(object):
-    @classmethod
-    def setup_classes(cls):
-        from sqlalchemy.testing import pickleable
-
-        cls.classes.update(
-            {
-                "User": pickleable.User,
-                "Order": pickleable.Order,
-                "Address": pickleable.Address,
-                "Item": pickleable.Item,
-                "Keyword": pickleable.Keyword,
-                "Dingaling": pickleable.Dingaling,
-            }
-        )
-
-
 class CannedResults(object):
     """Built on demand, instances use mappers in effect at time of call."""
 
index 5df1c00e64e261807fe25b750ffcf7eec0bf0d6e..3e44abe88f5b252eecdcb8f6236ba4c946c8905d 100644 (file)
@@ -1,5 +1,3 @@
-import pickle
-
 import sqlalchemy as sa
 from sqlalchemy import bindparam
 from sqlalchemy import ForeignKey
@@ -45,11 +43,7 @@ from .inheritance._poly_fixtures import Paperwork
 from .inheritance._poly_fixtures import Person
 
 
-class EagerTest(
-    _fixtures.PickleFixtureMixin,
-    _fixtures.FixtureTest,
-    testing.AssertsCompiledSQL,
-):
+class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL):
     run_inserts = "once"
     run_deletes = None
 
@@ -765,17 +759,8 @@ class EagerTest(
         with fixture_session() as sess:
 
             def go():
-                result = (
-                    sess.query(User).options(*opts).order_by(User.id).all()
-                )
-                eq_(
-                    result,
-                    self.static.user_item_keyword_result,
-                )
-
-                print(f"pickling User structure based on: {opts}")
                 eq_(
-                    pickle.loads(pickle.dumps(result)),
+                    sess.query(User).options(*opts).order_by(User.id).all(),
                     self.static.user_item_keyword_result,
                 )