From: Christian Hofstaedtler Date: Tue, 15 Oct 2013 12:11:08 +0000 (+0200) Subject: Remove mostly nonfunctional diff. in gsqlbackends X-Git-Tag: rec-3.6.0-rc1~405^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c924541742b07c0e9b8694b9e11785b479ba5826;p=pdns Remove mostly nonfunctional diff. in gsqlbackends Makes for easier diffing of g*sqlbackend code --- diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc index 1d838d000..7d7715f71 100644 --- a/modules/gmysqlbackend/gmysqlbackend.cc +++ b/modules/gmysqlbackend/gmysqlbackend.cc @@ -1,15 +1,14 @@ -// $Id$ #include #include #include "pdns/namespaces.hh" #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" -#include "gmysqlbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" +#include "gmysqlbackend.hh" #include "smysql.hh" #include @@ -37,7 +36,7 @@ class gMySQLFactory : public BackendFactory { public: gMySQLFactory(const string &mode) : BackendFactory(mode),d_mode(mode) {} - + void declareArguments(const string &suffix="") { declare(suffix,"dbname","Pdns backend database name to connect to","powerdns"); @@ -47,9 +46,10 @@ public: declare(suffix,"socket","Pdns backend socket to connect to",""); declare(suffix,"password","Pdns backend password to connect with",""); declare(suffix,"group", "Pdns backend MySQL 'group' to connect as", "client"); - declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no"); declare(suffix,"innodb-read-committed","Use InnoDB READ-COMMITTED transaction isolation level","yes"); + 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'"); @@ -65,7 +65,7 @@ public: 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"); @@ -80,7 +80,7 @@ public: 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,"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')"); - + declare(suffix,"master-zone-query","Data", "select master from domains where name='%s' and type='SLAVE'"); declare(suffix,"info-zone-query","","select id,name,master,last_check,notified_serial,type from domains where name='%s'"); @@ -102,9 +102,10 @@ public: declare(suffix,"get-order-after-query","DNSSEC Ordering Query, after", "select min(ordername) from records where ordername > '%s' and domain_id=%d and ordername is not null"); declare(suffix,"get-order-last-query","DNSSEC Ordering Query, last", "select ordername, name from records where ordername != '' and domain_id=%d and ordername is not null order by 1 desc limit 1"); declare(suffix,"set-order-and-auth-query", "DNSSEC set ordering query", "update records set ordername='%s',auth=%d where name='%s' and domain_id='%d'"); + declare(suffix,"set-auth-on-ds-record-query", "DNSSEC set auth on a DS record", "update records set auth=1 where domain_id='%d' and name='%s' and type='DS'"); + declare(suffix,"nullify-ordername-and-update-auth-query", "DNSSEC nullify ordername and update auth query", "update records set ordername=NULL,auth=%d where domain_id='%d' and name='%s'"); declare(suffix,"nullify-ordername-and-auth-query", "DNSSEC nullify ordername and auth query", "update records set ordername=NULL,auth=0 where name='%s' and type='%s' and domain_id='%d'"); - declare(suffix,"set-auth-on-ds-record-query", "DNSSEC set auth on a DS record", "update records set auth=1 where domain_id='%d' and name='%s' and type='DS'"); declare(suffix,"update-master-query","", "update domains set master='%s' where name='%s'"); declare(suffix,"update-kind-query","", "update domains set type='%s' where name='%s'"); @@ -115,6 +116,7 @@ public: declare(suffix,"delete-domain-query","", "delete from domains where name='%s'"); declare(suffix,"delete-zone-query","", "delete from records where domain_id=%d"); declare(suffix,"delete-rrset-query","","delete from records where domain_id=%d and name='%s' and type='%s'"); + declare(suffix,"add-domain-key-query","", "insert into cryptokeys (domain_id, flags, active, content) select id, %d, %d, '%s' from domains where name='%s'"); declare(suffix,"list-domain-keys-query","", "select cryptokeys.id, flags, active, content from domains, cryptokeys where cryptokeys.domain_id=domains.id and name='%s'"); declare(suffix,"get-domain-metadata-query","", "select content from domains, domainmetadata where domainmetadata.domain_id=domains.id and name='%s' and domainmetadata.kind='%s'"); @@ -123,7 +125,7 @@ public: declare(suffix,"set-domain-metadata-query","", "insert into domainmetadata (domain_id, kind, content) select id, '%s', '%s' from domains where name='%s'"); declare(suffix,"activate-domain-key-query","", "update cryptokeys set active=1 where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); declare(suffix,"deactivate-domain-key-query","", "update cryptokeys set active=0 where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); - declare(suffix,"remove-domain-key-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); + declare(suffix,"remove-domain-key-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); declare(suffix,"clear-domain-all-keys-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s')"); declare(suffix,"get-tsig-key-query","", "select algorithm, secret from tsigkeys where name='%s'"); declare(suffix,"set-tsig-key-query","", "replace into tsigkeys (name,algorithm,secret) values('%s','%s','%s')"); @@ -132,7 +134,7 @@ public: declare(suffix,"get-all-domains-query", "Retrieve all domains", "select records.domain_id, records.name, records.content, domains.type, domains.master, domains.notified_serial, domains.last_check from records, domains where records.domain_id=domains.id and records.type='SOA'"); } - + DNSBackend *make(const string &suffix="") { return new gMySQLBackend(d_mode,suffix); diff --git a/modules/gmysqlbackend/gmysqlbackend.hh b/modules/gmysqlbackend/gmysqlbackend.hh index 68356165c..4fbda4e49 100644 --- a/modules/gmysqlbackend/gmysqlbackend.hh +++ b/modules/gmysqlbackend/gmysqlbackend.hh @@ -1,6 +1,5 @@ #include #include - #include "pdns/backends/gsql/gsqlbackend.hh" #include "pdns/namespaces.hh" @@ -11,6 +10,4 @@ class gMySQLBackend : public GSQLBackend { public: gMySQLBackend(const string &mode, const string &suffix); //!< Makes our connection to the database. Throws an exception if it fails. - -private: }; diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc index a0380b21d..68a6a83f8 100644 --- a/modules/goraclebackend/goraclebackend.cc +++ b/modules/goraclebackend/goraclebackend.cc @@ -1,20 +1,16 @@ #include #include - #include "pdns/namespaces.hh" - #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" -#include "goraclebackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" - +#include "goraclebackend.hh" #include "soracle.hh" - #include gOracleBackend::gOracleBackend(const string &mode, const string &suffix) : GSQLBackend(mode,suffix) @@ -30,19 +26,19 @@ gOracleBackend::gOracleBackend(const string &mode, const string &suffix) : GSQL getArg("password"))); } - + catch(SSqlException &e) { L< '%s' and domain_id=%d and ordername is not null"); declare(suffix,"get-order-last-query","DNSSEC Ordering Query, last", "select ordername, name from records where ordername != '' and domain_id=%d and ordername is not null and rownum=1 order by 1 desc"); declare(suffix,"set-order-and-auth-query", "DNSSEC set ordering query", "update records set ordername='%s',auth=%d where name='%s' and domain_id='%d'"); + declare(suffix,"set-auth-on-ds-record-query", "DNSSEC set auth on a DS record", "update records set auth=1 where domain_id='%d' and name='%s' and type='DS'"); + declare(suffix,"nullify-ordername-and-update-auth-query", "DNSSEC nullify ordername and update auth query", "update records set ordername=NULL,auth=%d where domain_id='%d' and name='%s'"); declare(suffix,"nullify-ordername-and-auth-query", "DNSSEC nullify ordername and auth query", "update records set ordername=NULL,auth=0 where name='%s' and type='%s' and domain_id='%d'"); - declare(suffix,"set-auth-on-ds-record-query", "DNSSEC set auth on a DS record", "update records set auth=1 where domain_id='%d' and name='%s' and type='DS'"); declare(suffix,"update-master-query","", "update domains set master='%s' where name='%s'"); declare(suffix,"update-kind-query","", "update domains set type='%s' where name='%s'"); @@ -114,6 +113,7 @@ public: declare(suffix,"delete-domain-query","", "delete from domains where name='%s'"); declare(suffix,"delete-zone-query","", "delete from records where domain_id=%d"); declare(suffix,"delete-rrset-query","","delete from records where domain_id=%d and name='%s' and type='%s'"); + declare(suffix,"add-domain-key-query","", "insert into cryptokeys (id, domain_id, flags, active, content) select cryptokeys_id_sequence.nextval, id, %d, %d, '%s' from domains where name='%s'"); declare(suffix,"list-domain-keys-query","", "select cryptokeys.id, flags, active, content from domains, cryptokeys where cryptokeys.domain_id=domains.id and name='%s'"); declare(suffix,"get-domain-metadata-query","", "select content from domains, domainmetadata where domainmetadata.domain_id=domains.id and name='%s' and domainmetadata.kind='%s'"); @@ -122,7 +122,7 @@ public: declare(suffix,"set-domain-metadata-query","", "insert into domainmetadata (id, domain_id, kind, content) select domainmetadata_sequence_id.nextval, id, '%s', '%s' from domains where name='%s'"); declare(suffix,"activate-domain-key-query","", "update cryptokeys set active=1 where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); declare(suffix,"deactivate-domain-key-query","", "update cryptokeys set active=0 where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); - declare(suffix,"remove-domain-key-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); + declare(suffix,"remove-domain-key-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s') and cryptokeys.id=%d"); declare(suffix,"clear-domain-all-keys-query","", "delete from cryptokeys where domain_id=(select id from domains where name='%s')"); declare(suffix,"get-tsig-key-query","", "select algorithm, secret from tsigkeys where name='%s'"); declare(suffix,"set-tsig-key-query","", "insert into tsigkeys (name,algorithm,secret) VALUES('%s','%s','%s')"); @@ -130,9 +130,8 @@ public: declare(suffix,"get-tsig-keys-query","", "select name,algorithm, secret from tsigkeys"); declare(suffix,"get-all-domains-query", "Retrieve all domains", "select records.domain_id, records.name, records.content, domains.type, domains.master, domains.notified_serial, domains.last_check from records, domains where records.domain_id=domains.id and records.type='SOA'"); - } - + DNSBackend *make(const string &suffix="") { return new gOracleBackend(d_mode,suffix); diff --git a/modules/goraclebackend/goraclebackend.hh b/modules/goraclebackend/goraclebackend.hh index 5d8146b77..1ca3b8b05 100644 --- a/modules/goraclebackend/goraclebackend.hh +++ b/modules/goraclebackend/goraclebackend.hh @@ -1,6 +1,5 @@ #include #include - #include "pdns/backends/gsql/gsqlbackend.hh" #include "pdns/namespaces.hh" @@ -11,6 +10,4 @@ class gOracleBackend : public GSQLBackend { public: gOracleBackend(const string &mode, const string &suffix); //!< Makes our connection to the database. Throws an exception if it fails. - -private: }; diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc index 1ae3c3ded..7d30494b3 100644 --- a/modules/gpgsqlbackend/gpgsqlbackend.cc +++ b/modules/gpgsqlbackend/gpgsqlbackend.cc @@ -1,17 +1,14 @@ #include #include - #include "pdns/namespaces.hh" - #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" -#include "gpgsqlbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" #include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" - +#include "gpgsqlbackend.hh" #include "spgsql.hh" #include @@ -25,7 +22,7 @@ gPgSQLBackend::gPgSQLBackend(const string &mode, const string &suffix) : GSQLBa getArg("user"), getArg("password"))); } - + catch(SSqlException &e) { L<~ limit 1"); declare(suffix,"get-order-after-query","DNSSEC Ordering Query, after", "select ordername from records where ordername ~>~ E'%s' and domain_id=%d and ordername is not null order by 1 using ~<~ limit 1"); @@ -105,7 +102,7 @@ public: declare(suffix,"nullify-ordername-and-update-auth-query", "DNSSEC nullify ordername and update auth query", "update records set ordername=NULL,auth=%d::bool where domain_id='%d' and name='%s'"); declare(suffix,"nullify-ordername-and-auth-query", "DNSSEC nullify ordername and auth query", "update records set ordername=NULL,auth=false where name=E'%s' and type=E'%s' and domain_id='%d'"); - + declare(suffix,"update-master-query","", "update domains set master='%s' where name='%s'"); declare(suffix,"update-kind-query","", "update domains set type='%s' where name='%s'"); declare(suffix,"update-serial-query","", "update domains set notified_serial=%d where id=%d"); @@ -133,7 +130,7 @@ public: declare(suffix,"get-all-domains-query", "Retrieve all domains", "select records.domain_id, records.name, records.content, domains.type, domains.master, domains.notified_serial, domains.last_check from records, domains where records.domain_id=domains.id and records.type='SOA'"); } - + DNSBackend *make(const string &suffix="") { return new gPgSQLBackend(d_mode,suffix);