From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 8 Aug 2022 13:51:50 +0000 (+0200)
Subject: auth catalog zones: simplify migration schemas by appending columns
X-Git-Tag: rec-4.8.0-alpha1~39^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee0f99ce3d9fd4cd23c8a7cdaf45eae7470c281a;p=thirdparty%2Fpdns.git

auth catalog zones: simplify migration schemas by appending columns
---

diff --git a/modules/gmysqlbackend/4.3.0_to_4.7.0_schema.mysql.sql b/modules/gmysqlbackend/4.3.0_to_4.7.0_schema.mysql.sql
index e71a0eb9ef..5daeca47cd 100644
--- a/modules/gmysqlbackend/4.3.0_to_4.7.0_schema.mysql.sql
+++ b/modules/gmysqlbackend/4.3.0_to_4.7.0_schema.mysql.sql
@@ -1,5 +1,5 @@
-ALTER TABLE domains ADD options VARCHAR(64000) DEFAULT NULL AFTER notified_serial;
-ALTER TABLE domains ADD catalog VARCHAR(255) DEFAULT NULL AFTER options;
+ALTER TABLE domains ADD options VARCHAR(64000) DEFAULT NULL;
+ALTER TABLE domains ADD catalog VARCHAR(255) DEFAULT NULL;
 ALTER TABLE domains MODIFY type VARCHAR(8) NOT NULL;
 
 CREATE INDEX catalog_idx ON domains(catalog);
diff --git a/modules/gmysqlbackend/schema.mysql.sql b/modules/gmysqlbackend/schema.mysql.sql
index a58c81d43f..0f3a6ccdfb 100644
--- a/modules/gmysqlbackend/schema.mysql.sql
+++ b/modules/gmysqlbackend/schema.mysql.sql
@@ -5,9 +5,9 @@ CREATE TABLE domains (
   last_check            INT DEFAULT NULL,
   type                  VARCHAR(8) NOT NULL,
   notified_serial       INT UNSIGNED DEFAULT NULL,
+  account               VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL,
   options               VARCHAR(64000) DEFAULT NULL,
   catalog               VARCHAR(255) DEFAULT NULL,
-  account               VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL,
   PRIMARY KEY (id)
 ) Engine=InnoDB CHARACTER SET 'latin1';
 
diff --git a/modules/godbcbackend/schema.mssql.sql b/modules/godbcbackend/schema.mssql.sql
index 8f5d55d9e1..b7928b4708 100644
--- a/modules/godbcbackend/schema.mssql.sql
+++ b/modules/godbcbackend/schema.mssql.sql
@@ -5,9 +5,9 @@ CREATE TABLE domains (
   last_check            INT DEFAULT NULL,
   type                  VARCHAR(8) NOT NULL,
   notified_serial       INT DEFAULT NULL,
+  account               VARCHAR(40) DEFAULT NULL,
   options               VARCHAR(MAX) DEFAULT NULL,
   catalog               VARCHAR(255) DEFAULT NULL,
-  account               VARCHAR(40) DEFAULT NULL,
   PRIMARY KEY (id)
 );
 
diff --git a/modules/gpgsqlbackend/4.3.0_to_4.7.0_schema.pgsql.sql b/modules/gpgsqlbackend/4.3.0_to_4.7.0_schema.pgsql.sql
index bb9a07a5fc..fdfd61dc00 100644
--- a/modules/gpgsqlbackend/4.3.0_to_4.7.0_schema.pgsql.sql
+++ b/modules/gpgsqlbackend/4.3.0_to_4.7.0_schema.pgsql.sql
@@ -1,13 +1,5 @@
-BEGIN;
-  ALTER TABLE domains ADD COLUMN options VARCHAR(65535) DEFAULT NULL;
-  ALTER TABLE domains ADD COLUMN catalog VARCHAR(255) DEFAULT NULL;
+ALTER TABLE domains ALTER COLUMN type TYPE text;
+ALTER TABLE domains ADD COLUMN options TEXT DEFAULT NULL,
+  ADD COLUMN catalog TEXT DEFAULT NULL;
 
