summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Mulligan <git@craigmulligan.com>2023-02-01 17:32:45 +0200
committerGitHub <noreply@github.com>2023-02-01 21:32:45 +0600
commitf907105b72ccfdcd2cab9b9b949f6ba9464dfe50 (patch)
tree9b5aeae3a14beb4ec32671878606efe6ca12cece
parentc62bdee24eaaef5335e729d1cd2d57d936e17632 (diff)
downloadkombu-f907105b72ccfdcd2cab9b9b949f6ba9464dfe50.tar.gz
support sqla v2.0 (#1651)
* support sqla v2.0 * Update kombu/transport/sqlalchemy/models.py * update (#1652) --------- Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
-rw-r--r--kombu/transport/sqlalchemy/__init__.py4
-rw-r--r--kombu/transport/sqlalchemy/models.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/kombu/transport/sqlalchemy/__init__.py b/kombu/transport/sqlalchemy/__init__.py
index 2b779485..a61c8ea8 100644
--- a/kombu/transport/sqlalchemy/__init__.py
+++ b/kombu/transport/sqlalchemy/__init__.py
@@ -56,7 +56,7 @@ import threading
from json import dumps, loads
from queue import Empty
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, text
from sqlalchemy.exc import OperationalError
from sqlalchemy.orm import sessionmaker
@@ -169,7 +169,7 @@ class Channel(virtual.Channel):
def _get(self, queue):
obj = self._get_or_create(queue)
if self.session.bind.name == 'sqlite':
- self.session.execute('BEGIN IMMEDIATE TRANSACTION')
+ self.session.execute(text('BEGIN IMMEDIATE TRANSACTION'))
try:
msg = self.session.query(self.message_cls) \
.with_for_update() \
diff --git a/kombu/transport/sqlalchemy/models.py b/kombu/transport/sqlalchemy/models.py
index be3fcfa0..edff572a 100644
--- a/kombu/transport/sqlalchemy/models.py
+++ b/kombu/transport/sqlalchemy/models.py
@@ -6,7 +6,7 @@ import datetime
from sqlalchemy import (Boolean, Column, DateTime, ForeignKey, Index, Integer,
Sequence, SmallInteger, String, Text)
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import relationship
from sqlalchemy.schema import MetaData
try:
@@ -37,7 +37,7 @@ class Queue:
@declared_attr
def messages(cls):
- return relation('Message', backref='queue', lazy='noload')
+ return relationship('Message', backref='queue', lazy='noload')
class Message: