Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collection of schema changes #5518

Merged
merged 4 commits into from Aug 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions build-scripts/build-auth-rpm
Expand Up @@ -497,6 +497,7 @@ fi
%doc %{_defaultdocdir}/%{name}/schema.pgsql.sql
%doc %{_defaultdocdir}/%{name}/nodnssec-3.x_to_3.4.0_schema.pgsql.sql
%doc %{_defaultdocdir}/%{name}/dnssec-3.x_to_3.4.0_schema.pgsql.sql
%doc %{_defaultdocdir}/%{name}/3.4.0_to_4.1.0_schema.pgsql.sql
%{_libdir}/%{name}/libgpgsqlbackend.so

%files backend-pipe
Expand Down
20 changes: 20 additions & 0 deletions modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
@@ -1 +1,21 @@
ALTER TABLE domains MODIFY account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL;
ALTER TABLE domains CHARACTER SET 'latin1';

ALTER TABLE records MODIFY id BIGINT AUTO_INCREMENT;
ALTER TABLE records CHARACTER SET 'latin1';
CREATE INDEX ordername ON records (ordername);
DROP INDEX recordorder ON records;

ALTER TABLE supermasters MODIFY account VARCHAR(40) CHARACTER SET 'utf8' NOT NULL;
ALTER TABLE supermasters CHARACTER SET 'latin1';

ALTER TABLE comments MODIFY account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL;
ALTER TABLE comments MODIFY comment TEXT CHARACTER SET 'utf8' NOT NULL;
ALTER TABLE comments CHARACTER SET 'latin1';
DROP INDEX comments_domain_id_idx ON comments;

ALTER TABLE domainmetadata CHARACTER SET 'latin1';

ALTER TABLE cryptokeys CHARACTER SET 'latin1';

ALTER TABLE tsigkeys CHARACTER SET 'latin1';
25 changes: 12 additions & 13 deletions modules/gmysqlbackend/schema.mysql.sql
Expand Up @@ -5,9 +5,9 @@ CREATE TABLE domains (
last_check INT DEFAULT NULL,
type VARCHAR(6) NOT NULL,
notified_serial INT DEFAULT NULL,
account VARCHAR(40) DEFAULT NULL,
account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL,
PRIMARY KEY (id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE UNIQUE INDEX name_index ON domains(name);

Expand All @@ -25,19 +25,19 @@ CREATE TABLE records (
ordername VARCHAR(255) BINARY DEFAULT NULL,
auth TINYINT(1) DEFAULT 1,
PRIMARY KEY (id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE INDEX nametype_index ON records(name,type);
CREATE INDEX domain_id ON records(domain_id);
CREATE INDEX recordorder ON records (domain_id, ordername);
CREATE INDEX ordername ON records (ordername);


CREATE TABLE supermasters (
ip VARCHAR(64) NOT NULL,
nameserver VARCHAR(255) NOT NULL,
account VARCHAR(40) NOT NULL,
account VARCHAR(40) CHARACTER SET 'utf8' NOT NULL,
PRIMARY KEY (ip, nameserver)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';


CREATE TABLE comments (
Expand All @@ -46,12 +46,11 @@ CREATE TABLE comments (
name VARCHAR(255) NOT NULL,
type VARCHAR(10) NOT NULL,
modified_at INT NOT NULL,
account VARCHAR(40) NOT NULL,
comment VARCHAR(64000) NOT NULL,
account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL,
comment TEXT CHARACTER SET 'utf8' NOT NULL,
PRIMARY KEY (id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE INDEX comments_domain_id_idx ON comments (domain_id);
CREATE INDEX comments_name_type_idx ON comments (name, type);
CREATE INDEX comments_order_idx ON comments (domain_id, modified_at);

Expand All @@ -62,7 +61,7 @@ CREATE TABLE domainmetadata (
kind VARCHAR(32),
content TEXT,
PRIMARY KEY (id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE INDEX domainmetadata_idx ON domainmetadata (domain_id, kind);

Expand All @@ -74,7 +73,7 @@ CREATE TABLE cryptokeys (
active BOOL,
content TEXT,
PRIMARY KEY(id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE INDEX domainidindex ON cryptokeys(domain_id);

Expand All @@ -85,6 +84,6 @@ CREATE TABLE tsigkeys (
algorithm VARCHAR(50),
secret VARCHAR(255),
PRIMARY KEY (id)
) Engine=InnoDB;
) Engine=InnoDB CHARACTER SET 'latin1';

CREATE UNIQUE INDEX namealgoindex ON tsigkeys(name, algorithm);
5 changes: 3 additions & 2 deletions modules/gpgsqlbackend/Makefile.am
Expand Up @@ -4,14 +4,15 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la
EXTRA_DIST = \
OBJECTFILES \
OBJECTLIBS \
dnssec-3.x_to_3.4.0_schema.pgsql.sql
dnssec-3.x_to_3.4.0_schema.pgsql.sql \
nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
schema.pgsql.sql

dist_doc_DATA = \
schema.pgsql.sql \
nodnssec-3.x_to_3.4.0_schema.pgsql.sql \
dnssec-3.x_to_3.4.0_schema.pgsql.sql
dnssec-3.x_to_3.4.0_schema.pgsql.sql \
3.4.0_to_4.1.0_schema.pgsql.sql

libgpgsqlbackend_la_SOURCES = \
gpgsqlbackend.cc gpgsqlbackend.hh \
Expand Down