MS

2021-12-17 14:36:41 +01:00
parent 3d32964956
commit 61ae79b703
9 changed files with 452 additions and 460 deletions
--- a/02_GI/CreateDBObjects.sql
+++ b/02_GI/CreateDBObjects.sql
@@ -361,27 +361,62 @@ WHERE
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
 ------------------------------------------------------------------------------
-CREATE VIEW VWGI_USER_GROUPS_RELATION AS 
-SELECT 
-	T.GUID,
-    T.USER_ID,
-	T2.USERNAME,
-	T.GROUP_ID,
-	T1.NAME,
-    T.[ADDED_WHO],
-    T.[ADDED_WHEN],
-    T.[CHANGED_WHO],
-    T.[CHANGED_WHEN]
-  FROM 
-	TBDD_GROUPS_USER T,
-	TBDD_GROUPS T1,
-	TBDD_USER T2
-WHERE 
-	T.GROUP_ID = T1.GUID AND
-	T.USER_ID = T2.GUID AND
-	T1.INTERNAL = 0 AND
-	T1.ACTIVE = 1
+
+CREATE VIEW [dbo].[VWGI_USER_GROUPS_RELATION] AS 
+SELECT DISTINCT
+	T.GUID AS [USER_ID],
+	T.USERNAME,
+	--T2.NAME AS GROUP_NAME,
+	T3.DOCTYPE_ID,
+	T4.BEZEICHNUNG AS DOCTYPE,
+	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+	T4.KURZNAME,
+	T4.ZIEL_PFAD,
+	T4.AKTIV,
+	T4.NAMENKONVENTION,
+	T4.OBJEKTTYP,
+	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
+	T4.SEQUENCE
+FROM
+	DD_ECM.dbo.TBDD_USER T,
+	DD_ECM.dbo.TBDD_GROUPS_USER T1,
+	DD_ECM.dbo.TBDD_GROUPS T2,
+	DD_ECM.dbo.TBDD_USRGRP_DOKTYPE T3,
+	DD_ECM.dbo.TBDD_DOKUMENTART T4
+WHERE
+	T4.AKTIV = 1 AND
+	T.GUID = T1.[USER_ID] AND
+	T1.GROUP_ID = T2.GUID AND
+	T2.GUID = T3.GROUP_ID AND
+	T3.DOCTYPE_ID = T4.GUID AND
+
+	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
+UNION
+SELECT DISTINCT
+	T.GUID AS [USER_ID],
+	T.USERNAME,
+	--'' AS GROUP_NAME,
+	T4.GUID as DOCTYPE_ID,
+	T4.BEZEICHNUNG AS DOCTYPE,
+	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
+	T4.KURZNAME,
+	T4.ZIEL_PFAD,
+	T4.AKTIV,
+	T4.NAMENKONVENTION,
+	T4.OBJEKTTYP,
+	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
+	T4.SEQUENCE
+FROM
+	DD_ECM.dbo.TBDD_USER T,
+	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
+	DD_ECM.dbo.TBDD_DOKUMENTART T4
+WHERE
+	T4.AKTIV = 1 AND
+	T.GUID = T3.[USER_ID] AND
+	T3.DOCTYPE_ID = T4.GUID AND
+	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
+
 ------------------------------------------------------------------------------
 --############# PROCEDURES #################
 ------------------------------------------------------------------------------
@@ -498,103 +533,6 @@ WHERE
 	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
 GO
 CREATE VIEW [dbo].[VWGI_DOCTYPE] AS 
