diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
| commit | b33e4af49fb53c7d901e575886feaf6b5c9e7e20 (patch) | |
| tree | 27e9a4150504ec4a4dfddb6e197a738f52c20aa7 /controller/schema.sql.c | |
| parent | 0c8051da153b445f756681f9fd7d46bc85d1517f (diff) | |
| parent | 5202fbdaf313096a7205e7bb9c14c11fc628b8f2 (diff) | |
| download | infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.tar.gz infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'controller/schema.sql.c')
| -rw-r--r-- | controller/schema.sql.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/controller/schema.sql.c b/controller/schema.sql.c index a5d46973..f606b607 100644 --- a/controller/schema.sql.c +++ b/controller/schema.sql.c @@ -22,8 +22,7 @@ " networkId char(16) NOT NULL,\n"\ " ipNetwork blob(16) NOT NULL,\n"\ " ipNetmaskBits integer NOT NULL,\n"\ -" ipVersion integer NOT NULL DEFAULT(4),\n"\ -" active integer NOT NULL DEFAULT(1)\n"\ +" ipVersion integer NOT NULL DEFAULT(4)\n"\ ");\n"\ "\n"\ "CREATE INDEX IpAssignmentPool_networkId ON IpAssignmentPool (networkId);\n"\ @@ -72,9 +71,11 @@ "CREATE TABLE Relay (\n"\ " networkId char(16) NOT NULL,\n"\ " nodeId char(10) NOT NULL,\n"\ -" address varchar(64) NOT NULL\n"\ +" phyAddress varchar(64) NOT NULL\n"\ ");\n"\ "\n"\ +"CREATE INDEX Relay_networkId ON Relay (networkId);\n"\ +"\n"\ "CREATE UNIQUE INDEX Relay_networkId_nodeId ON Relay (networkId, nodeId);\n"\ "\n"\ "CREATE TABLE Node (\n"\ @@ -87,6 +88,7 @@ "\n"\ "CREATE TABLE Rule (\n"\ " networkId char(16) NOT NULL,\n"\ +" ruleId integer NOT NULL,\n"\ " nodeId char(10),\n"\ " vlanId integer,\n"\ " vlanPcp integer,\n"\ |