Skip to content

Commit de6f35f

Browse files
committed
更新弃用的useexisting
1 parent f40ff94 commit de6f35f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

backend/app/app/models/system.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
from sqlalchemy.orm import relationship, backref
33
import datetime
44
from app.db.base_class import Base
5-
5+
"""
6+
relationship 自引用加入remote_side use_list=False -> one-to-one 默认use_list=True
7+
"""
68

79
class Dict_Type(Base):
810
"""数据字典"""
@@ -29,7 +31,7 @@ class Dict_Data(Base):
2931

3032
class Department(Base):
3133
"""部门表"""
32-
__table_args__ = {"useexisting": True}
34+
# __table_args__ = {"extend_existing": True}
3335

3436
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
3537
code = Column(String(128), doc="部门代码")
@@ -40,13 +42,13 @@ class Department(Base):
4042
start_date = Column(Date, default=datetime.date.today())
4143
end_date = Column(Date, default='3000-12-31')
4244

43-
children = relationship('Department', uselist=True, order_by=order.asc(),
44-
backref=backref('parent', uselist=True, remote_side=[id]))
45+
children = relationship('Department', order_by=order.asc(),
46+
backref=backref('parent',uselist=False,remote_side=[id]))
4547

4648

4749
class Menu(Base):
4850
""" 菜单表"""
49-
__table_args__ = {"useexisting": True}
51+
# __table_args__ = {"extend_existing": True}
5052

5153
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
5254
path = Column(String(128), doc="路由")
@@ -65,5 +67,6 @@ class Menu(Base):
6567
parent_id = Column(Integer, ForeignKey("menu.id", ondelete='CASCADE'), index=True,
6668
nullable=True, ) # ondelete='CASCADE' 联级删除
6769

68-
parent = relationship('Menu', uselist=True, remote_side=[id], backref=backref('children', uselist=True))
70+
parent = relationship('Menu', remote_side=[id],uselist=False,order_by=order.asc(),
71+
backref=backref('children'))
6972
role_menu = relationship("Role_Menu", backref="menu")

0 commit comments

Comments
 (0)