projects
/
invirt/packages/invirt-database.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the remnants of the sipb_xen_database Python package
[invirt/packages/invirt-database.git]
/
python
/
database
/
models.py
diff --git
a/python/database/models.py
b/python/database/models.py
index
67d5de8
..
793bc80
100644
(file)
--- a/
python/database/models.py
+++ b/
python/database/models.py
@@
-74,9
+74,9
@@
autoinstalls_table = Table('autoinstalls', meta,
Column('mirror', String, nullable=False))
machine_access_table = Table('machine_access', meta,
Column('mirror', String, nullable=False))
machine_access_table = Table('machine_access', meta,
- Column('machine_id', Integer, ForeignKey('machines.machine_id'), nullable=False, index=True),
+ Column('machine_id', Integer, ForeignKey('machines.machine_id', ondelete='CASCADE'), nullable=False, index=True),
Column('user', String, nullable=False, index=True),
Column('user', String, nullable=False, index=True),
- PrimaryKeyConstraint('machine_id', 'user', ondelete='CASCADE'))
+ PrimaryKeyConstraint('machine_id', 'user'))
class Machine(object):
def __repr__(self):
class Machine(object):
def __repr__(self):
@@
-119,10
+119,7
@@
session.mapper(CDROM, cdroms_table)
session.mapper(Autoinstall, autoinstalls_table)
def clear_cache():
session.mapper(Autoinstall, autoinstalls_table)
def clear_cache():
- """Clear sqlalchemy's cache.
+ """Clear sqlalchemy's cache
+ """
- This _seems_ to be the way; it works, but the docs don't mention
- it. Why is this so obscure?"""
-
- # XXX maybe we still need to do this, but it's not doc'd how.
- #ctx.registry.clear()
+ session.clear()