From 67db1c6e9bc474c34cb10029794b64be8c85a393 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Sat, 23 Jan 2021 15:24:24 +0100 Subject: melt diff prod fork 4.6.2 air onto 5.2.1 to 5.2.2 DB 1241 --- install/schema_mysql.sql | 39 +++++++++++++++++++++++++++++---------- install/schema_postgres.sql | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 60 insertions(+), 21 deletions(-) (limited to 'install') diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 977d26232..17ad1767e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1097,16 +1097,35 @@ CREATE TABLE IF NOT EXISTS `profile_check` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `register` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `hash` char(191) NOT NULL DEFAULT '', - `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', - `uid` int(10) unsigned NOT NULL DEFAULT 0 , - `password` char(191) NOT NULL DEFAULT '', - `lang` char(16) NOT NULL DEFAULT '', - PRIMARY KEY (`id`), - KEY `hash` (`hash`), - KEY `created` (`created`), - KEY `uid` (`uid`) + `reg_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `reg_vital` int(10) unsigned NOT NULL DEFAULT 1, + `reg_flags` int(10) unsigned NOT NULL DEFAULT 0, + `reg_didx` char(1) NOT NULL DEFAULT '', + `reg_did2` char(191) NOT NULL DEFAULT '', + `reg_hash` char(191) NOT NULL DEFAULT '', + `reg_email` char(191) NOT NULL DEFAULT '', + `reg_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', + `reg_startup` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', + `reg_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', + `reg_byc` int(10) unsigned NOT NULL DEFAULT 0 , + `reg_uid` int(10) unsigned NOT NULL DEFAULT 0 , + `reg_atip` char(191) NOT NULL DEFAULT '', + `reg_pass` char(191) NOT NULL DEFAULT '', + `reg_lang` char(16) NOT NULL DEFAULT '', + `reg_stuff` text NOT NULL, + PRIMARY KEY (`reg_id`), + KEY `ix_reg_vital` (`reg_vital`), + KEY `ix_reg_flags` (`reg_flags`), + KEY `ix_reg_didx` (`reg_didx`), + KEY `ix_reg_did2` (`reg_did2`), + KEY `ix_reg_hash` (`reg_hash`), + KEY `ix_reg_email` (`reg_email`), + KEY `ix_reg_created` (`reg_created`), + KEY `ix_reg_startup` (`reg_startup`), + KEY `ix_reg_expires` (`reg_expires`), + KEY `ix_reg_byc` (`reg_byc`), + KEY `ix_reg_uid` (`reg_uid`), + KEY `ix_reg_atip` (`reg_atip`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `session` ( diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index c04ba9c67..cdca79cfc 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1092,17 +1092,37 @@ create index "pc_sec" on profile_check ("sec"); create index "pc_expire" on profile_check ("expire"); CREATE TABLE "register" ( - "id" serial NOT NULL, - "hash" text NOT NULL, - "created" timestamp NOT NULL, - "uid" bigint NOT NULL, - "password" text NOT NULL, - "lang" varchar(16) NOT NULL, - PRIMARY KEY ("id") -); -create index "reg_hash" on register ("hash"); -create index "reg_created" on register ("created"); -create index "reg_uid" on register ("uid"); + "reg_id" serial NOT NULL, + "reg_vital" int DEFAULT 1 NOT NULL, + "reg_flags_" bigint DEFAULT 0 NOT NULL, + "reg_didx" char(1) DEFAULT '' NOT NULL, + "reg_did2" text DEFAULT '' NOT NULL, + "reg_hash" text DEFAULT '' NOT NULL, + "reg_email" text DEFAULT '' NOT NULL, + "reg_created" timestamp NOT NULL, + "reg_startup" timestamp NOT NULL, + "reg_expires" timestamp NOT NULL, + "reg_byc" bigint DEFAULT 0 NOT NULL, + "reg_uid" bigint DEFAULT 0 NOT NULL, + "reg_atip" text DEFAULT '' NOT NULL, + "reg_pass" text DEFAULT '' NOT NULL, + "reg_lang" varchar(16) DEFAULT '' NOT NULL, + "reg_stuff" text NOT NULL, + PRIMARY KEY ("reg_id") +); +create index "ix_reg_vital" on register ("reg_vital"); +create index "ix_reg_flags" on register ("reg_flags"); +create index "ix_reg_didx" on register ("reg_didx"); +create index "ix_reg_did2" on register ("reg_did2"); +create index "ix_reg_hash" on register ("reg_hash"); +create index "ix_reg_email" on register ("reg_email"); +create index "ix_reg_created" on register ("reg_created"); +create index "ix_reg_startup" on register ("reg_startup"); +create index "ix_reg_expires" on register ("reg_expires"); +create index "ix_reg_byc" on register ("reg_byc"); +create index "ix_reg_uid" on register ("reg_uid"); +create index "ix_reg_atip" on register ("reg_atip"); + CREATE TABLE "session" ( "id" serial, "sid" text NOT NULL, -- cgit v1.2.3