From ad0b25ae889d7e2dce2ef1239bbd64a702f5b07d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 22 Apr 2017 17:20:07 +0300 Subject: [PATCH] Revert "Refactor zones" This reverts commit 5016f50d8ce614f6f2d9439f08087ca5b7f2108f. --- db/structure.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index 2945e2859..49656326c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -192,12 +192,12 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text format('%-17s', ''), format('%-12s', zf.expire), '; expire, seconds', chr(10), format('%-17s', ''), format('%-12s', zf.minimum_ttl), '; minimum TTL, seconds', chr(10), format('%-17s', ''), ')' - ) FROM zones zf WHERE i_origin = zf.origin INTO tmp_var; + ) FROM zonefile_settings zf WHERE i_origin = zf.origin INTO tmp_var; ret = concat(tmp_var, chr(10), chr(10)); -- origin ns records - SELECT ns_records FROM zones zf WHERE i_origin = zf.origin INTO tmp_var; + SELECT ns_records FROM zonefile_settings zf WHERE i_origin = zf.origin INTO tmp_var; ret := concat(ret, '; Zone NS Records', chr(10), tmp_var, chr(10)); -- ns records @@ -216,7 +216,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text ret := concat(ret, tmp_var, chr(10), chr(10)); -- origin a glue records - SELECT a_records FROM zones zf WHERE i_origin = zf.origin INTO tmp_var; + SELECT a_records FROM zonefile_settings zf WHERE i_origin = zf.origin INTO tmp_var; ret := concat(ret, '; Zone A Records', chr(10), tmp_var, chr(10)); -- a glue records for other nameservers @@ -236,7 +236,7 @@ CREATE FUNCTION generate_zonefile(i_origin character varying) RETURNS text ret := concat(ret, tmp_var, chr(10), chr(10)); -- origin aaaa glue records - SELECT a4_records FROM zones zf WHERE i_origin = zf.origin INTO tmp_var; + SELECT a4_records FROM zonefile_settings zf WHERE i_origin = zf.origin INTO tmp_var; ret := concat(ret, '; Zone AAAA Records', chr(10), tmp_var, chr(10)); -- aaaa glue records for other nameservers