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

Merge tag 'v4.2.5' into develop

Browse Source 
v4.2.5 v4.2.5
This commit is contained in:
Alexey Golubev
2017-01-16 15:01:18 +03:00
parent bb4d881b8f 27ab389700
commit bbe8dadd0d
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DocService/sources/DocsCoServer.js
View File

@ -1758,6 +1758,10 @@ exports.install = function(server, callbackFunction) {
var res = true; var res = true;
var docId = conn.docId; var docId = conn.docId;
var tmpUser = conn.user; var tmpUser = conn.user;
if (constants.CONN_CLOSED === conn.readyState) {
//closing could happen during async action
return false;
}
connections.push(conn); connections.push(conn);
yield* updatePresence(docId, tmpUser.id, getConnectionInfo(conn)); yield* updatePresence(docId, tmpUser.id, getConnectionInfo(conn));
var firstParticipantNoView, countNoView = 0; var firstParticipantNoView, countNoView = 0;

11
schema/postgresql/createdb.sql
View File

@ -4,13 +4,6 @@
-- CREATE DATABASE onlyoffice ENCODING = 'UTF8' CONNECTION LIMIT = -1; -- CREATE DATABASE onlyoffice ENCODING = 'UTF8' CONNECTION LIMIT = -1;
--
-- Drop tables
--
DROP TABLE IF EXISTS "public"."doc_callbacks";
DROP TABLE IF EXISTS "public"."doc_changes";
DROP TABLE IF EXISTS "public"."task_result";
-- ---------------------------- -- ----------------------------
-- Table structure for doc_callbacks -- Table structure for doc_callbacks
-- ---------------------------- -- ----------------------------
@ -52,10 +45,6 @@ PRIMARY KEY ("id")
) )
WITH (OIDS=FALSE); WITH (OIDS=FALSE);
--https://www.postgresql.org/docs/current/static/plpgsql-control-structures.html#PLPGSQL-UPSERT-EXAMPLE
DROP FUNCTION IF EXISTS merge_db(_id varchar(255), _status int2, _status_info int8, _last_open_date timestamp without time zone, _title varchar(255), _user_index int8, _change_id int8, OUT isupdate char(5), OUT userindex int8) CASCADE;
DROP FUNCTION IF EXISTS merge_db(_id varchar(255), _status int2, _status_info int4, _last_open_date timestamp without time zone, _title varchar(255), _user_index int4, _change_id int4, OUT isupdate char(5), OUT userindex int4) CASCADE;
CREATE OR REPLACE FUNCTION merge_db(_id varchar(255), _status int2, _status_info int4, _last_open_date timestamp without time zone, _title varchar(255), _user_index int4, _change_id int4, OUT isupdate char(5), OUT userindex int4) AS CREATE OR REPLACE FUNCTION merge_db(_id varchar(255), _status int2, _status_info int4, _last_open_date timestamp without time zone, _title varchar(255), _user_index int4, _change_id int4, OUT isupdate char(5), OUT userindex int4) AS
$$ $$
DECLARE DECLARE

10
schema/postgresql/removetbl.sql Normal file
View File

@ -0,0 +1,10 @@
--
-- Drop tables
--
DROP TABLE IF EXISTS "public"."doc_callbacks";
DROP TABLE IF EXISTS "public"."doc_changes";
DROP TABLE IF EXISTS "public"."task_result";
--https://www.postgresql.org/docs/current/static/plpgsql-control-structures.html#PLPGSQL-UPSERT-EXAMPLE
DROP FUNCTION IF EXISTS merge_db(_id varchar(255), _status int2, _status_info int8, _last_open_date timestamp without time zone, _title varchar(255), _user_index int8, _change_id int8, OUT isupdate char(5), OUT userindex int8) CASCADE;
DROP FUNCTION IF EXISTS merge_db(_id varchar(255), _status int2, _status_info int4, _last_open_date timestamp without time zone, _title varchar(255), _user_index int4, _change_id int4, OUT isupdate char(5), OUT userindex int4) CASCADE;