agatha/maubot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

varchar to text

Browse Source 
https://github.com/maubot/maubot/issues/98

I am unsure if
`from sqlalchemy import Column, String, Boolean, ForeignKey, Text`

the "String" isn't needed anymore, I think but not sure
This commit is contained in:
G2G2G2G 2020-12-10 19:20:43 -06:00 committed by GitHub
parent cfa831c463
commit 6ec1654e37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maubot/db.py
View File

@ -31,10 +31,10 @@ from .config import Config
class DBPlugin(Base): class DBPlugin(Base):
__tablename__ = "plugin" __tablename__ = "plugin"
id: str = Column(String(255), primary_key=True) id: str = Column(Text, primary_key=True)
type: str = Column(String(255), nullable=False) type: str = Column(Text, nullable=False)
enabled: bool = Column(Boolean, nullable=False, default=False) enabled: bool = Column(Boolean, nullable=False, default=False)
primary_user: UserID = Column(String(255), primary_user: UserID = Column(Text,
ForeignKey("client.id", onupdate="CASCADE", ondelete="RESTRICT"), ForeignKey("client.id", onupdate="CASCADE", ondelete="RESTRICT"),
nullable=False) nullable=False)
config: str = Column(Text, nullable=False, default='') config: str = Column(Text, nullable=False, default='')
@ -51,21 +51,21 @@ class DBPlugin(Base):
class DBClient(Base): class DBClient(Base):
__tablename__ = "client" __tablename__ = "client"
id: UserID = Column(String(255), primary_key=True) id: UserID = Column(Text, primary_key=True)
homeserver: str = Column(String(255), nullable=False) homeserver: str = Column(Text, nullable=False)
access_token: str = Column(Text, nullable=False) access_token: str = Column(Text, nullable=False)
device_id: DeviceID = Column(String(255), nullable=True) device_id: DeviceID = Column(Text, nullable=True)
enabled: bool = Column(Boolean, nullable=False, default=False) enabled: bool = Column(Boolean, nullable=False, default=False)
next_batch: SyncToken = Column(String(255), nullable=False, default="") next_batch: SyncToken = Column(Text, nullable=False, default="")
filter_id: FilterID = Column(String(255), nullable=False, default="") filter_id: FilterID = Column(Text, nullable=False, default="")
sync: bool = Column(Boolean, nullable=False, default=True) sync: bool = Column(Boolean, nullable=False, default=True)
autojoin: bool = Column(Boolean, nullable=False, default=True) autojoin: bool = Column(Boolean, nullable=False, default=True)
online: bool = Column(Boolean, nullable=False, default=True) online: bool = Column(Boolean, nullable=False, default=True)
displayname: str = Column(String(255), nullable=False, default="") displayname: str = Column(Text, nullable=False, default="")
avatar_url: ContentURI = Column(String(255), nullable=False, default="") avatar_url: ContentURI = Column(Text, nullable=False, default="")
@classmethod @classmethod
def all(cls) -> Iterable['DBClient']: def all(cls) -> Iterable['DBClient']:
@ -90,7 +90,7 @@ def init(config: Config) -> Engine:
log.warning("alembic_version table not found, but client and plugin tables found. " log.warning("alembic_version table not found, but client and plugin tables found. "
"Assuming pre-Alembic database and inserting version.") "Assuming pre-Alembic database and inserting version.")
db.execute("CREATE TABLE IF NOT EXISTS alembic_version (" db.execute("CREATE TABLE IF NOT EXISTS alembic_version ("
" version_num VARCHAR(32) PRIMARY KEY" " version_num TEXT PRIMARY KEY"
");") ");")
db.execute("INSERT INTO alembic_version VALUES ('d295f8dcfa64');") db.execute("INSERT INTO alembic_version VALUES ('d295f8dcfa64');")
else: else: