refactor: Remove legacy Query object from test cases and docs

code changes by cline, manually reviewed.

Author: winwinashwin

docs/queries.md

@@ -4,24 +4,26 @@ You can query history models just like any other sqlalchemy declarative model.
 
 ```python
 >>> from sqlalchemy_history import version_class
+>>> import sqlalchemy as sa
 >>> ArticleVersion = version_class(Article)
->>> session.query(ArticleVersion).filter_by(name=u'some name').all()
+>>> session.scalars(sa.select(ArticleVersion).filter_by(name=u'some name')).all()
 ```
 
 ## How many transactions have been executed?
 
 ```python
 >>> from sqlalchemy_history import transaction_class
+>>> import sqlalchemy as sa
 >>> Transaction = transaction_class(Article)
->>> Transaction.query.count()
+>>> session.scalar(sa.select(sa.func.count()).select_from(Transaction))
 ```
 
 ## Querying for entities of a class at a given revision
 
 In the following example we find all articles which were affected by transaction 33.
 
 ```python
->>> session.query(ArticleVersion).filter_by(transaction_id=33)
+>>> session.scalars(sa.select(ArticleVersion).filter_by(transaction_id=33)).all()
 ```
 
 ## Querying for transactions, at which entities of a given class changed
@@ -30,13 +32,14 @@ In this example we find all transactions which affected any instance of 'Article
 
 ```python
 >>> TransactionChanges = Article.__versioned__['transaction_changes']
->>> entries = (
-...     session.query(Transaction)
-...     .innerjoin(Transaction.changes)
-...     .filter(
+>>> statement = (
+...     sa.select(Transaction)
+...     .join(Transaction.changes)
+...     .where(
 ...         TransactionChanges.entity_name.in_(['Article'])
 ...     )
 ... )
+... entries = session.scalars(statement).all()
 ```
 
 ## Querying for versions of entity that modified given property
@@ -46,5 +49,5 @@ PropertyModTrackerPlugin.
 
 ```python
 >>> ArticleVersion = version_class(Article)
->>> session.query(ArticleHistory).filter(ArticleVersion.name_mod).all()
+>>> session.scalars(sa.select(ArticleHistory).filter(ArticleVersion.name_mod)).all()
 ```

docs/revert.md

@@ -28,7 +28,7 @@ One of the major benefits of SQLAlchemy-History is its ability to revert changes
 >>> session.commit()
 >>> version.revert()
 >>> session.commit() # article lives again!
->>> session.query(Article).first()
+>>> session.scalars(sa.select(Article).limit(1)).first()
 ```
 
 ## Revert relationships
@@ -64,15 +64,15 @@ Now lets say some user first adds an article with couple of tags:
 Then lets say another user deletes one of the tags:
 
 ```python
->>> tag = session.query(Tag).filter_by(name=u'Interesting')
+>>> tag = session.scalar(sa.select(Tag).where(Tag.name == "Interesting"))
 >>> session.delete(tag)
 >>> session.commit()
 ```
 
 Now the first user wants to set the article back to its original state. It can be achieved as follows (notice how we use the relations parameter):
 
 ```python
->>> article = session.query(Article).get(1)
+>>> article = session.get(Article, 1)
 >>> article.versions[0].revert(relations=['tags'])
 >>> session.commit()
 ```

docs/transactions.md

@@ -9,7 +9,7 @@ Transaction can be queried just like any other sqlalchemy declarative model.
 ```python
 >>> from sqlalchemy_history import transaction_class
 >>> Transaction = transaction_class(Article)
