jan
/
wallabag-kindle-consumer
mirror of https://github.com/janLo/wallabag-kindle-consumer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #14 from jludwig/fix-update-sqlalchemy-support 

Update: SQLAlchemy and PostgreSQL Compatibility Enhancements
This commit is contained in:
Jan Losinski 2023-12-31 14:25:14 +01:00 committed by GitHub
parent 2afbf652dc 6ea2a00bfe
commit e69f5c182a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -5,3 +5,4 @@ aiohttp_jinja2
aiohttp aiohttp
sqlalchemy sqlalchemy
logbook logbook
psycopg2-binary

2
wallabag_kindle_consumer/consumer.py
View File

@ -60,7 +60,7 @@ class Consumer:
await asyncio.gather(*fetches) await asyncio.gather(*fetches)
session.commit() session.commit()
jobs = [self.process_job(job, session) for job in session.query(Job).options(joinedload('user'))] jobs = [self.process_job(job, session) for job in session.query(Job).options(joinedload(Job.user))]
await asyncio.gather(*jobs) await asyncio.gather(*jobs)
session.commit() session.commit()

4
wallabag_kindle_consumer/models.py
View File

@ -28,8 +28,8 @@ class Job(Base):
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(Integer, primary_key=True, autoincrement=True)
article = Column(Integer) article = Column(Integer)
title = Column(String) title = Column(String)
user_name = Column(Integer, ForeignKey("user.name")) user_name = Column(String, ForeignKey("user.name"))
format = Column(Enum('pdf', 'mobi', 'epub')) format = Column(Enum('pdf', 'mobi', 'epub', name='format_enum'))
class ContextSession: class ContextSession: