From: Christian Hofstaedtler Date: Fri, 31 Jan 2014 17:13:21 +0000 (+0100) Subject: g*sql: put common query parts in a variable X-Git-Tag: rec-3.6.0-rc1~210^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d766f445aa2819d0de6db2dec245ff87f1ddd5e;p=thirdparty%2Fpdns.git g*sql: put common query parts in a variable --- diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc index 566438077f..09b4e6ee4b 100644 --- a/modules/gmysqlbackend/gmysqlbackend.cc +++ b/modules/gmysqlbackend/gmysqlbackend.cc @@ -50,34 +50,37 @@ public: declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no"); - declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'"); - declare(suffix,"id-query","Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s' and domain_id=%d"); - declare(suffix,"wildcard-query","Wildcard query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s'"); - declare(suffix,"wildcard-id-query","Wildcard with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s' and domain_id='%d'"); + string record_query = "SELECT content,ttl,prio,type,domain_id,name FROM records WHERE 1"; + string record_auth_query = "SELECT content,ttl,prio,type,domain_id,name,auth FROM records WHERE 1"; - declare(suffix,"any-query","Any query","select content,ttl,prio,type,domain_id,name from records where name='%s'"); - declare(suffix,"any-id-query","Any with ID query","select content,ttl,prio,type,domain_id,name from records where name='%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query","Wildcard ANY query","select content,ttl,prio,type,domain_id,name from records where name like '%s'"); - declare(suffix,"wildcard-any-id-query","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name from records where name like '%s' and domain_id='%d'"); + declare(suffix, "basic-query", "Basic query", record_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query", "Basic with ID query", record_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query", "Wildcard query", record_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query", "Wildcard with ID query", record_query+" and type='%s' and name like '%s' and domain_id='%d'"); - declare(suffix,"list-query","AXFR query", "select content,ttl,prio,type,domain_id,name from records where domain_id='%d'"); + declare(suffix, "any-query", "Any query", record_query+" and name='%s'"); + declare(suffix, "any-id-query", "Any with ID query", record_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query", "Wildcard ANY query", record_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query", "Wildcard ANY with ID query", record_query+" and name like '%s' and domain_id='%d'"); + + declare(suffix, "list-query", "AXFR query", record_query+" and domain_id='%d'"); declare(suffix,"remove-empty-non-terminals-from-zone-query", "remove all empty non-terminals from zone", "delete from records where domain_id='%d' and type is null"); declare(suffix,"insert-empty-non-terminal-query", "insert empty non-terminal in zone", "insert into records (domain_id,name,type) values ('%d','%s',null)"); declare(suffix,"delete-empty-non-terminal-query", "delete empty non-terminal from zone", "delete from records where domain_id='%d' and name='%s' and type is null"); // and now with auth - declare(suffix,"basic-query-auth","Basic query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s'"); - declare(suffix,"id-query-auth","Basic with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s' and domain_id=%d"); - declare(suffix,"wildcard-query-auth","Wildcard query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s'"); - declare(suffix,"wildcard-id-query-auth","Wildcard with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s' and domain_id='%d'"); + declare(suffix, "basic-query-auth", "Basic query", record_auth_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query-auth", "Basic with ID query", record_auth_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query-auth", "Wildcard query", record_auth_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query-auth", "Wildcard with ID query", record_auth_query+" and type='%s' and name like '%s' and domain_id='%d'"); - declare(suffix,"any-query-auth","Any query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s'"); - declare(suffix,"any-id-query-auth","Any with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query-auth","Wildcard ANY query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s'"); - declare(suffix,"wildcard-any-id-query-auth","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s' and domain_id='%d'"); + declare(suffix, "any-query-auth", "Any query", record_auth_query+" and name='%s'"); + declare(suffix, "any-id-query-auth", "Any with ID query", record_auth_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query-auth", "Wildcard ANY query", record_auth_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query-auth", "Wildcard ANY with ID query", record_auth_query+" and name like '%s' and domain_id='%d'"); - declare(suffix,"list-query-auth","AXFR query", "select content,ttl,prio,type,domain_id,name, auth from records where domain_id='%d' order by name, type"); + declare(suffix, "list-query-auth", "AXFR query", record_auth_query+" and domain_id='%d' order by name, type"); declare(suffix,"insert-empty-non-terminal-query-auth", "insert empty non-terminal in zone", "insert into records (domain_id,name,type,auth) values ('%d','%s',null,'1')"); diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc index 61d86f901a..97cb701cc5 100644 --- a/modules/goraclebackend/goraclebackend.cc +++ b/modules/goraclebackend/goraclebackend.cc @@ -57,34 +57,37 @@ public: declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no"); - declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'"); - declare(suffix,"id-query","Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s' and domain_id=%d"); - declare(suffix,"wildcard-query","Wildcard query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s'"); - declare(suffix,"wildcard-id-query","Wildcard with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s' and domain_id='%d'"); + string record_query = "SELECT content,ttl,prio,type,domain_id,name FROM records WHERE 1"; + string record_auth_query = "SELECT content,ttl,prio,type,domain_id,name,auth FROM records WHERE 1"; - declare(suffix,"any-query","Any query","select content,ttl,prio,type,domain_id,name from records where name='%s'"); - declare(suffix,"any-id-query","Any with ID query","select content,ttl,prio,type,domain_id,name from records where name='%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query","Wildcard ANY query","select content,ttl,prio,type,domain_id,name from records where name like '%s'"); - declare(suffix,"wildcard-any-id-query","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name from records where name like '%s' and domain_id='%d'"); + declare(suffix, "basic-query", "Basic query", record_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query", "Basic with ID query", record_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query", "Wildcard query", record_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query", "Wildcard with ID query", record_query+" and type='%s' and name like '%s' and domain_id='%d'"); - declare(suffix,"list-query","AXFR query", "select content,ttl,prio,type,domain_id,name from records where domain_id='%d'"); + declare(suffix, "any-query", "Any query", record_query+" and name='%s'"); + declare(suffix, "any-id-query", "Any with ID query", record_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query", "Wildcard ANY query", record_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query", "Wildcard ANY with ID query", record_query+" and name like '%s' and domain_id='%d'"); + + declare(suffix, "list-query", "AXFR query", record_query+" and domain_id='%d'"); declare(suffix,"remove-empty-non-terminals-from-zone-query", "remove all empty non-terminals from zone", "delete from records where domain_id='%d' and type is null"); declare(suffix,"insert-empty-non-terminal-query", "insert empty non-terminal in zone", "insert into records (id,domain_id,name,type) values (records_id_sequence.nextval,'%d','%s',null)"); declare(suffix,"delete-empty-non-terminal-query", "delete empty non-terminal from zone", "delete from records where domain_id='%d' and name='%s' and type is null"); // and now with auth - declare(suffix,"basic-query-auth","Basic query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s'"); - declare(suffix,"id-query-auth","Basic with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s' and domain_id=%d"); - declare(suffix,"wildcard-query-auth","Wildcard query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s'"); - declare(suffix,"wildcard-id-query-auth","Wildcard with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s' and domain_id='%d'"); + declare(suffix, "basic-query-auth", "Basic query", record_auth_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query-auth", "Basic with ID query", record_auth_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query-auth", "Wildcard query", record_auth_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query-auth", "Wildcard with ID query", record_auth_query+" and type='%s' and name like '%s' and domain_id='%d'"); - declare(suffix,"any-query-auth","Any query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s'"); - declare(suffix,"any-id-query-auth","Any with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query-auth","Wildcard ANY query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s'"); - declare(suffix,"wildcard-any-id-query-auth","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s' and domain_id='%d'"); + declare(suffix, "any-query-auth", "Any query", record_auth_query+" and name='%s'"); + declare(suffix, "any-id-query-auth", "Any with ID query", record_auth_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query-auth", "Wildcard ANY query", record_auth_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query-auth", "Wildcard ANY with ID query", record_auth_query+" and name like '%s' and domain_id='%d'"); - declare(suffix,"list-query-auth","AXFR query", "select content,ttl,prio,type,domain_id,name, auth from records where domain_id='%d' order by name, type"); + declare(suffix, "list-query-auth", "AXFR query", record_auth_query+" and domain_id='%d' order by name, type"); declare(suffix,"insert-empty-non-terminal-query-auth", "insert empty non-terminal in zone", "insert into records (id,domain_id,name,type,auth) values (records_id_sequence.nextval,'%d','%s',null,'1')"); diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc index a2125b14f4..e4f2bdb542 100644 --- a/modules/gpgsqlbackend/gpgsqlbackend.cc +++ b/modules/gpgsqlbackend/gpgsqlbackend.cc @@ -46,34 +46,37 @@ public: declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no"); - declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name=E'%s'"); - declare(suffix,"id-query","Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name=E'%s' and domain_id=%d"); - declare(suffix,"wildcard-query","Wildcard query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like E'%s'"); - declare(suffix,"wildcard-id-query","Wildcard with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like E'%s' and domain_id='%d'"); + string record_query = "SELECT content,ttl,prio,type,domain_id,name FROM records WHERE 1"; + string record_auth_query = "SELECT content,ttl,prio,type,domain_id,name,auth::int FROM records WHERE 1"; - declare(suffix,"any-query","Any query","select content,ttl,prio,type,domain_id,name from records where name=E'%s'"); - declare(suffix,"any-id-query","Any with ID query","select content,ttl,prio,type,domain_id,name from records where name=E'%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query","Wildcard ANY query","select content,ttl,prio,type,domain_id,name from records where name like E'%s'"); - declare(suffix,"wildcard-any-id-query","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name from records where name like E'%s' and domain_id='%d'"); + declare(suffix, "basic-query", "Basic query", record_query+" and type='%s' and name=E'%s'"); + declare(suffix, "id-query", "Basic with ID query", record_query+" and type='%s' and name=E'%s' and domain_id=%d"); + declare(suffix, "wildcard-query", "Wildcard query", record_query+" and type='%s' and name like E'%s'"); + declare(suffix, "wildcard-id-query", "Wildcard with ID query", record_query+" and type='%s' and name like E'%s' and domain_id='%d'"); - declare(suffix,"list-query","AXFR query", "select content,ttl,prio,type,domain_id,name from records where domain_id='%d'"); + declare(suffix, "any-query", "Any query", record_query+" and name=E'%s'"); + declare(suffix, "any-id-query", "Any with ID query", record_query+" and name=E'%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query", "Wildcard ANY query", record_query+" and name like E'%s'"); + declare(suffix, "wildcard-any-id-query", "Wildcard ANY with ID query", record_query+" and name like E'%s' and domain_id='%d'"); + + declare(suffix, "list-query", "AXFR query", record_query+" and domain_id='%d'"); declare(suffix,"remove-empty-non-terminals-from-zone-query", "remove all empty non-terminals from zone", "delete from records where domain_id='%d' and type is null"); declare(suffix,"insert-empty-non-terminal-query", "insert empty non-terminal in zone", "insert into records (domain_id,name,type) values ('%d','%s',null)"); declare(suffix,"delete-empty-non-terminal-query", "delete empty non-terminal from zone", "delete from records where domain_id='%d' and name='%s' and type is null"); // and now with auth - declare(suffix,"basic-query-auth","Basic query","select content,ttl,prio,type,domain_id,name,auth::int from records where type='%s' and name=E'%s'"); - declare(suffix,"id-query-auth","Basic with ID query","select content,ttl,prio,type,domain_id,name,auth::int from records where type='%s' and name=E'%s' and domain_id=%d"); - declare(suffix,"wildcard-query-auth","Wildcard query","select content,ttl,prio,type,domain_id,name,auth::int from records where type='%s' and name like E'%s'"); - declare(suffix,"wildcard-id-query-auth","Wildcard with ID query","select content,ttl,prio,type,domain_id,name,auth::int from records where type='%s' and name like E'%s' and domain_id='%d'"); + declare(suffix, "basic-query-auth", "Basic query", record_auth_query+" and type='%s' and name=E'%s'"); + declare(suffix, "id-query-auth", "Basic with ID query", record_auth_query+" and type='%s' and name=E'%s' and domain_id=%d"); + declare(suffix, "wildcard-query-auth", "Wildcard query", record_auth_query+" and type='%s' and name like E'%s'"); + declare(suffix, "wildcard-id-query-auth", "Wildcard with ID query", record_auth_query+" and type='%s' and name like E'%s' and domain_id='%d'"); - declare(suffix,"any-query-auth","Any query","select content,ttl,prio,type,domain_id,name, auth::int from records where name=E'%s'"); - declare(suffix,"any-id-query-auth","Any with ID query","select content,ttl,prio,type,domain_id,name, auth::int from records where name=E'%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query-auth","Wildcard ANY query","select content,ttl,prio,type,domain_id,name, auth::int from records where name like E'%s'"); - declare(suffix,"wildcard-any-id-query-auth","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name, auth::int from records where name like E'%s' and domain_id='%d'"); + declare(suffix, "any-query-auth", "Any query", record_auth_query+" and name=E'%s'"); + declare(suffix, "any-id-query-auth", "Any with ID query", record_auth_query+" and name=E'%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query-auth", "Wildcard ANY query", record_auth_query+" and name like E'%s'"); + declare(suffix, "wildcard-any-id-query-auth", "Wildcard ANY with ID query", record_auth_query+" and name like E'%s' and domain_id='%d'"); - declare(suffix,"list-query-auth","AXFR query", "select content,ttl,prio,type,domain_id,name, auth::int from records where domain_id='%d' order by name, type"); + declare(suffix, "list-query-auth", "AXFR query", record_auth_query+" and domain_id='%d' order by name, type"); declare(suffix,"insert-empty-non-terminal-query-auth", "insert empty non-terminal in zone", "insert into records (domain_id,name,type,auth) values ('%d','%s',null,true)"); diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc index 7415e3ed02..bdaa5faa4e 100644 --- a/modules/gsqlite3backend/gsqlite3backend.cc +++ b/modules/gsqlite3backend/gsqlite3backend.cc @@ -57,35 +57,38 @@ public: { declare( suffix, "database", "Filename of the SQLite3 database", "powerdns.sqlite" ); declare( suffix, "pragma-synchronous", "Set this to 0 for blazing speed", "" ); - - declare( suffix, "basic-query", "Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'"); - declare( suffix, "id-query", "Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s' and domain_id=%d"); - declare( suffix, "wildcard-query", "Wildcard query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s'"); - declare( suffix, "wildcard-id-query", "Wildcard with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s' and domain_id=%d"); - declare( suffix, "any-query", "Any query","select content,ttl,prio,type,domain_id,name from records where name='%s'"); - declare( suffix, "any-id-query", "Any with ID query","select content,ttl,prio,type,domain_id,name from records where name='%s' and domain_id=%d"); - declare( suffix, "wildcard-any-query", "Wildcard ANY query","select content,ttl,prio,type,domain_id,name from records where name like '%s'"); - declare( suffix, "wildcard-any-id-query", "Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name from records where name like '%s' and domain_id=%d"); + string record_query = "SELECT content,ttl,prio,type,domain_id,name FROM records WHERE 1"; + string record_auth_query = "SELECT content,ttl,prio,type,domain_id,name,auth FROM records WHERE 1"; + + declare(suffix, "basic-query", "Basic query", record_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query", "Basic with ID query", record_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query", "Wildcard query", record_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query", "Wildcard with ID query", record_query+" and type='%s' and name like '%s' and domain_id=%d"); + + declare(suffix, "any-query", "Any query", record_query+" and name='%s'"); + declare(suffix, "any-id-query", "Any with ID query", record_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query", "Wildcard ANY query", record_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query", "Wildcard ANY with ID query", record_query+" and name like '%s' and domain_id=%d"); - declare( suffix, "list-query", "AXFR query", "select content,ttl,prio,type,domain_id,name from records where domain_id=%d"); + declare(suffix, "list-query", "AXFR query", record_query+" and domain_id=%d"); declare(suffix,"remove-empty-non-terminals-from-zone-query", "remove all empty non-terminals from zone", "delete from records where domain_id='%d' and type is null"); declare(suffix,"insert-empty-non-terminal-query", "insert empty non-terminal in zone", "insert into records (domain_id,name,type) values ('%d','%s',null)"); declare(suffix,"delete-empty-non-terminal-query", "delete empty non-terminal from zone", "delete from records where domain_id='%d' and name='%s' and type is null"); // and now with auth - declare(suffix,"basic-query-auth","Basic query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s'"); - declare(suffix,"id-query-auth","Basic with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name='%s' and domain_id=%d"); - declare(suffix,"wildcard-query-auth","Wildcard query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s'"); - declare(suffix,"wildcard-id-query-auth","Wildcard with ID query","select content,ttl,prio,type,domain_id,name, auth from records where type='%s' and name like '%s' and domain_id='%d'"); + declare(suffix, "basic-query-auth", "Basic query", record_auth_query+" and type='%s' and name='%s'"); + declare(suffix, "id-query-auth", "Basic with ID query", record_auth_query+" and type='%s' and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-query-auth", "Wildcard query", record_auth_query+" and type='%s' and name like '%s'"); + declare(suffix, "wildcard-id-query-auth", "Wildcard with ID query", record_auth_query+" and type='%s' and name like '%s' and domain_id='%d'"); - declare(suffix,"any-query-auth","Any query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s'"); - declare(suffix,"any-id-query-auth","Any with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name='%s' and domain_id=%d"); - declare(suffix,"wildcard-any-query-auth","Wildcard ANY query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s'"); - declare(suffix,"wildcard-any-id-query-auth","Wildcard ANY with ID query","select content,ttl,prio,type,domain_id,name, auth from records where name like '%s' and domain_id='%d'"); + declare(suffix, "any-query-auth", "Any query", record_auth_query+" and name='%s'"); + declare(suffix, "any-id-query-auth", "Any with ID query", record_auth_query+" and name='%s' and domain_id=%d"); + declare(suffix, "wildcard-any-query-auth", "Wildcard ANY query", record_auth_query+" and name like '%s'"); + declare(suffix, "wildcard-any-id-query-auth", "Wildcard ANY with ID query", record_auth_query+" and name like '%s' and domain_id='%d'"); - declare(suffix,"list-query-auth","AXFR query", "select content,ttl,prio,type,domain_id,name, auth from records where domain_id='%d' order by name, type"); + declare(suffix, "list-query-auth", "AXFR query", record_auth_query+" and domain_id='%d' order by name, type"); declare(suffix,"insert-empty-non-terminal-query-auth", "insert empty non-terminal in zone", "insert into records (domain_id,name,type,auth) values ('%d','%s',null,'1')");