diff --git a/scripts/upgrade/sql/11.0.0/mysql/seahub.sql b/scripts/upgrade/sql/11.0.0/mysql/seahub.sql index c1d23683c4..a90c880583 100644 --- a/scripts/upgrade/sql/11.0.0/mysql/seahub.sql +++ b/scripts/upgrade/sql/11.0.0/mysql/seahub.sql @@ -107,6 +107,7 @@ ALTER TABLE `org_saml_config` CHANGE domain domain varchar(255) DEFAULT NULL; ALTER TABLE `org_saml_config` ADD COLUMN IF NOT EXISTS `dns_txt` varchar(64) NULL; ALTER TABLE `org_saml_config` ADD COLUMN IF NOT EXISTS `domain_verified` TINYINT(1) NOT NULL DEFAULT 0; ALTER TABLE `org_saml_config` ADD INDEX IF NOT EXISTS `org_saml_config_domain_verified_398065b9` (`domain_verified`); +ALTER TABLE `org_saml_config` ADD COLUMN IF NOT EXISTS `idp_certificate` longtext DEFAULT NULL; UPDATE `org_saml_config` SET domain_verified=1 WHERE domain_verified=0; ALTER TABLE `social_auth_usersocialauth` CHANGE extra_data extra_data longtext DEFAULT NULL; diff --git a/scripts/upgrade/sql/11.0.0/sqlite3/seahub.sql b/scripts/upgrade/sql/11.0.0/sqlite3/seahub.sql index f32caf5be7..3b98d236b4 100644 --- a/scripts/upgrade/sql/11.0.0/sqlite3/seahub.sql +++ b/scripts/upgrade/sql/11.0.0/sqlite3/seahub.sql @@ -39,7 +39,7 @@ DROP TABLE "options_useroptions_old"; DROP TABLE IF EXISTS "org_saml_config_old"; ALTER TABLE "org_saml_config" RENAME TO "org_saml_config_old"; -CREATE TABLE IF NOT EXISTS "org_saml_config" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "org_id" integer NOT NULL UNIQUE, "metadata_url" TEXT NOT NULL, "domain" varchar(255) NULL UNIQUE, "dns_txt" varchar(64) NULL, "domain_verified" integer NOT NULL DEFAULT 0); +CREATE TABLE IF NOT EXISTS "org_saml_config" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "org_id" integer NOT NULL UNIQUE, "metadata_url" TEXT NOT NULL, "domain" varchar(255) NULL UNIQUE, "dns_txt" varchar(64) NULL, "domain_verified" integer NOT NULL DEFAULT 0, "idp_certificate" text NULL); CREATE INDEX IF NOT EXISTS "org_saml_config_domain_verified_398065b9" ON "org_saml_config" ("domain_verified"); INSERT INTO "org_saml_config" ("org_id", "metadata_url", "domain") SELECT "org_id", "metadata_url", "domain" FROM "org_saml_config_old"; UPDATE `org_saml_config` SET domain_verified=1 WHERE domain_verified=0; diff --git a/sql/mysql.sql b/sql/mysql.sql index 629ba96358..29053c11d9 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1353,6 +1353,7 @@ CREATE TABLE `org_saml_config` ( `domain` varchar(255) DEFAULT NULL, `dns_txt` varchar(64) DEFAULT NULL, `domain_verified` tinyint(1) NOT NULL DEFAULT 0, + `idp_certificate` longtext DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `org_id` (`org_id`), UNIQUE KEY `domain` (`domain`), diff --git a/sql/sqlite3.sql b/sql/sqlite3.sql index fca2815fcc..b81e19f0ea 100644 --- a/sql/sqlite3.sql +++ b/sql/sqlite3.sql @@ -616,7 +616,7 @@ CREATE INDEX IF NOT EXISTS "ocm_via_webdav_share_received_shared_by_1786d580" ON CREATE TABLE IF NOT EXISTS "onlyoffice_onlyofficedockey" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "doc_key" varchar(36) NOT NULL, "username" varchar(255) NOT NULL, "repo_id" varchar(36) NULL, "file_path" TEXT NOT NULL, "repo_id_file_path_md5" varchar(100) NOT NULL, "created_time" datetime NOT NULL); CREATE INDEX IF NOT EXISTS "onlyoffice_onlyofficedockey_doc_key_edba1352" ON "onlyoffice_onlyofficedockey" ("doc_key"); CREATE INDEX IF NOT EXISTS "onlyoffice_onlyofficedockey_repo_id_file_path_md5_52002073" ON "onlyoffice_onlyofficedockey" ("repo_id_file_path_md5"); -CREATE TABLE IF NOT EXISTS "org_saml_config" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "org_id" integer NOT NULL UNIQUE, "metadata_url" TEXT NOT NULL, "domain" varchar(255) NULL UNIQUE, "dns_txt" varchar(64) NULL, "domain_verified" integer NOT NULL DEFAULT 0); +CREATE TABLE IF NOT EXISTS "org_saml_config" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "org_id" integer NOT NULL UNIQUE, "metadata_url" TEXT NOT NULL, "domain" varchar(255) NULL UNIQUE, "dns_txt" varchar(64) NULL, "domain_verified" integer NOT NULL DEFAULT 0, "idp_certificate" text NULL); CREATE INDEX IF NOT EXISTS "org_saml_config_domain_verified_398065b9" ON "org_saml_config" ("domain_verified"); CREATE TABLE IF NOT EXISTS "base_usermonitoredrepos" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "email" varchar(254) NOT NULL, "repo_id" varchar(36) NOT NULL, "timestamp" datetime NOT NULL, UNIQUE ("email", "repo_id")); CREATE INDEX IF NOT EXISTS "base_usermonitoredrepos_email_55ead1b9" ON "base_usermonitoredrepos" ("email");