->>> session.query(Transaction).all() # find all transactions
+>>> session.scalars(sa.select(Transaction)).all() # find all transactions
 ```
 
 ## UnitOfWork

tests/builders/test_table_builder.py

@@ -16,7 +16,7 @@ def test_assigns_foreign_keys_for_versions(self):
         self.session.add(article)
         self.session.commit()
         cls = version_class(self.Tag)
-        version = self.session.query(cls).first()
+        version = self.session.scalars(sa.select(cls)).first()
         assert version.name == "some tag"
         assert version.id == 1
         assert version.article_id == 1

tests/inheritance/test_concrete_inheritance.py

@@ -80,8 +80,8 @@ def test_transaction_changed_entities(self):
         self.session.add(article)
         self.session.commit()
         Transaction = versioning_manager.transaction_cls
-        transaction = (
-            self.session.query(Transaction).order_by(sa.sql.expression.desc(Transaction.issued_at))
+        transaction = self.session.scalars(
+            sa.select(Transaction).order_by(sa.sql.expression.desc(Transaction.issued_at))
         ).first()
         assert transaction.entity_names == ["Article"]
         assert transaction.changed_entities

tests/inheritance/test_join_table_inheritance.py

@@ -75,7 +75,7 @@ def test_with_polymorphic(self):
         self.session.add(article)
         self.session.commit()
 
-        version_obj = self.session.query(self.TextItemVersion).first()
+        version_obj = self.session.scalars(sa.select(self.TextItemVersion)).first()
         assert isinstance(version_obj, self.ArticleVersion)
 
     def test_consecutive_insert_and_delete(self):

tests/inheritance/test_single_table_inheritance.py

@@ -78,8 +78,8 @@ def test_transaction_changed_entities(self):
         self.session.add(article)
         self.session.commit()
         Transaction = versioning_manager.transaction_cls
-        transaction = (
-            self.session.query(Transaction).order_by(sa.sql.expression.desc(Transaction.issued_at))
+        transaction = self.session.scalars(
+            sa.select(Transaction).order_by(sa.sql.expression.desc(Transaction.issued_at))
         ).first()
         assert transaction.entity_names == ["Article"]
         assert transaction.changed_entities

tests/plugins/test_activity.py

@@ -62,7 +62,7 @@ def test_create_activity_with_pk(self):
         self.session.commit()
         self.create_activity(not_id_model)
         self.session.commit()
-        activity = self.session.query(versioning_manager.activity_cls).first()
+        activity = self.session.scalars(sa.select(versioning_manager.activity_cls)).first()
         assert activity
         assert activity.transaction_id
         assert activity.object == not_id_model
@@ -82,7 +82,7 @@ def test_create_activity(self):
         self.session.flush()
         self.create_activity(article)
         self.session.commit()
-        activity = self.session.query(versioning_manager.activity_cls).first()
+        activity = self.session.scalars(sa.select(versioning_manager.activity_cls)).first()
         assert activity
         assert activity.transaction_id
         assert activity.object == article
@@ -99,11 +99,9 @@ def test_delete_activity(self):
         )
         self.session.add(activity)
         self.session.commit()
-        versions = (
-            self.session.query(self.ArticleVersion)
-            .order_by(sa.desc(self.ArticleVersion.transaction_id))
-            .all()
-        )
+        versions = self.session.scalars(
+            sa.select(self.ArticleVersion).order_by(sa.desc(self.ArticleVersion.transaction_id))
+        ).all()
         assert activity
         assert activity.transaction_id
         assert activity.object is None
@@ -126,8 +124,8 @@ def test_activity_queries(self):
         )
         self.session.add(activity)
         self.session.commit()
-        activities = self.session.query(Activity).filter(
-            sa.or_(Activity.object == article, Activity.target == article)
+        activities = self.session.scalars(
+            sa.select(Activity).filter(sa.or_(Activity.object == article, Activity.target == article))
         )
         assert activities.count() == 2
 
@@ -198,7 +196,9 @@ def test_activity_target(self):
         )
         self.session.add(activity)
         self.session.commit()
-        activity = self.session.query(versioning_manager.activity_cls).filter_by(id=activity.id).one()
+        activity = self.session.scalars(
+            sa.select(versioning_manager.activity_cls).filter_by(id=activity.id)
+        ).one()
         assert activity
         assert activity.transaction_id
         assert activity.object == tag

tests/plugins/test_null_delete.py

@@ -1,3 +1,4 @@
+import sqlalchemy as sa
 from sqlalchemy_history.plugins import NullDeletePlugin
 from tests import TestCase
 
@@ -15,7 +16,7 @@ def _delete(self):
 
     def test_stores_operation_type(self):
         self._delete()
-        versions = self.session.query(self.ArticleVersion).all()
+        versions = self.session.scalars(sa.select(self.ArticleVersion)).all()
         assert versions[1].operation_type == 2
 
 
@@ -24,7 +25,7 @@ class TestDeleteWithoutStoreDataAtDelete(DeleteTestCase):
 
     def test_creates_versions_on_delete(self):
         self._delete()
-        versions = self.session.query(self.ArticleVersion).all()
+        versions = self.session.scalars(sa.select(self.ArticleVersion)).all()
         assert len(versions) == 2
         assert versions[1].name is None
         assert versions[1].content is None

tests/plugins/test_property_mod_tracker.py

@@ -55,7 +55,9 @@ def test_mod_properties_with_delete(self):
         self.session.delete(user)
         self.session.commit()
         UserVersion = version_class(self.User)
-        version = (self.session.query(UserVersion).order_by(sa.desc(UserVersion.transaction_id))).first()
+        version = self.session.scalars(
+            sa.select(UserVersion).order_by(sa.desc(UserVersion.transaction_id))
+        ).first()
         assert version.age_mod
         assert version.name_mod