Commit 57287af3 authored by Etienne Allovon's avatar Etienne Allovon

Merge branch 'master' into 2397-xds-incall-to-group

parents f692adb9 74465f74
xivo-dao (2019.05.00) xivo-callisto; urgency=medium
[ Tomas Tartaba ]
* 2443 Route tables missing in dao init
[ Jean-Pierre Thomasset ]
* 2397 - Add helper to get extension list and mds of a given user and group
-- Jean-Pierre Thomasset <jpthomasset@gmail.com> Tue, 09 Apr 2019 14:12:16 +0000
-- Tomas Taraba <ttaraba@avencall.com> Mon, 15 Apr 2019 17:26:00 +0000
xivo-dao (2019.04.00) xivo-callisto; urgency=medium
......
......@@ -144,4 +144,8 @@ from xivo_dao.alchemy.voicemail import Voicemail
from xivo_dao.alchemy.xc_queue_members_default import XCQueueMembersDefault
from xivo_dao.alchemy.xc_queues import XCQueues
from xivo_dao.alchemy.xc_users import XCUsers
from xivo_dao.alchemy.mediaserver import MediaServer
\ No newline at end of file
from xivo_dao.alchemy.mediaserver import MediaServer
from xivo_dao.alchemy.route import Route
from xivo_dao.alchemy.routecontext import RouteContext
from xivo_dao.alchemy.routemediaserver import RouteMediaServer
from xivo_dao.alchemy.routetrunk import RouteTrunk
......@@ -24,7 +24,7 @@ from xivo_dao.helpers.db_manager import Base
class RouteContext(Base):
__tablename__ = 'routecontext'
__table_args__ = (
PrimaryKeyConstraint('id'),
PrimaryKeyConstraint('routeid', 'contextname'),
ForeignKeyConstraint(('routeid',),
('route.id',),
ondelete='RESTRICT'),
......
......@@ -24,7 +24,7 @@ from xivo_dao.helpers.db_manager import Base
class RouteMediaServer(Base):
__tablename__ = 'routemediaserver'
__table_args__ = (
PrimaryKeyConstraint('id'),
PrimaryKeyConstraint('routeid', 'mdsid'),
ForeignKeyConstraint(('routeid',),
('route.id',),
ondelete='RESTRICT'),
......
......@@ -24,7 +24,7 @@ from xivo_dao.helpers.db_manager import Base
class RouteTrunk(Base):
__tablename__ = 'routetrunk'
__table_args__ = (
PrimaryKeyConstraint('id'),
PrimaryKeyConstraint('routeid', 'trunkid'),
ForeignKeyConstraint(('routeid',),
('route.id',),
ondelete='RESTRICT'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment