openstack/neutron-lbaas
Code Issues Proposed changes

Correctly inherit __table_args__ from parent class

Browse Source 
Where unique constraints are added to certain tables by populating
__table_args__, we need to ensure we inherit the top level
__table_args__ that define the default storage engine to use when
creating tables.

Change-Id: Ib886b84922830b60282b4f882591e43f5041e713
Fixes: bug 1288358
This commit is contained in:
Darren Birkett 2014-03-06 16:17:03 +00:00
parent cde3da2f89
commit 72e37ddcd0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/db/extradhcpopt_db.py
View File

@ -43,7 +43,8 @@ class ExtraDhcpOpt(model_base.BASEV2, models_v2.HasId):
opt_value = sa.Column(sa.String(255), nullable=False) opt_value = sa.Column(sa.String(255), nullable=False)
__table_args__ = (sa.UniqueConstraint('port_id', __table_args__ = (sa.UniqueConstraint('port_id',
'opt_name', 'opt_name',
name='uidx_portid_optname'),) name='uidx_portid_optname'),
model_base.BASEV2.__table_args__,)
# Add a relationship to the Port model in order to instruct SQLAlchemy to # Add a relationship to the Port model in order to instruct SQLAlchemy to
# eagerly load extra_dhcp_opts bindings # eagerly load extra_dhcp_opts bindings

1
neutron/plugins/openvswitch/ovs_models_v2.py
View File

@ -93,6 +93,7 @@ class TunnelEndpoint(model_base.BASEV2):
__tablename__ = 'ovs_tunnel_endpoints' __tablename__ = 'ovs_tunnel_endpoints'
__table_args__ = ( __table_args__ = (
UniqueConstraint('id', name='uniq_ovs_tunnel_endpoints0id'), UniqueConstraint('id', name='uniq_ovs_tunnel_endpoints0id'),
model_base.BASEV2.__table_args__,
) )
ip_address = Column(String(64), primary_key=True) ip_address = Column(String(64), primary_key=True)