diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/lite.new.sql | 13 | ||||
| -rw-r--r-- | sql/lite.sql | 12 | ||||
| -rw-r--r-- | sql/mssql.sql | 15 | ||||
| -rw-r--r-- | sql/mysql.new.sql | 13 | ||||
| -rw-r--r-- | sql/mysql.sql | 12 | ||||
| -rw-r--r-- | sql/pg.new.sql | 20 | ||||
| -rw-r--r-- | sql/pg.sql | 12 |
7 files changed, 7 insertions, 90 deletions
diff --git a/sql/lite.new.sql b/sql/lite.new.sql index d58d04c77..60db23e40 100644 --- a/sql/lite.new.sql +++ b/sql/lite.new.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -387,17 +387,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh(sid); -CREATE TABLE carboncopy ( - username text NOT NULL, - server_host text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL, - PRIMARY KEY (server_host, username, resource) -); - -CREATE INDEX i_carboncopy_sh_user ON carboncopy (server_host, username); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, diff --git a/sql/lite.sql b/sql/lite.sql index abb25d5b4..d1974643e 100644 --- a/sql/lite.sql +++ b/sql/lite.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -357,16 +357,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh(sid); -CREATE TABLE carboncopy ( - username text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL -); - -CREATE UNIQUE INDEX i_carboncopy_ur ON carboncopy (username, resource); -CREATE INDEX i_carboncopy_user ON carboncopy (username); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, diff --git a/sql/mssql.sql b/sql/mssql.sql index 04798ee51..7c3713b76 100644 --- a/sql/mssql.sql +++ b/sql/mssql.sql @@ -1,5 +1,5 @@ --
--- ejabberd, Copyright (C) 2002-2017 ProcessOne
+-- ejabberd, Copyright (C) 2002-2019 ProcessOne
--
-- This program is free software; you can redistribute it and/or
-- modify it under the terms of the GNU General Public License as
@@ -531,19 +531,6 @@ CREATE TABLE [dbo].[bosh] ( )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
);
-CREATE TABLE [dbo].[carboncopy] (
- [username] [varchar] (255) NOT NULL,
- [resource] [varchar] (255) NOT NULL,
- [namespace] [varchar] (255) NOT NULL,
- [node] [varchar] (255) NOT NULL
-);
-
-CREATE UNIQUE CLUSTERED INDEX [carboncopy_ur] ON [carboncopy] (username, resource)
-WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
-
-CREATE INDEX [carboncopy_user] ON [carboncopy] (username)
-WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
-
CREATE TABLE [dbo].[push_session] (
[username] [varchar] (255) NOT NULL,
[timestamp] [bigint] NOT NULL,
diff --git a/sql/mysql.new.sql b/sql/mysql.new.sql index 0f564f08f..4ce0d24f6 100644 --- a/sql/mysql.new.sql +++ b/sql/mysql.new.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -403,17 +403,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh(sid(75)); -CREATE TABLE carboncopy ( - username text NOT NULL, - server_host text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL, - PRIMARY KEY (server_host(191), username(191), resource(191)) -) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; - -CREATE INDEX i_carboncopy_sh_user ON carboncopy (server_host(191), username(75)); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, diff --git a/sql/mysql.sql b/sql/mysql.sql index d731f89df..204233f88 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -373,16 +373,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh(sid(75)); -CREATE TABLE carboncopy ( - username text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL -) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; - -CREATE UNIQUE INDEX i_carboncopy_ur ON carboncopy (username(75), resource(75)); -CREATE INDEX i_carboncopy_user ON carboncopy (username(75)); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, diff --git a/sql/pg.new.sql b/sql/pg.new.sql index 928d74db0..5db54558a 100644 --- a/sql/pg.new.sql +++ b/sql/pg.new.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -156,13 +156,6 @@ -- CREATE INDEX i_sm_sh_username ON sm USING btree (server_host, username); -- ALTER TABLE sm ALTER COLUMN server_host DROP DEFAULT; --- ALTER TABLE carboncopy ADD COLUMN server_host text NOT NULL DEFAULT '<HOST>'; --- DROP INDEX i_carboncopy_ur; --- DROP INDEX i_carboncopy_user; --- ALTER TABLE carboncopy ADD PRIMARY KEY (server_host, username, resource); --- CREATE INDEX i_carboncopy_sh_user ON carboncopy USING btree (server_host, username); --- ALTER TABLE carboncopy ALTER COLUMN server_host DROP DEFAULT; - CREATE TABLE users ( username text NOT NULL, @@ -555,17 +548,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh USING btree (sid); -CREATE TABLE carboncopy ( - username text NOT NULL, - server_host text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL, - PRIMARY KEY (server_host, username, resource) -); - -CREATE INDEX i_carboncopy_sh_user ON carboncopy USING btree (server_host, username); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, diff --git a/sql/pg.sql b/sql/pg.sql index a0cfe0ea6..4483e7e8e 100644 --- a/sql/pg.sql +++ b/sql/pg.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2017 ProcessOne +-- ejabberd, Copyright (C) 2002-2019 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -377,16 +377,6 @@ CREATE TABLE bosh ( CREATE UNIQUE INDEX i_bosh_sid ON bosh USING btree (sid); -CREATE TABLE carboncopy ( - username text NOT NULL, - resource text NOT NULL, - namespace text NOT NULL, - node text NOT NULL -); - -CREATE UNIQUE INDEX i_carboncopy_ur ON carboncopy USING btree (username, resource); -CREATE INDEX i_carboncopy_user ON carboncopy USING btree (username); - CREATE TABLE proxy65 ( sid text NOT NULL, pid_t text NOT NULL, |