Changeset 347

Timestamp:

06/15/12 18:08:14 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up dns.sql a little; some of this will be more important once
automagical table upgrades are implemented

• set primary keys so we can't even accidentally add duplicate domains or revzones
• bump dbversion in misc table

Fix buglet in _hostparent() that triggered if the hostname passed in
started with *.

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.sql (modified) (3 diffs)

trunk/DNSDB.pm

@@ -296 +296 @@
   my $dbh = shift;
   my $hname = shift;
-  
+
+  $hname =~ s/^\*\.//;  # this should be impossible to find in the domains table.
   my @hostbits = split /\./, $hname;
   my $sth = $dbh->prepare("SELECT count(*),domain_id FROM domains WHERE domain = ? GROUP BY domain_id");

trunk/dns.sql

@@ -14 +14 @@
 
 COPY misc (misc_id, key, value) FROM stdin;
-1       dbversion       1.0
+1       dbversion       1.2
 \.
 
@@ -60 +60 @@
 CREATE TABLE domains (
     domain_id serial NOT NULL,
-    "domain" character varying(80) NOT NULL,
+    "domain" character varying(80) NOT NULL PRIMARY KEY,
     group_id integer DEFAULT 1 NOT NULL,
     description character varying(255) DEFAULT ''::character varying NOT NULL,
@@ -70 +70 @@
 CREATE TABLE revzones (
     rdns_id serial NOT NULL,
-    revnet cidr NOT NULL,
+    revnet cidr NOT NULL PRIMARY KEY,
     group_id integer DEFAULT 1 NOT NULL,
     description character varying(255) DEFAULT ''::character varying NOT NULL,