Clean up database code related to mod_vcard_xupdate

diff --git a/sql/lite.sql b/sql/lite.sql
index 1d057407f50b82d9a2aa2a838a8d8dca27e1009f..1cc0c4dc546f31179af578e392fa29c4e2f15d0a 100644 (file)
--- a/sql/lite.sql
+++ b/sql/lite.sql
@@ -116,12 +116,6 @@ CREATE TABLE vcard (
     created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
-CREATE TABLE vcard_xupdate (
-    username text PRIMARY KEY,
-    hash text NOT NULL,
-    created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
 CREATE TABLE vcard_search (
     username text NOT NULL,
     lusername text PRIMARY KEY,

diff --git a/sql/mssql.sql b/sql/mssql.sql
index 72b490ecceebbbdc4319cb30486a7031c429614b..607acae8f6a87d2abf5ebaa1cde921350371834c 100644 (file)
--- a/sql/mssql.sql
+++ b/sql/mssql.sql
@@ -470,16 +470,6 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
 CREATE INDEX [vcard_search_lorgunit] ON [vcard_search] (lorgunit)\r
 WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);\r
 \r
-CREATE TABLE [dbo].[vcard_xupdate] (\r
-        [username] [varchar] (250) NOT NULL,\r
-        [hash] [text] NOT NULL,\r
-        [created_at] [datetime] NOT NULL DEFAULT GETDATE(),\r
- CONSTRAINT [vcard_xupdate_PRIMARY] PRIMARY KEY CLUSTERED \r
-(\r
-        [username] ASC\r
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)\r
-) TEXTIMAGE_ON [PRIMARY];\r
-\r
 ALTER TABLE [dbo].[pubsub_item]  WITH CHECK ADD  CONSTRAINT [pubsub_item_ibfk_1] FOREIGN KEY([nodeid])\r
 REFERENCES [dbo].[pubsub_node] ([nodeid])\r
 ON DELETE CASCADE;\r

diff --git a/sql/mysql.sql b/sql/mysql.sql
index c591cb761f149cc052c211d962ea638fe2038787..3fddea51021be88a16523abb728ac735b63fddc8 100644 (file)
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -121,12 +121,6 @@ CREATE TABLE vcard (
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-CREATE TABLE vcard_xupdate (
-    username varchar(191) PRIMARY KEY,
-    hash text NOT NULL,
-    created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-
 CREATE TABLE vcard_search (
     username varchar(191) NOT NULL,
     lusername varchar(191) PRIMARY KEY,

diff --git a/sql/pg.sql b/sql/pg.sql
index 539c1263a9b393b3cf7bda2fd4e15f1d88f42701..f761e68da020a2e7752357658575f528851a3da6 100644 (file)
--- a/sql/pg.sql
+++ b/sql/pg.sql
@@ -120,12 +120,6 @@ CREATE TABLE vcard (
     created_at TIMESTAMP NOT NULL DEFAULT now()
 );
 
-CREATE TABLE vcard_xupdate (
-    username text PRIMARY KEY,
-    hash text NOT NULL,
-    created_at TIMESTAMP NOT NULL DEFAULT now()
-);
-
 CREATE TABLE vcard_search (
     username text NOT NULL,
     lusername text PRIMARY KEY,

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 1dc30b1c5f6869e56ab758d0d2dc6e5085c21156..1e5d495ce76dcded451c381604fa0bcb06594c1d 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -1092,7 +1092,7 @@ replace_module(mod_roster_odbc) -> {mod_roster, sql};
 replace_module(mod_shared_roster_odbc) -> {mod_shared_roster, sql};
 replace_module(mod_vcard_odbc) -> {mod_vcard, sql};
 replace_module(mod_vcard_ldap) -> {mod_vcard, ldap};
-replace_module(mod_vcard_xupdate_odbc) -> {mod_vcard_xupdate, sql};
+replace_module(mod_vcard_xupdate_odbc) -> mod_vcard_xupdate;
 replace_module(mod_pubsub_odbc) -> {mod_pubsub, sql};
 replace_module(mod_http_bind) -> mod_bosh;
 replace_module(Module) ->

diff --git a/src/ejd2sql.erl b/src/ejd2sql.erl
index 343c3518a370803a499a653169d755a632c0ea4c..c4f00a551e17b85e05fd81cbb1d95bbfd4c43270 100644 (file)
--- a/src/ejd2sql.erl
+++ b/src/ejd2sql.erl
@@ -60,8 +60,7 @@ modules() ->
      mod_private,
      mod_roster,
      mod_shared_roster,
-     mod_vcard,
-     mod_vcard_xupdate].
+     mod_vcard].
 
 export(Server, Output) ->
     LServer = jid:nameprep(iolist_to_binary(Server)),

diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl
index 0da8198d95d6d46465d0bdc27a75a3d103cc3fa6..74f6b7364bd2d01d238e139ffd8e7150ed4e40d9 100644 (file)
--- a/src/mod_vcard_xupdate.erl
+++ b/src/mod_vcard_xupdate.erl
@@ -162,6 +162,14 @@ compute_hash(VCard) ->
 %%====================================================================
 %% Options
 %%====================================================================
+mod_opt_type(db_type) ->
+    fun(_) ->
+           ?WARNING_MSG("option 'db_type' for module '~s' has no effect: "
+                        "the module doesn't require database anymore; "
+                        "feel free to delete any tables related to the module",
+                        [?MODULE]),
+           erlang:error(badarg)
+    end;
 mod_opt_type(O) when O == cache_life_time; O == cache_size ->
     fun (I) when is_integer(I), I > 0 -> I;
         (infinity) -> infinity
@@ -169,4 +177,4 @@ mod_opt_type(O) when O == cache_life_time; O == cache_size ->
 mod_opt_type(O) when O == use_cache; O == cache_missed ->
     fun (B) when is_boolean(B) -> B end;
 mod_opt_type(_) ->
-    [cache_life_time, cache_size, use_cache, cache_missed].
+    [db_type, cache_life_time, cache_size, use_cache, cache_missed].