pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch hotfix/v7.3.3 into develop

Browse Source
This commit is contained in:
papacarlo
2023-05-15 06:49:54 +00:00
parent 3917eed899 6892067eda
commit def9f9aeae
8 changed files with 214 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
schema/mysql/createdb.sql
View File

@ -45,29 +45,6 @@ CREATE TABLE IF NOT EXISTS `doc_changes` (
/*!40000 ALTER TABLE `doc_changes` ENABLE KEYS */;
--
-- Definition of table `doc_changes`
--
CREATE TABLE IF NOT EXISTS `doc_changes2` (
`tenant` varchar(255) NOT NULL,
`id` varchar(255) NOT NULL,
`change_id` int(10) unsigned NOT NULL,
`user_id` varchar(255) NOT NULL,
`user_id_original` varchar(255) NOT NULL,
`user_name` varchar(255) NOT NULL,
`change_data` longblob NOT NULL,
`change_date` datetime NOT NULL,
PRIMARY KEY (`tenant`, `id`,`change_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--
-- Dumping data for table `doc_changes`
--
/*!40000 ALTER TABLE `doc_changes2` DISABLE KEYS */;
/*!40000 ALTER TABLE `doc_changes2` ENABLE KEYS */;
--
-- Definition of table `task_result`
--

18
schema/mysql/upgrade/upgradev730.sql
View File

@ -1,18 +0,0 @@
DELIMITER DLM00
DROP PROCEDURE IF EXISTS upgrade730 DLM00
CREATE PROCEDURE upgrade730()
BEGIN
IF (SELECT DATA_TYPE FROM information_schema.`COLUMNS` WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'doc_changes' AND COLUMN_NAME = 'change_data') <> 'longblob' THEN
SET SQL_SAFE_UPDATES=0;
ALTER TABLE `doc_changes` CHANGE COLUMN `change_data` `change_data` LONGBLOB NOT NULL ;
SET SQL_SAFE_UPDATES=1;
END IF;
END DLM00
CALL upgrade730() DLM00
DELIMITER ;

16
schema/postgresql/createdb.sql
View File

@ -20,22 +20,6 @@ PRIMARY KEY ("tenant", "id", "change_id")
)
WITH (OIDS=FALSE);
-- ----------------------------
-- Table structure for doc_changes2
-- ----------------------------
CREATE TABLE IF NOT EXISTS "public"."doc_changes2" (
"tenant" varchar(255) COLLATE "default" NOT NULL,
"id" varchar(255) COLLATE "default" NOT NULL,
"change_id" int4 NOT NULL,
"user_id" varchar(255) COLLATE "default" NOT NULL,
"user_id_original" varchar(255) COLLATE "default" NOT NULL,
"user_name" varchar(255) COLLATE "default" NOT NULL,
"change_data" bytea NOT NULL,
"change_date" timestamp without time zone NOT NULL,
PRIMARY KEY ("tenant", "id", "change_id")
)
WITH (OIDS=FALSE);
-- ----------------------------
-- Table structure for task_result
-- ----------------------------

9
schema/postgresql/upgrade/upgradev730.sql
View File

@ -1,9 +0,0 @@
DO $$
BEGIN
BEGIN
ALTER TABLE doc_changes ALTER COLUMN change_data TYPE bytea USING change_data::bytea;
EXCEPTION
WHEN duplicate_column THEN RAISE NOTICE 'cant modify doc_changes.change_data colummn';
END;
END;
$$