Merge "Don't need session.flush in context managed by session"
This commit is contained in:
commit
f957e7c4a7
|
@ -130,7 +130,6 @@ class Catalog(catalog.Driver):
|
||||||
self._delete_child_regions(session, region_id)
|
self._delete_child_regions(session, region_id)
|
||||||
session.query(Region).filter_by(id=region_id).delete()
|
session.query(Region).filter_by(id=region_id).delete()
|
||||||
session.delete(ref)
|
session.delete(ref)
|
||||||
session.flush()
|
|
||||||
|
|
||||||
def create_region(self, region_ref):
|
def create_region(self, region_ref):
|
||||||
session = sql.get_session()
|
session = sql.get_session()
|
||||||
|
@ -138,7 +137,6 @@ class Catalog(catalog.Driver):
|
||||||
self._check_parent_region(session, region_ref)
|
self._check_parent_region(session, region_ref)
|
||||||
region = Region.from_dict(region_ref)
|
region = Region.from_dict(region_ref)
|
||||||
session.add(region)
|
session.add(region)
|
||||||
session.flush()
|
|
||||||
return region.to_dict()
|
return region.to_dict()
|
||||||
|
|
||||||
def update_region(self, region_id, region_ref):
|
def update_region(self, region_id, region_ref):
|
||||||
|
@ -152,7 +150,6 @@ class Catalog(catalog.Driver):
|
||||||
for attr in Region.attributes:
|
for attr in Region.attributes:
|
||||||
if attr != 'id':
|
if attr != 'id':
|
||||||
setattr(ref, attr, getattr(new_region, attr))
|
setattr(ref, attr, getattr(new_region, attr))
|
||||||
session.flush()
|
|
||||||
return ref.to_dict()
|
return ref.to_dict()
|
||||||
|
|
||||||
# Services
|
# Services
|
||||||
|
|
Loading…
Reference in New Issue