diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
| commit | d853dbf2d88d4c7b0016e4416b7d046801e4f65a (patch) | |
| tree | 6e6e859a3da842b6158f04a2b110d0ed735eb9e8 /controller/schema.sql.c | |
| parent | aee8e95d4961195b3251bcc8581677a8f0c0cdd8 (diff) | |
| parent | 0cbbcf288455b8657134bf5be0861232daa6c7d9 (diff) | |
| download | infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.tar.gz infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'controller/schema.sql.c')
| -rw-r--r-- | controller/schema.sql.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/controller/schema.sql.c b/controller/schema.sql.c index 1157facc..30b88850 100644 --- a/controller/schema.sql.c +++ b/controller/schema.sql.c @@ -19,10 +19,7 @@ "\n"\ "CREATE TABLE Node (\n"\ " id char(10) PRIMARY KEY NOT NULL,\n"\ -" identity varchar(4096) NOT NULL,\n"\ -" lastAt varchar(64),\n"\ -" lastSeen integer NOT NULL DEFAULT(0),\n"\ -" firstSeen integer NOT NULL DEFAULT(0)\n"\ +" identity varchar(4096) NOT NULL\n"\ ");\n"\ "\n"\ "CREATE TABLE Gateway (\n"\ @@ -36,7 +33,8 @@ "\n"\ "CREATE TABLE IpAssignment (\n"\ " networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\ -" nodeId char(10) NOT NULL REFERENCES Node(id) ON DELETE CASCADE,\n"\ +" nodeId char(10) REFERENCES Node(id) ON DELETE CASCADE,\n"\ +" type integer NOT NULL DEFAULT(0),\n"\ " ip blob(16) NOT NULL,\n"\ " ipNetmaskBits integer NOT NULL DEFAULT(0),\n"\ " ipVersion integer NOT NULL DEFAULT(4)\n"\ @@ -48,12 +46,12 @@ "\n"\ "CREATE TABLE IpAssignmentPool (\n"\ " networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\ -" ipNetwork blob(16) NOT NULL,\n"\ -" ipNetmaskBits integer NOT NULL,\n"\ +" ipRangeStart blob(16) NOT NULL,\n"\ +" ipRangeEnd blob(16) NOT NULL,\n"\ " ipVersion integer NOT NULL DEFAULT(4)\n"\ ");\n"\ "\n"\ -"CREATE INDEX IpAssignmentPool_networkId ON IpAssignmentPool (networkId);\n"\ +"CREATE UNIQUE INDEX IpAssignmentPool_networkId_ipRangeStart ON IpAssignmentPool (networkId,ipRangeStart);\n"\ "\n"\ "CREATE TABLE Member (\n"\ " networkId char(16) NOT NULL REFERENCES Network(id) ON DELETE CASCADE,\n"\ @@ -77,7 +75,9 @@ "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"\ +" nodeId char(10) REFERENCES Node(id),\n"\ +" sourcePort char(10),\n"\ +" destPort char(10),\n"\ " vlanId integer,\n"\ " vlanPcp integer,\n"\ " etherType integer,\n"\ |