Revert "Refactor zones"

This reverts commit 5016f50d8c.
This commit is contained in:
Artur Beljajev 2017-04-22 17:20:07 +03:00
parent 5016f50d8c
commit ad0b25ae88

View file

@ -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.expire), '; expire, seconds', chr(10),
format('%-17s', ''), format('%-12s', zf.minimum_ttl), '; minimum TTL, seconds', chr(10), format('%-17s', ''), format('%-12s', zf.minimum_ttl), '; minimum TTL, seconds', chr(10),
format('%-17s', ''), ')' 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)); ret = concat(tmp_var, chr(10), chr(10));
-- origin ns records -- 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)); ret := concat(ret, '; Zone NS Records', chr(10), tmp_var, chr(10));
-- ns records -- 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)); ret := concat(ret, tmp_var, chr(10), chr(10));
-- origin a glue records -- 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)); ret := concat(ret, '; Zone A Records', chr(10), tmp_var, chr(10));
-- a glue records for other nameservers -- 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)); ret := concat(ret, tmp_var, chr(10), chr(10));
-- origin aaaa glue records -- 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)); ret := concat(ret, '; Zone AAAA Records', chr(10), tmp_var, chr(10));
-- aaaa glue records for other nameservers -- aaaa glue records for other nameservers