MS Zusammenführung

01_SMART_UP_TOOLS/03_EASYFLOW/CreateDBObjects_EASYFLOW.sql

@@ -1,7 +1,7 @@
 IF not EXISTS(SELECT GUID FROM TBDD_MODULES WHERE NAME = 'Clipboard-Watcher' )
 	INSERT INTO TBDD_MODULES (NAME, SHORT_NAME, LICENSE,ACTIVE) VALUES ('Clipboard-Watcher','CW','kc6j9HSv/UJVAzFjMZv2A3wHZFy+2nNLKP9Qs8g9EVY=',1)
 GO
-UPDATE TBDD_MODULES SET DB_VERSION = '2.0.0.1' where UPPER(NAME) = UPPER('Clipboard-Watcher')
+UPDATE TBDD_MODULES SET DB_VERSION = '2.3.0.0' where UPPER(NAME) = UPPER('Clipboard-Watcher')
 GO 
 --ADDs THE USER WITH ADMIN-RIGHTS TO USER-MODULE RELATION
 INSERT INTO TBDD_USER_MODULES(USER_ID,MODULE_ID) 
@@ -37,7 +37,7 @@ CREATE TABLE TBCW_PROFILES
 (
 	GUID				INTEGER			NOT NULL	IDENTITY(1,1),
 	NAME				VARCHAR(100)	NOT NULL,
-	PROFILE_TYPE		SMALLINT		NOT NULL DEFAULT 0,
+	PROFILE_TYPE		SMALLINT		NOT NULL	DEFAULT 1,
 	REGEX_EXPRESSION	VARCHAR(100)	NOT NULL,
 	ACTIVE				BIT				NOT NULL	DEFAULT 0,
 	COMMENT				VARCHAR(500),
@@ -392,7 +392,7 @@ BEGIN
 
 			INSERT INTO @TBResult (DocID, INDEX_NAME) 
 				SELECT DISTINCT WMV.dwDocID, WMA.szAttrName 
-				FROM sDD_VMP01_APS01_windream60.dbo.Attribute WMA INNER JOIN sDD_VMP01_APS01_windream60.dbo.Vector WMV ON WMA.dwAttrID = WMV.dwAttrID 
+				FROM [windreamDB].dbo.Attribute WMA INNER JOIN [windreamDB].dbo.Vector WMV ON WMA.dwAttrID = WMV.dwAttrID 
 				INNER JOIN VWDD_WM_ACCESS_RIGHTS T1 ON WMV.dwDocID = T1.dwObjectID AND T1.dwUserOrGROUPID = @USER_ECM_FKID
 				WHERE WMA.szAttrName in ('Vektor String 00','Vektor String 01','Vektor String 03','Vektor String 04','Vektor String 06','Vektor String 25','Vektor String 26','Vektor String 50','Vektor String 51')
 				AND UPPER(WMV.szValue) LIKE UPPER('%' + @pSearchValue + '%') 
@@ -406,7 +406,7 @@ BEGIN
 				WHERE UPPER(T.Search_Term) = UPPER(@pSearchValue) 
 			INSERT INTO @TBResult (DocID, INDEX_NAME) 
 				SELECT DISTINCT WMV.dwDocID, WMA.szAttrName 
-				FROM sDD_VMP01_APS01_windream60.dbo.Attribute WMA INNER JOIN sDD_VMP01_APS01_windream60.dbo.Vector WMV ON WMA.dwAttrID = WMV.dwAttrID 
+				FROM [windreamDB].dbo.Attribute WMA INNER JOIN [windreamDB].dbo.Vector WMV ON WMA.dwAttrID = WMV.dwAttrID 
 				INNER JOIN VWDD_WM_ACCESS_RIGHTS T1 ON WMV.dwDocID = T1.dwObjectID AND T1.dwUserOrGROUPID = @USER_ECM_FKID
 				WHERE WMA.szAttrName in ('Vektor String 00','Vektor String 01','Vektor String 03','Vektor String 04','Vektor String 06','Vektor String 25','Vektor String 26','Vektor String 50','Vektor String 51')
 				AND UPPER(WMV.szValue) = UPPER(@pSearchValue) 
@@ -431,25 +431,62 @@ BEGIN
 END
 GO
 /*##### VIEWS ####*/
-CREATE VIEW [dbo].[VWCW_USER_PROFILE] AS
-SELECT DISTINCT
+CREATE VIEW [dbo].[VWCW_GROUP_PROFILE] AS
+SELECT 
+	T1.GUID,
 	T.GUID AS PROFIL_ID, 
 	T.NAME AS PROFIL_NAME,
 	T.REGEX_EXPRESSION,
 	T.COMMENT,
 	T.ACTIVE,
 	T.PROFILE_TYPE,
-	T2.PROC_NAME,
-	T1.USER_ID,
+	T1.GROUP_ID,
+	T3.NAME AS GROUP_NAME
+FROM 
+	TBCW_PROFILES T
+	,TBCW_GROUP_PROFILE T1
+	, TBDD_GROUPS T3
+WHERE 
+	T.GUID = T1.PROFILE_ID 
+	AND T1.GROUP_ID = T3.GUID;
+GO
+--Changed	29.01.2025	MS Prozesse raus, Union Gruppen
+CREATE VIEW [dbo].[VWCW_USER_PROFILE] AS
+SELECT DISTINCT
+	T.GUID, 
+	T.GUID AS PROFIL_ID, 
+	T.NAME AS PROFIL_NAME,
+	T.REGEX_EXPRESSION,
+	T.COMMENT,
+	T.ACTIVE,
+	T.PROFILE_TYPE,
+	T1.USER_ID		AS	[USER_ID],
 	USR.NAME		AS	USER_SURNAME,
 	USR.PRENAME		AS	USER_PRENAME,
-	USR.USERNAME
+	USR.USERNAME,
+	'USER_PROFILE' AS SOURCE
 FROM TBCW_PROFILES T
 	INNER JOIN TBCW_USER_PROFILE T1 ON T.GUID = T1.PROFILE_ID
 	INNER JOIN TBDD_USER USR ON T1.USER_ID = USR.GUID
-	INNER JOIN TBCW_PROFILE_PROCESS T2 ON T.GUID = T2.PROFILE_ID
-	INNER JOIN TBCW_GROUP_PROFILE T3 ON T.GUID = T3.PROFILE_ID
-WHERE T.ACTIVE = 1
+UNION
+SELECT DISTINCT
+	GP.PROFIL_ID AS GUID,
+	GP.PROFIL_ID,
+	GP.PROFIL_NAME,
+	GP.REGEX_EXPRESSION,
+	GP.COMMENT,
+	GP.ACTIVE,
+	GP.PROFILE_TYPE,
+	GU.USR_ID		AS	[USER_ID],
+	USR.NAME		AS	USER_SURNAME,
+	USR.PRENAME		AS	USER_PRENAME,
+	USR.USERNAME,
+	'GROUP_PROFILE' AS SOURCE
+
+FROM	
+	VWCW_GROUP_PROFILE GP INNER JOIN 
+	VWDD_GROUPS_USER GU ON GP.GROUP_ID = GU.GRP_ID INNER JOIN
+	TBDD_USER USR ON GU.USR_ID = USR.GUID ;
 GO 
 
 CREATE VIEW VWCW_PROFILE_REL_WINDOW AS
@@ -468,9 +505,9 @@ FROM
 	,VWCW_USER_PROFILE T2 
 WHERE 
 	T.PROCESS_ID = T1.GUID AND
-	T1.PROFILE_ID = T2.GUID
+	T1.PROFILE_ID = T2.PROFIL_ID
 	
-ORDER BY T.SEQUENCE
+ORDER BY T.SEQUENCE;
 GO
 
 CREATE VIEW VWCW_PROFILE_REL_CONTROL AS
@@ -478,7 +515,7 @@ SELECT  DISTINCT TOP 100 PERCENT
 	T.GUID
 	,T1.USER_ID
 	,TP.PROC_NAME AS PROCESS_NAME
-	,T1.GUID AS PROFILE_ID
+	,T1.PROFIL_ID AS PROFILE_ID
 	,T.WINDOW_ID
 	,T.DESCRIPTION
 	,T.SEQUENCE
@@ -507,26 +544,7 @@ FROM
 WHERE 
 	T.WINDOW_ID = TW.GUID AND
 	TW.PROCESS_ID = TP.GUID AND
-	TP.PROFILE_ID = T1.GUID
-ORDER BY T.SEQUENCE
+	TP.PROFILE_ID = T1.PROFIL_ID
+ORDER BY T.SEQUENCE;
 GO
 
-CREATE VIEW [dbo].[VWCW_GROUP_PROFILE] AS
-SELECT 
-	T1.GUID,
-	T.GUID AS PROFIL_ID, 
-	T.NAME AS PROFIL_NAME,
-	T.REGEX_EXPRESSION,
-	T.COMMENT,
-	T.ACTIVE,
-	T.PROFILE_TYPE,
-	T1.GROUP_ID,
-	T3.NAME AS GROUP_NAME
-FROM 
-	TBCW_PROFILES T
-	,TBCW_GROUP_PROFILE T1
-	, TBDD_GROUPS T3
-WHERE 
-	T.GUID = T1.PROFILE_ID 
-	AND T1.GROUP_ID = T3.GUID;
-GO

06_EmailProfiler/CreateDBObjects.sql

@@ -281,28 +281,6 @@ BEGIN
 		@WHO)
 END
 GO
-
-
-CREATE TABLE dbo.TBEDMI_ITEM_VALUE(
-	GUID				BIGINT NOT NULL 	IDENTITY (1, 1),
-	REFERENCE_GUID		nvarchar(max) NOT NULL,
-	ITEM_DESCRIPTION	nvarchar(max) NOT NULL,
-	ITEM_VALUE			nvarchar(max) NULL,
-	CREATEDWHEN			datetime	NOT NULL DEFAULT GETDATE(),
-	CREATEDWHO			nvarchar(max),
-	CHANGEDWHEN			datetime,
-	GROUP_COUNTER		integer NULL,
-	SPEC_NAME			VARCHAR(250),
-	IS_REQUIRED			BIT NOT NULL DEFAULT 0
-) 
-GO
-USE [DD_ECM]
-GO
-/****** Object:  StoredProcedure [dbo].[PRCUST_CREATE_EMAIL_LINE]    Script Date: 05.05.2023 13:58:32 ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
 -- =============================================
 -- Author:		DD
 -- =============================================