From 8710b5230160d65cb0a45b66fc54cf63767f761f Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Fri, 24 Jan 2014 16:50:05 +0100 Subject: [PATCH] Remove whitespace, dead GRANTs from SQL schema files --- modules/gmysqlbackend/dnssec.schema.mysql.sql | 6 +++--- modules/gmysqlbackend/no-dnssec.schema.mysql.sql | 6 +++--- modules/gpgsqlbackend/dnssec.schema.pgsql.sql | 7 ------- modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql | 6 ------ modules/gsqlite3backend/dnssec.schema.sqlite3.sql | 4 ++-- modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql | 10 +++++----- 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/modules/gmysqlbackend/dnssec.schema.mysql.sql b/modules/gmysqlbackend/dnssec.schema.mysql.sql index 0cb9af66b..369667b5f 100644 --- a/modules/gmysqlbackend/dnssec.schema.mysql.sql +++ b/modules/gmysqlbackend/dnssec.schema.mysql.sql @@ -6,7 +6,7 @@ create table domainmetadata ( primary key(id) ) Engine=InnoDB; -create index domainmetaidindex on domainmetadata(domain_id); +create index domainmetaidindex on domainmetadata(domain_id); create table cryptokeys ( @@ -18,7 +18,7 @@ create table cryptokeys ( primary key(id) ) Engine=InnoDB; -create index domainidindex on cryptokeys(domain_id); +create index domainidindex on cryptokeys(domain_id); alter table records add ordername VARCHAR(255) BINARY; alter table records add auth bool; @@ -26,7 +26,7 @@ create index recordorder on records (domain_id, ordername); create table tsigkeys ( id INT auto_increment, - name VARCHAR(255), + name VARCHAR(255), algorithm VARCHAR(50), secret VARCHAR(255), primary key(id) diff --git a/modules/gmysqlbackend/no-dnssec.schema.mysql.sql b/modules/gmysqlbackend/no-dnssec.schema.mysql.sql index acb31503b..d2ed72cdc 100644 --- a/modules/gmysqlbackend/no-dnssec.schema.mysql.sql +++ b/modules/gmysqlbackend/no-dnssec.schema.mysql.sql @@ -4,7 +4,7 @@ create table domains ( master VARCHAR(128) DEFAULT NULL, last_check INT DEFAULT NULL, type VARCHAR(6) NOT NULL, - notified_serial INT DEFAULT NULL, + notified_serial INT DEFAULT NULL, account VARCHAR(40) DEFAULT NULL, primary key (id) ) Engine=InnoDB; @@ -27,8 +27,8 @@ CREATE INDEX nametype_index ON records(name,type); CREATE INDEX domain_id ON records(domain_id); create table supermasters ( - ip VARCHAR(64) NOT NULL, - nameserver VARCHAR(255) NOT NULL, + ip VARCHAR(64) NOT NULL, + nameserver VARCHAR(255) NOT NULL, account VARCHAR(40) DEFAULT NULL, PRIMARY KEY (ip, nameserver) ) Engine=InnoDB; diff --git a/modules/gpgsqlbackend/dnssec.schema.pgsql.sql b/modules/gpgsqlbackend/dnssec.schema.pgsql.sql index 85570ee43..f0dda5144 100644 --- a/modules/gpgsqlbackend/dnssec.schema.pgsql.sql +++ b/modules/gpgsqlbackend/dnssec.schema.pgsql.sql @@ -22,11 +22,6 @@ create table cryptokeys ( create index domainidindex on cryptokeys(domain_id); --- GRANT ALL ON domainmetadata TO pdns; --- GRANT ALL ON domainmetadata_id_seq TO pdns; --- GRANT ALL ON cryptokeys TO pdns; --- GRANT ALL ON cryptokeys_id_seq TO pdns; - create table tsigkeys ( id SERIAL PRIMARY KEY, name VARCHAR(255), @@ -37,6 +32,4 @@ create table tsigkeys ( create unique index namealgoindex on tsigkeys(name, algorithm); --- GRANT ALL ON tsigkeys TO pdns; --- GRANT ALL ON tsigkeys_id_seq TO pdns; alter table records alter column type type VARCHAR(10); diff --git a/modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql b/modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql index 02c1e7633..c48e1d769 100644 --- a/modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql +++ b/modules/gpgsqlbackend/no-dnssec.schema.pgsql.sql @@ -35,9 +35,3 @@ create table supermasters ( account VARCHAR(40) DEFAULT NULL, PRIMARY KEY (ip, nameserver) ); - --- GRANT SELECT ON supermasters TO pdns; --- GRANT ALL ON domains TO pdns; --- GRANT ALL ON domains_id_seq TO pdns; --- GRANT ALL ON records TO pdns; --- GRANT ALL ON records_id_seq TO pdns; diff --git a/modules/gsqlite3backend/dnssec.schema.sqlite3.sql b/modules/gsqlite3backend/dnssec.schema.sqlite3.sql index 40562d20b..69afe63d0 100644 --- a/modules/gsqlite3backend/dnssec.schema.sqlite3.sql +++ b/modules/gsqlite3backend/dnssec.schema.sqlite3.sql @@ -17,9 +17,9 @@ create table cryptokeys ( flags INT NOT NULL, active BOOL, content TEXT -); +); -create index domainidindex on cryptokeys(domain_id); +create index domainidindex on cryptokeys(domain_id); create table tsigkeys ( id INTEGER PRIMARY KEY, diff --git a/modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql b/modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql index 6a7771987..a6f13b966 100644 --- a/modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql +++ b/modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql @@ -4,7 +4,7 @@ create table domains ( master VARCHAR(128) DEFAULT NULL, last_check INTEGER DEFAULT NULL, type VARCHAR(6) NOT NULL, - notified_serial INTEGER DEFAULT NULL, + notified_serial INTEGER DEFAULT NULL, account VARCHAR(40) DEFAULT NULL ); @@ -13,21 +13,21 @@ CREATE UNIQUE INDEX name_index ON domains(name); CREATE TABLE records ( id INTEGER PRIMARY KEY, domain_id INTEGER DEFAULT NULL, - name VARCHAR(255) DEFAULT NULL, + name VARCHAR(255) DEFAULT NULL, type VARCHAR(10) DEFAULT NULL, content VARCHAR(65535) DEFAULT NULL, ttl INTEGER DEFAULT NULL, prio INTEGER DEFAULT NULL, change_date INTEGER DEFAULT NULL ); - + CREATE INDEX rec_name_index ON records(name); CREATE INDEX nametype_index ON records(name,type); CREATE INDEX domain_id ON records(domain_id); create table supermasters ( - ip VARCHAR(64) NOT NULL, - nameserver VARCHAR(255) NOT NULL COLLATE NOCASE, + ip VARCHAR(64) NOT NULL, + nameserver VARCHAR(255) NOT NULL COLLATE NOCASE, account VARCHAR(40) DEFAULT NULL ); -- 2.40.0