diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-29 10:47:47 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-29 10:47:47 -0700 |
| commit | 48a2ad032aa39dab2980787b2746360655c1859f (patch) | |
| tree | 8963fd8484015aeca92a0346e6e251d50385e337 /controller | |
| parent | f05e62deae8c24a4f2a373ef190ef36b335399ee (diff) | |
| download | infinitytier-48a2ad032aa39dab2980787b2746360655c1859f.tar.gz infinitytier-48a2ad032aa39dab2980787b2746360655c1859f.zip | |
(1) Both nodeId and portId in Rule can be NULL, (2) remove on delete cascade since rules should never mysteriously disappear from the rules table. If it let you delete a node with rules, that would be a UI or cleanup function bug.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/schema.sql | 4 | ||||
| -rw-r--r-- | controller/schema.sql.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/controller/schema.sql b/controller/schema.sql index a3193f7d..1328d999 100644 --- a/controller/schema.sql +++ b/controller/schema.sql @@ -77,8 +77,8 @@ CREATE INDEX Relay_networkId ON Relay (networkId); CREATE TABLE Rule ( networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE, ruleNo integer NOT NULL, - nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE, - portId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE, + nodeId char(10) REFERENCES Node(id), + portId char(10) REFERENCES Node(id), vlanId integer, vlanPcp integer, etherType integer, diff --git a/controller/schema.sql.c b/controller/schema.sql.c index 8b27e628..d129637c 100644 --- a/controller/schema.sql.c +++ b/controller/schema.sql.c @@ -78,8 +78,8 @@ "CREATE TABLE Rule (\n"\ " networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\ " ruleNo integer NOT NULL,\n"\ -" nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\ -" portId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\ +" nodeId char(10) REFERENCES Node(id),\n"\ +" portId char(10) REFERENCES Node(id),\n"\ " vlanId integer,\n"\ " vlanPcp integer,\n"\ " etherType integer,\n"\ |