1 Commits

Author SHA1 Message Date
David Markowitz
40af39cec5 Update SQLAlchemy version to 2.0.40
fixes an issue with models on newer versions of python
2025-09-29 18:44:52 -07:00

View File

@@ -139,7 +139,6 @@ class Account(db.Model, UserMixin):
unique=True unique=True
) )
# ND Exclusive
email = db.Column( email = db.Column(
db.Unicode(255), db.Unicode(255),
nullable=True, nullable=True,
@@ -147,7 +146,6 @@ class Account(db.Model, UserMixin):
unique=False unique=False
) )
# ND Exclusive
email_confirmed_at = db.Column(db.DateTime()) email_confirmed_at = db.Column(db.DateTime())
password = db.Column( password = db.Column(
@@ -168,7 +166,6 @@ class Account(db.Model, UserMixin):
server_default='0' server_default='0'
) )
# ND Exclusive
active = db.Column( active = db.Column(
mysql.BOOLEAN, mysql.BOOLEAN,
nullable=False, nullable=False,
@@ -218,7 +215,7 @@ class Account(db.Model, UserMixin):
db.session.delete(self) db.session.delete(self)
db.session.commit() db.session.commit()
# ND Exclusive
class AccountInvitation(db.Model): class AccountInvitation(db.Model):
__tablename__ = 'account_invites' __tablename__ = 'account_invites'
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
@@ -459,34 +456,17 @@ class Leaderboard(db.Model):
passive_deletes=True passive_deletes=True
) )
primaryScore = db.Column( time = db.Column(
mysql.BIGINT(unsigned=True), mysql.BIGINT(unsigned=True),
nullable=False, nullable=False,
server_default='0' server_default='0'
) )
secondaryScore = db.Column( score = db.Column(
mysql.BIGINT(unsigned=True), mysql.BIGINT(unsigned=True),
nullable=False, nullable=False,
server_default='0' server_default='0'
) )
tertiaryScore = db.Column(
mysql.BIGINT(unsigned=True),
nullable=False,
server_default='0'
)
numWins = db.Column(
mysql.INTEGER(unsigned=True),
nullable=False,
server_default='0'
)
timesPlayed = db.Column(
mysql.INTEGER(unsigned=True),
nullable=False,
server_default='0'
)
def save(self): def save(self):
db.session.add(self) db.session.add(self)
@@ -506,7 +486,7 @@ class Mail(db.Model):
) )
sender_id = db.Column( sender_id = db.Column(
mysql.BIGINT, mysql.INTEGER,
nullable=False nullable=False
) )
@@ -604,15 +584,12 @@ class PetNames(db.Model):
mysql.TEXT, mysql.TEXT,
nullable=False nullable=False
) )
# ND Exclusive
approved = db.Column( approved = db.Column(
mysql.INTEGER(unsigned=True), mysql.INTEGER(unsigned=True),
nullable=False, nullable=False,
server_default='0' server_default='0'
) )
# ND Exclusive
owner_id = db.Column( owner_id = db.Column(
mysql.BIGINT, mysql.BIGINT,
nullable=True nullable=True
@@ -744,7 +721,7 @@ class Property(db.Model):
class UGC(db.Model): class UGC(db.Model):
__tablename__ = 'ugc' __tablename__ = 'ugc'
id = db.Column( id = db.Column(
mysql.BIGINT, mysql.INTEGER,
primary_key=True primary_key=True
) )
account_id = db.Column( account_id = db.Column(
@@ -824,7 +801,7 @@ class PropertyContent(db.Model):
) )
ugc_id = db.Column( ugc_id = db.Column(
db.BIGINT, db.INT,
db.ForeignKey(UGC.id, ondelete='CASCADE'), db.ForeignKey(UGC.id, ondelete='CASCADE'),
nullable=True nullable=True
) )
@@ -875,39 +852,6 @@ class PropertyContent(db.Model):
nullable=False, nullable=False,
) )
model_name = db.Column(
mysql.TEXT,
nullable=False,
server_default=''
)
model_description = db.Column(
mysql.TEXT,
nullable=False,
server_default=''
)
behavior_1 = db.Column(
mysql.BIGINT(),
server_default='0'
)
behavior_2 = db.Column(
mysql.BIGINT(),
server_default='0'
)
behavior_3 = db.Column(
mysql.BIGINT(),
server_default='0'
)
behavior_4 = db.Column(
mysql.BIGINT(),
server_default='0'
)
behavior_5 = db.Column(
mysql.BIGINT(),
server_default='0'
)
def save(self): def save(self):
db.session.add(self) db.session.add(self)
db.session.commit() db.session.commit()
@@ -1012,7 +956,7 @@ class BugReport(db.Model):
) )
reporter_id = db.Column( reporter_id = db.Column(
mysql.BIGINT, mysql.INTEGER(),
nullable=False, nullable=False,
server_default='0' server_default='0'
) )