-  ALTER TABLE domains ADD COLUMN account_new VARCHAR(40) DEFAULT NULL;
-  UPDATE domains SET account_new = account;
-  ALTER TABLE domains DROP COLUMN account;
-  ALTER TABLE domains RENAME COLUMN account_new TO account;
-
-  ALTER TABLE domains ALTER type VARCHAR(8) NOT NULL;
-
-  CREATE INDEX catalog_idx ON domains(catalog);
-COMMIT;
+CREATE INDEX catalog_idx ON domains(catalog);
diff --git a/modules/gpgsqlbackend/schema.pgsql.sql b/modules/gpgsqlbackend/schema.pgsql.sql
index 4f1489c5b6..9a2011213d 100644
--- a/modules/gpgsqlbackend/schema.pgsql.sql
+++ b/modules/gpgsqlbackend/schema.pgsql.sql
@@ -5,9 +5,9 @@ CREATE TABLE domains (
   last_check            INT DEFAULT NULL,
   type                  VARCHAR(8) NOT NULL,
   notified_serial       BIGINT DEFAULT NULL,
+  account               VARCHAR(40) DEFAULT NULL,
   options               VARCHAR(65535) DEFAULT NULL,
   catalog               VARCHAR(255) DEFAULT NULL,
-  account               VARCHAR(40) DEFAULT NULL,
   CONSTRAINT c_lowercase_name CHECK (((name)::TEXT = LOWER((name)::TEXT)))
 );
 
diff --git a/modules/gsqlite3backend/4.3.1_to_4.7.0_schema.sqlite3.sql b/modules/gsqlite3backend/4.3.1_to_4.7.0_schema.sqlite3.sql
index d46bb1c344..0d9c4e837d 100644
--- a/modules/gsqlite3backend/4.3.1_to_4.7.0_schema.sqlite3.sql
+++ b/modules/gsqlite3backend/4.3.1_to_4.7.0_schema.sqlite3.sql
@@ -10,9 +10,9 @@ BEGIN TRANSACTION;
     last_check            INTEGER DEFAULT NULL,
     type                  VARCHAR(8) NOT NULL,
     notified_serial       INTEGER DEFAULT NULL,
+    account               VARCHAR(40) DEFAULT NULL,
     options               VARCHAR(65535) DEFAULT NULL,
-    catalog               VARCHAR(255) DEFAULT NULL,
-    account               VARCHAR(40) DEFAULT NULL
+    catalog               VARCHAR(255) DEFAULT NULL
   );
 
   INSERT INTO domains_temp SELECT id,name,master,last_check,type,notified_serial,NULL,NULL,account FROM domains;
diff --git a/modules/gsqlite3backend/schema.sqlite3.sql b/modules/gsqlite3backend/schema.sqlite3.sql
index 0f2c94b53d..b34e3a46d9 100644
--- a/modules/gsqlite3backend/schema.sqlite3.sql
+++ b/modules/gsqlite3backend/schema.sqlite3.sql
@@ -6,10 +6,10 @@ CREATE TABLE domains (
   master                VARCHAR(128) DEFAULT NULL,
   last_check            INTEGER DEFAULT NULL,
   type                  VARCHAR(8) NOT NULL,
-  options               VARCHAR(65535) DEFAULT NULL,
-  catalog               VARCHAR(255) DEFAULT NULL,
   notified_serial       INTEGER DEFAULT NULL,
-  account               VARCHAR(40) DEFAULT NULL
+  account               VARCHAR(40) DEFAULT NULL,
+  options               VARCHAR(65535) DEFAULT NULL,
+  catalog               VARCHAR(255) DEFAULT NULL
 );
 
 CREATE UNIQUE INDEX name_index ON domains(name);