* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005.
* src/odbc/odbc_queries.erl: likewise. * src/odbc/mssql2005.sql: likewise. SVN Revision: 1595
This commit is contained in:
Jérôme Sautret
parent
3a2fb34a61
commit
8883e4ad8b
|
|
@ -1,3 +1,9 @@
|
|||
2008-10-03 Jerome Sautret <jerome.sautret@process-one.net>
|
||||
|
||||
* src/mod_vcard_odbc: added vCard support for MS SQL Server 2005.
|
||||
* src/odbc/odbc_queries.erl: likewise.
|
||||
* src/odbc/mssql2005.sql: likewise.
|
||||
|
||||
2008-10-01 Mickael Remond <mremond@process-one.net>
|
||||
|
||||
* src/mod_shared_roster.erl: Correct roster push when changing
|
||||
|
|
|
|||
|
|
@ -104,6 +104,10 @@ if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[vcard]') a
|
|||
drop table [dbo].[vcard]
|
||||
GO
|
||||
|
||||
if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[vcard_search]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
|
||||
drop table [dbo].[vcard_search]
|
||||
GO
|
||||
|
||||
if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[private_storage]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
|
||||
drop table [dbo].[private_storage]
|
||||
GO
|
||||
|
|
@ -160,25 +164,35 @@ GO
|
|||
|
||||
CREATE TABLE [dbo].[vcard] (
|
||||
[username] [varchar] (250) NOT NULL ,
|
||||
[full_name] [varchar] (250) NULL ,
|
||||
[first_name] [varchar] (50) NULL ,
|
||||
[last_name] [varchar] (50) NULL ,
|
||||
[nick_name] [varchar] (50) NULL ,
|
||||
[url] [varchar] (1024) NULL ,
|
||||
[address1] [varchar] (50) NULL ,
|
||||
[address2] [varchar] (50) NULL ,
|
||||
[locality] [varchar] (50) NULL ,
|
||||
[region] [varchar] (50) NULL ,
|
||||
[pcode] [varchar] (50) NULL ,
|
||||
[country] [varchar] (50) NULL ,
|
||||
[telephone] [varchar] (50) NULL ,
|
||||
[email] [varchar] (250) NULL ,
|
||||
[orgname] [varchar] (50) NULL ,
|
||||
[orgunit] [varchar] (50) NULL ,
|
||||
[title] [varchar] (50) NULL ,
|
||||
[role] [varchar] (50) NULL ,
|
||||
[b_day] [datetime] NULL ,
|
||||
[descr] [varchar] (500) NULL
|
||||
[vcard] [text] NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE TABLE [dbo].[vcard_search] (
|
||||
[username] [varchar] (250) NOT NULL ,
|
||||
[lusername] [varchar] (250) NOT NULL ,
|
||||
[fn] [text] NOT NULL ,
|
||||
[lfn] [varchar] (250) NOT NULL ,
|
||||
[family] [text] NOT NULL ,
|
||||
[lfamily] [varchar] (250) NOT NULL ,
|
||||
[given] [text] NOT NULL ,
|
||||
[lgiven] [varchar] (250) NOT NULL ,
|
||||
[middle] [text] NOT NULL ,
|
||||
[lmiddle] [varchar] (250) NOT NULL ,
|
||||
[nickname] [text] NOT NULL ,
|
||||
[lnickname] [varchar] (250) NOT NULL ,
|
||||
[bday] [text] NOT NULL ,
|
||||
[lbday] [varchar] (250) NOT NULL ,
|
||||
[ctry] [text] NOT NULL ,
|
||||
[lctry] [varchar] (250) NOT NULL ,
|
||||
[locality] [text] NOT NULL ,
|
||||
[llocality] [varchar] (250) NOT NULL ,
|
||||
[email] [text] NOT NULL ,
|
||||
[lemail] [varchar] (250) NOT NULL ,
|
||||
[orgname] [text] NOT NULL ,
|
||||
[lorgname] [varchar] (250) NOT NULL ,
|
||||
[orgunit] [text] NOT NULL ,
|
||||
[lorgunit] [varchar] (250) NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
|
@ -262,6 +276,31 @@ ALTER TABLE [dbo].[vcard] WITH NOCHECK ADD
|
|||
) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
CREATE INDEX [IX_vcard_search_lfn] ON [dbo].[vcard_search]([lfn]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lfamily] ON [dbo].[vcard_search]([lfamily]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lgiven] ON [dbo].[vcard_search]([lgiven]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lmiddle] ON [dbo].[vcard_search]([lmiddle]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lnickname] ON [dbo].[vcard_search]([lnickname]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lbday] ON [dbo].[vcard_search]([lbday]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lctry] ON [dbo].[vcard_search]([lctry]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_llocality] ON [dbo].[vcard_search]([llocality]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lemail] ON [dbo].[vcard_search]([lemail]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lorgname] ON [dbo].[vcard_search]([lorgname]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
CREATE INDEX [IX_vcard_search_lorgunit] ON [dbo].[vcard_search]([lorgunit]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
CREATE CLUSTERED INDEX [IX_rosterusers_user] ON [dbo].[rosterusers]([username]) WITH FILLFACTOR = 90 ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
|
@ -1050,4 +1089,151 @@ END
|
|||
GO
|
||||
|
||||
|
||||
/******************************************************************/
|
||||
/****** Object: StoredProcedure [dbo].[set_vcard] **/
|
||||
/** Set the user's vCard **/
|
||||
/******************************************************************/
|
||||
CREATE PROCEDURE [dbo].[set_vcard]
|
||||
@VCard varchar(8000),
|
||||
@Username varchar(250),
|
||||
@Lusername varchar(250),
|
||||
@Fn varchar(8000),
|
||||
@Lfn varchar(250),
|
||||
@Family varchar(8000),
|
||||
@Lfamily varchar(250),
|
||||
@Given varchar(8000),
|
||||
@Lgiven varchar(250),
|
||||
@Middle varchar(8000),
|
||||
@Lmiddle varchar(250),
|
||||
@Nickname varchar(8000),
|
||||
@Lnickname varchar(250),
|
||||
@Bday varchar(8000),
|
||||
@Lbday varchar(250),
|
||||
@Ctry varchar(8000),
|
||||
@Lctry varchar(250),
|
||||
@Locality varchar(8000),
|
||||
@Llocality varchar(250),
|
||||
@Email varchar(8000),
|
||||
@Lemail varchar(250),
|
||||
@Orgname varchar(8000),
|
||||
@Lorgname varchar(250),
|
||||
@Orgunit varchar(8000),
|
||||
@Lorgunit varchar(250)
|
||||
AS
|
||||
BEGIN
|
||||
IF EXISTS (SELECT username FROM vcard with (nolock) WHERE vcard.username = @Username)
|
||||
BEGIN
|
||||
UPDATE [vcard]
|
||||
SET [vcard].username = @LUsername,
|
||||
[vcard].vcard = @Vcard
|
||||
WHERE vcard.username = @LUsername;
|
||||
|
||||
UPDATE [vcard_search]
|
||||
SET [vcard_search].username = @Username,
|
||||
[vcard_search].lusername = @Lusername,
|
||||
[vcard_search].fn = @Fn,
|
||||
[vcard_search].lfn = @Lfn,
|
||||
[vcard_search].family = @Family,
|
||||
[vcard_search].lfamily = @Lfamily,
|
||||
[vcard_search].given = @Given,
|
||||
[vcard_search].lgiven = @Lgiven,
|
||||
[vcard_search].middle = @Middle,
|
||||
[vcard_search].lmiddle = @Lmiddle,
|
||||
[vcard_search].nickname = @Nickname,
|
||||
[vcard_search].lnickname = @Lnickname,
|
||||
[vcard_search].bday = @Bday,
|
||||
[vcard_search].lbday = @Lbday,
|
||||
[vcard_search].ctry = @Ctry,
|
||||
[vcard_search].lctry = @Lctry,
|
||||
[vcard_search].locality = @Locality,
|
||||
[vcard_search].llocality = @Llocality,
|
||||
[vcard_search].email = @Email,
|
||||
[vcard_search].lemail = @Lemail,
|
||||
[vcard_search].orgname = @Orgname,
|
||||
[vcard_search].lorgname = @Lorgname,
|
||||
[vcard_search].orgunit = @Orgunit,
|
||||
[vcard_search].lorgunit = @Lorgunit
|
||||
WHERE vcard_search.lusername = @LUsername;
|
||||
END
|
||||
ELSE
|
||||
BEGIN
|
||||
INSERT INTO [vcard]
|
||||
( [vcard].username,
|
||||
[vcard].vcard
|
||||
)
|
||||
VALUES
|
||||
( @lUsername,
|
||||
@Vcard
|
||||
);
|
||||
|
||||
INSERT INTO [vcard_search]
|
||||
(
|
||||
[vcard_search].username ,
|
||||
[vcard_search].lusername ,
|
||||
[vcard_search].fn ,
|
||||
[vcard_search].lfn ,
|
||||
[vcard_search].family ,
|
||||
[vcard_search].lfamily ,
|
||||
[vcard_search].given ,
|
||||
[vcard_search].lgiven ,
|
||||
[vcard_search].middle ,
|
||||
[vcard_search].lmiddle ,
|
||||
[vcard_search].nickname,
|
||||
[vcard_search].lnickname,
|
||||
[vcard_search].bday,
|
||||
[vcard_search].lbday,
|
||||
[vcard_search].ctry,
|
||||
[vcard_search].lctry,
|
||||
[vcard_search].locality,
|
||||
[vcard_search].llocality,
|
||||
[vcard_search].email,
|
||||
[vcard_search].lemail,
|
||||
[vcard_search].orgname,
|
||||
[vcard_search].lorgname,
|
||||
[vcard_search].orgunit,
|
||||
[vcard_search].lorgunit
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
@Username,
|
||||
@Lusername,
|
||||
@Fn,
|
||||
@Lfn,
|
||||
@Family,
|
||||
@Lfamily,
|
||||
@Given,
|
||||
@Lgiven,
|
||||
@Middle,
|
||||
@Lmiddle,
|
||||
@Nickname,
|
||||
@Lnickname,
|
||||
@Bday,
|
||||
@Lbday,
|
||||
@Ctry,
|
||||
@Lctry,
|
||||
@Locality,
|
||||
@Llocality,
|
||||
@Email,
|
||||
@Lemail,
|
||||
@Orgname,
|
||||
@Lorgname,
|
||||
@Orgunit,
|
||||
@Lorgunit
|
||||
)
|
||||
END
|
||||
END
|
||||
GO
|
||||
|
||||
/******************************************************************/
|
||||
/****** Object: StoredProcedure [dbo].[get_vcard] **/
|
||||
/** Retrive the user's vCard **/
|
||||
/******************************************************************/
|
||||
CREATE PROCEDURE [dbo].[get_vcard]
|
||||
@Username varchar(250)
|
||||
AS
|
||||
BEGIN
|
||||
SELECT vcard.vcard as vcard
|
||||
FROM vcard WITH (NOLOCK)
|
||||
WHERE username=@Username;
|
||||
END
|
||||
GO
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@
|
|||
set_private_data_sql/3,
|
||||
get_private_data/3,
|
||||
del_user_private_storage/2,
|
||||
set_vcard/26,
|
||||
get_vcard/2,
|
||||
escape/1,
|
||||
count_records_where/3]).
|
||||
|
||||
|
|
@ -378,6 +380,42 @@ del_user_private_storage(LServer, Username) ->
|
|||
LServer,
|
||||
["delete from private_storage where username='", Username, "';"]).
|
||||
|
||||
|
||||
set_vcard(LServer, LUsername, SBDay, SCTRY, SEMail, SFN, SFamily, SGiven,
|
||||
SLBDay, SLCTRY, SLEMail, SLFN, SLFamily, SLGiven, SLLocality,
|
||||
SLMiddle, SLNickname, SLOrgName, SLOrgUnit, SLocality, SMiddle,
|
||||
SNickname, SOrgName, SOrgUnit, SVCARD, Username) ->
|
||||
ejabberd_odbc:sql_transaction(
|
||||
LServer,
|
||||
[["delete from vcard where username='", LUsername, "';"],
|
||||
["insert into vcard(username, vcard) "
|
||||
"values ('", LUsername, "', '", SVCARD, "');"],
|
||||
["delete from vcard_search where lusername='", LUsername, "';"],
|
||||
["insert into vcard_search("
|
||||
" username, lusername, fn, lfn, family, lfamily,"
|
||||
" given, lgiven, middle, lmiddle, nickname, lnickname,"
|
||||
" bday, lbday, ctry, lctry, locality, llocality,"
|
||||
" email, lemail, orgname, lorgname, orgunit, lorgunit)"
|
||||
"values (",
|
||||
" '", Username, "', '", LUsername, "',"
|
||||
" '", SFN, "', '", SLFN, "',"
|
||||
" '", SFamily, "', '", SLFamily, "',"
|
||||
" '", SGiven, "', '", SLGiven, "',"
|
||||
" '", SMiddle, "', '", SLMiddle, "',"
|
||||
" '", SNickname, "', '", SLNickname, "',"
|
||||
" '", SBDay, "', '", SLBDay, "',"
|
||||
" '", SCTRY, "', '", SLCTRY, "',"
|
||||
" '", SLocality, "', '", SLLocality, "',"
|
||||
" '", SEMail, "', '", SLEMail, "',"
|
||||
" '", SOrgName, "', '", SLOrgName, "',"
|
||||
" '", SOrgUnit, "', '", SLOrgUnit, "');"]]).
|
||||
|
||||
get_vcard(LServer, Username) ->
|
||||
ejabberd_odbc:sql_query(
|
||||
LServer,
|
||||
["select vcard from vcard "
|
||||
"where username='", Username, "';"]).
|
||||
|
||||
%% Characters to escape
|
||||
escape($\0) -> "\\0";
|
||||
escape($\n) -> "\\n";
|
||||
|
|
@ -597,6 +635,25 @@ del_user_private_storage(LServer, Username) ->
|
|||
LServer,
|
||||
["EXECUTE dbo.del_user_storage '", Username, "'"]).
|
||||
|
||||
set_vcard(LServer, LUsername, SBDay, SCTRY, SEMail, SFN, SFamily, SGiven,
|
||||
SLBDay, SLCTRY, SLEMail, SLFN, SLFamily, SLGiven, SLLocality,
|
||||
SLMiddle, SLNickname, SLOrgName, SLOrgUnit, SLocality, SMiddle,
|
||||
SNickname, SOrgName, SOrgUnit, SVCARD, Username) ->
|
||||
ejabberd_odbc:sql_query(
|
||||
LServer,
|
||||
["EXECUTE dbo.set_vcard '", SVCARD, "' , '", Username, "' , '", LUsername, "' , '",
|
||||
SFN, "' , '", SLFN, "' , '", SFamily, "' , '", SLFamily, "' , '",
|
||||
SGiven, "' , '", SLGiven, "' , '", SMiddle, "' , '", SLMiddle, "' , '",
|
||||
SNickname, "' , '", SLNickname, "' , '", SBDay, "' , '", SLBDay, "' , '",
|
||||
SCTRY, "' , '", SLCTRY, "' , '", SLocality, "' , '", SLLocality, "' , '",
|
||||
SEMail, "' , '", SLEMail, "' , '", SOrgName, "' , '", SLOrgName, "' , '",
|
||||
SOrgUnit, "' , '", SLOrgUnit, "'"]).
|
||||
|
||||
get_vcard(LServer, Username) ->
|
||||
ejabberd_odbc:sql_query(
|
||||
LServer,
|
||||
["EXECUTE dbo.get_vcard '", Username, "'"]).
|
||||
|
||||
%% Characters to escape
|
||||
escape($\0) -> "\\0";
|
||||
escape($\t) -> "\\t";
|
||||
|
|
|
|||
Loading…
Reference in New Issue