Changeset 725 for branches/stable/dns.sql

Timestamp:

06/20/16 13:18:07 (8 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk through r721; minor tweaks and updates required for RPC
from IPDB

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns.sql (modified) (6 diffs)

branches/stable/dns.sql

@@ -31 +31 @@
 
 COPY misc (misc_id, key, value) FROM stdin;
-1       dbversion       1.2.4
+1       dbversion       1.2.6
 \.
 
@@ -86 +86 @@
 CREATE TABLE domains (
     domain_id serial NOT NULL,
-    "domain" character varying(80) NOT NULL PRIMARY KEY,
+    "domain" character varying(80) NOT NULL,
     group_id integer DEFAULT 1 NOT NULL,
     description character varying(255) DEFAULT ''::character varying NOT NULL,
@@ -101 +101 @@
 CREATE TABLE revzones (
     rdns_id serial NOT NULL,
-    revnet cidr NOT NULL PRIMARY KEY,
+    revnet cidr NOT NULL,
     group_id integer DEFAULT 1 NOT NULL,
     description character varying(255) DEFAULT ''::character varying NOT NULL,
@@ -108 +108 @@
     sertype character(1) DEFAULT 'D'::bpchar,
     changed boolean DEFAULT true NOT NULL,
-    default_location character varying (4) DEFAULT '' NOT NULL
+    default_location character varying(4) DEFAULT ''::character varying NOT NULL
 );
 CREATE INDEX rev_status_index ON revzones USING btree (status);
@@ -313 +313 @@
     ADD CONSTRAINT domains_domain_id_key UNIQUE (domain_id);
 
+ALTER TABLE ONLY domains
+    ADD CONSTRAINT domains_pkey PRIMARY KEY ("domain", default_location);
+
 ALTER TABLE ONLY default_records
     ADD CONSTRAINT default_records_pkey PRIMARY KEY (record_id);
@@ -321 +324 @@
 ALTER TABLE ONLY rectypes
     ADD CONSTRAINT rectypes_pkey PRIMARY KEY (val, name);
+
+ALTER TABLE ONLY revzones
+    ADD CONSTRAINT revzones_rdns_id_key UNIQUE (rdns_id);
+
+ALTER TABLE ONLY revzones
+    ADD CONSTRAINT revzones_pkey PRIMARY KEY (revnet, default_location);
 
 ALTER TABLE ONLY users