-SELECT DISTINCT
-	T4.GUID as DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T4.ERSTELLTWANN,
-	T4.GEAENDERTWANN,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_DOKUMENTART T4
-WHERE
-	--T4.AKTIV = 1 AND
-
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-GO
-
-CREATE VIEW [dbo].[VWGI_USER_GROUPS_RELATION] AS 
-SELECT DISTINCT
-	T.GUID AS [USER_ID],
-	T.USERNAME,
-	--T2.NAME AS GROUP_NAME,
-	T3.DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_USER T,
-	DD_ECM.dbo.TBDD_GROUPS_USER T1,
-	DD_ECM.dbo.TBDD_GROUPS T2,
-	DD_ECM.dbo.TBDD_USRGRP_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4
-WHERE
-	T4.AKTIV = 1 AND
-	T.GUID = T1.[USER_ID] AND
-	T1.GROUP_ID = T2.GUID AND
-	T2.GUID = T3.GROUP_ID AND
-	T3.DOCTYPE_ID = T4.GUID AND
-
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-UNION
-SELECT DISTINCT
-	T.GUID AS [USER_ID],
-	T.USERNAME,
-	--'' AS GROUP_NAME,
-	T4.GUID as DOCTYPE_ID,
-	T4.BEZEICHNUNG AS DOCTYPE,
-	T4.BEZEICHNUNG AS DOCTYPE_ONLY,
-	T4.KURZNAME,
-	T4.ZIEL_PFAD,
-	T4.AKTIV,
-	T4.NAMENKONVENTION,
-	T4.OBJEKTTYP,
-	T4.IDB_OBJECT_STORE_ID OBJECT_ST_ID,
-	T4.SEQUENCE
-FROM
-	DD_ECM.dbo.TBDD_USER T,
-	DD_ECM.dbo.TBDD_USER_DOKTYPE T3,
-	DD_ECM.dbo.TBDD_DOKUMENTART T4
-WHERE
-	T4.AKTIV = 1 AND
-	T.GUID = T3.[USER_ID] AND
-	T3.DOCTYPE_ID = T4.GUID AND
-	T4.GUID in (SELECT DOKART_ID FROM DD_ECM.dbo.TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM DD_ECM.dbo.TBDD_MODULES WHERE UPPER(SHORT_NAME) = ('GLOBIX')))
-GO
-
-
-CREATE VIEW [dbo].[VWGI_DOCTYPE_GROUP] AS 
-SELECT 
-	T.GUID,
-	T.DOCTYPE_ID,
-	T2.BEZEICHNUNG AS DOCTYPE,
-	T.GROUP_ID,
-	T1.NAME AS [GROUP],
-	T.ADDED_WHO,
-	T.ADDED_WHEN,
-	T.CHANGED_WHEN
-FROM 
-	TBDD_USRGRP_DOKTYPE T,
-	TBDD_GROUPS T1,
-	TBDD_DOKUMENTART T2
-WHERE
-	T.DOCTYPE_ID = T2.GUID AND
-	T.GROUP_ID = T1.GUID AND
-	T1.ACTIVE = 1 AND
-	T2.AKTIV = 1
-GO
-CREATE VIEW [dbo].[VWGI_DOCTYPE] AS 
 SELECT DISTINCT
 	T.GUID AS [USER_ID],
 	T.USERNAME,
@@ -623,6 +561,29 @@ WHERE
 	T4.GUID in (SELECT DOKART_ID FROM TBDD_DOKUMENTART_MODULE WHERE MODULE_ID = (SELECT GUID FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Global-Indexer')))
 GO

+
+CREATE VIEW [dbo].[VWGI_DOCTYPE_GROUP] AS 
+SELECT 
+	T.GUID,
+	T.DOCTYPE_ID,
+	T2.BEZEICHNUNG AS DOCTYPE,
+	T.GROUP_ID,
+	T1.NAME AS [GROUP],
+	T.ADDED_WHO,
+	T.ADDED_WHEN,
+	T.CHANGED_WHEN
+FROM 
+	TBDD_USRGRP_DOKTYPE T,
+	TBDD_GROUPS T1,
+	TBDD_DOKUMENTART T2
+WHERE
+	T.DOCTYPE_ID = T2.GUID AND
+	T.GROUP_ID = T1.GUID AND
+	T1.ACTIVE = 1 AND
+	T2.AKTIV = 1
+GO
+
+
 CREATE TABLE TBGI_REGEX_DOCTYPE(
 	GUID				INTEGER			NOT NULL	IDENTITY(1,1),
 	REGEX				VARCHAR(500)	NOT NULL,
@@ -642,8 +603,6 @@ AS
  FROM INSERTED
  WHERE TBGI_REGEX_DOCTYPE.GUID = INSERTED.GUID
 GO
-ALTER TABLE TBGI_HISTORY ADD ADDED_WHERE VARCHAR(100)
-GO 
 IF EXISTS (SELECT name from sys.indexes  
           WHERE name = N'UQ_TBGI_REGEX_DOCTYPE_DOCTYPE_ID')   
   DROP INDEX UQ_TBGI_REGEX_DOCTYPE_DOCTYPE_ID ON TBGI_REGEX_DOCTYPE;   
--- a/02_GI/Updates/Added2MainScript/2.3.0.0.sql
+++ b/02_GI/Updates/Added2MainScript/2.3.0.0.sql
@@ -1,8 +1,5 @@
 UPDATE TBDD_MODULES SET DB_VERSION = '2.4.0.0' where NAME = 'Global-Indexer' 
 GO
-ALTER TABLE TBPM_CONTROL_TABLE ADD DEFAULT_VALUE VARCHAR (MAX) NOT NULL DEFAULT '';
-ALTER TABLE TBPM_CONTROL_TABLE ADD ADVANCED_LOOKUP BIT NOT NULL DEFAULT 0;
-
 ALTER PROCEDURE [dbo].[PRDD_CHECK_REL_DOCTYPE_MODULE] (@MODULE_SHORT VARCHAR(20),@DOCTYPE_ID INTEGER)
 AS
 DECLARE @MODULEID INTEGER