From 340d37dedb9dbaf1a7f8aa97ce000ab231c62f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?= <38058090+SkywalkerSpace@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:21:48 +0800 Subject: [PATCH] update sql org_saml_config (#5496) --- scripts/upgrade/sql/10.0.0/mysql/seahub.sql | 4 +++- scripts/upgrade/sql/10.0.0/sqlite3/seahub.sql | 2 +- sql/mysql.sql | 4 +++- sql/sqlite3.sql | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade/sql/10.0.0/mysql/seahub.sql b/scripts/upgrade/sql/10.0.0/mysql/seahub.sql index f558211268..06233f90ab 100644 --- a/scripts/upgrade/sql/10.0.0/mysql/seahub.sql +++ b/scripts/upgrade/sql/10.0.0/mysql/seahub.sql @@ -2,8 +2,10 @@ CREATE TABLE IF NOT EXISTS `org_saml_config` ( `id` int(11) NOT NULL AUTO_INCREMENT, `org_id` int(11) NOT NULL, `metadata_url` longtext NOT NULL, + `domain` varchar(255) NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `org_id` (`org_id`) + UNIQUE KEY `org_id` (`org_id`), + UNIQUE KEY `domain` (`domain`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `base_usermonitoredrepos` ( diff --git a/scripts/upgrade/sql/10.0.0/sqlite3/seahub.sql b/scripts/upgrade/sql/10.0.0/sqlite3/seahub.sql index aa60df4ddc..7881f58f71 100644 --- a/scripts/upgrade/sql/10.0.0/sqlite3/seahub.sql +++ b/scripts/upgrade/sql/10.0.0/sqlite3/seahub.sql @@ -1,4 +1,4 @@ -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); +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) NOT NULL UNIQUE); 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"); diff --git a/sql/mysql.sql b/sql/mysql.sql index 9a94e344c6..9274c276ee 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1349,8 +1349,10 @@ CREATE TABLE `org_saml_config` ( `id` int(11) NOT NULL AUTO_INCREMENT, `org_id` int(11) NOT NULL, `metadata_url` longtext NOT NULL, + `domain` varchar(255) NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `org_id` (`org_id`) + UNIQUE KEY `org_id` (`org_id`), + UNIQUE KEY `domain` (`domain`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `base_usermonitoredrepos` ( diff --git a/sql/sqlite3.sql b/sql/sqlite3.sql index 404f62a36d..b597780253 100644 --- a/sql/sqlite3.sql +++ b/sql/sqlite3.sql @@ -615,7 +615,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); +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) NOT NULL UNIQUE); 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"); CREATE INDEX IF NOT EXISTS "base_usermonitoredrepos_repo_id_00e624c3" ON "base_usermonitoredrepos" ("repo_id");