merge MS changes
This commit is contained in:
@@ -568,7 +568,7 @@ IF UPDATE(REFERENCE_KEY) OR UPDATE(PARENT_OBJ_ID) OR UPDATE(IS_VERSION) OR UPDAT
|
||||
UPDATE TBIDB_OBJECT SET CHANGED_WHEN = GETDATE()
|
||||
FROM INSERTED
|
||||
WHERE TBIDB_OBJECT.IDB_OBJ_ID = INSERTED.IDB_OBJ_ID
|
||||
|
||||
GO
|
||||
CREATE TABLE TBIDB_STRUCTURE_TYPE
|
||||
(
|
||||
GUID INTEGER NOT NULL IDENTITY (1, 1),
|
||||
@@ -1256,7 +1256,7 @@ AS
|
||||
FROM INSERTED
|
||||
WHERE TBIDB_BASE.GUID = INSERTED.GUID
|
||||
GO
|
||||
INSERT INTO TBIDB_BASE (CONFIG_NAME,CONFIG_VALUE) VALUES ('DB_VERSION','1.0.1')
|
||||
INSERT INTO TBIDB_BASE (CONFIG_NAME,CONFIG_VALUE) VALUES ('DB_VERSION','1.1.0')
|
||||
GO
|
||||
INSERT INTO TBIDB_BASE (CONFIG_NAME,CONFIG_VALUE) VALUES ('GHOST_SELECT','
|
||||
SELECT T.USERNAME,T.NAME, T.[PRENAME],T.EMAIL FROM MY_DD_ECM_DB.dbo.TBDD_USER T ORDER BY USERNAME')
|
||||
@@ -1396,7 +1396,6 @@ UNION
|
||||
RES.USR_ID = @USER_ID AND VWDT.LANG_CODE = ''@LANG_CODE''
|
||||
AND CHK.CHECKED_IN_WHEN IS NULL','SYSTEM')
|
||||
GO
|
||||
DROP TABLE TBIDB_SEARCH_INPUT_USER
|
||||
CREATE TABLE TBIDB_SEARCH_INPUT_USER
|
||||
(
|
||||
GUID BIGINT NOT NULL IDENTITY (1, 1),
|
||||
@@ -1417,7 +1416,6 @@ CREATE TABLE TBIDB_SEARCH_RESULT_TERM_USER
|
||||
CONSTRAINT FK_TBIDB_SEARCH_RESULT_USER_MD_GUID FOREIGN KEY (MD_GUID) REFERENCES TBIDB_OBJECT_METADATA (GUID)
|
||||
)
|
||||
GO
|
||||
DROP TABLE TBIDB_SEARCH_RESULT_TOKEN
|
||||
CREATE TABLE TBIDB_SEARCH_RESULT_TOKEN
|
||||
(
|
||||
GUID BIGINT NOT NULL IDENTITY (1, 1),
|
||||
@@ -1427,7 +1425,6 @@ CREATE TABLE TBIDB_SEARCH_RESULT_TOKEN
|
||||
ADDED_WHEN DATETIME NOT NULL DEFAULT GETDATE(),
|
||||
)
|
||||
GO
|
||||
DROP TABLE TBIDB_SEARCH_RESULT_DOCS
|
||||
CREATE TABLE TBIDB_SEARCH_RESULT_DOCS
|
||||
(
|
||||
GUID BIGINT NOT NULL IDENTITY (1, 1),
|
||||
@@ -1608,7 +1605,7 @@ GO
|
||||
-- Author: DD MS
|
||||
-- Changed: 19.05.2022
|
||||
-- =============================================
|
||||
ALTER PROCEDURE [dbo].[PRIDB_SEARCH_GET_TOKEN_RESULT_DOCS] (@pUSR_ID as INTEGER,@pDATE_RESTRICTION VARCHAR(500), @pLANG_CODE as VARCHAR(5) = 'de-DE')
|
||||
CREATE OR ALTER PROCEDURE [dbo].[PRIDB_SEARCH_GET_TOKEN_RESULT_DOCS] (@pUSR_ID as INTEGER,@pDATE_RESTRICTION VARCHAR(500), @pLANG_CODE as VARCHAR(5) = 'de-DE')
|
||||
AS
|
||||
BEGIN
|
||||
DECLARE @SRCH_VAR VARCHAR(900), @DYNSQL_INSERT NVARCHAR(MAX),@DateStr VARCHAR(100)
|
||||
@@ -2094,9 +2091,6 @@ GO
|
||||
ALTER TABLE [dbo].[TBIDB_LANGUAGE_TERM_METADATA] CHECK CONSTRAINT [FK_TBIDB_LTMD_CHANGED_WHO_T_ID]
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[TBIDB_LANGUAGE_TERM_METADATA] CHECK CONSTRAINT [FK_TBIDB_LTMD_LANG_TERM_ID]
|
||||
GO
|
||||
|
||||
|
||||
|
||||
CREATE NONCLUSTERED INDEX [TBIDB_LANGUAGE_TERM_METADATA_LANG_TERM_ID]
|
||||
@@ -4405,7 +4399,7 @@ BEGIN
|
||||
END
|
||||
GO
|
||||
|
||||
ALTER PROCEDURE [dbo].[PRIDB_NEW_OBJ_DATA] @IDB_OBJ_ID BIGINT,@ATTRIBUTE VARCHAR(100),@WHO VARCHAR(100), @TERM_VAL VARCHAR(MAX),
|
||||
CREATE PROCEDURE [dbo].[PRIDB_NEW_OBJ_DATA] @IDB_OBJ_ID BIGINT,@ATTRIBUTE VARCHAR(100),@WHO VARCHAR(100), @TERM_VAL VARCHAR(MAX),
|
||||
@LANG_CODE VARCHAR(5) = 'de-DE', @FOREIGN_KEY BIGINT = 0, @OMD_ID BIGINT OUTPUT
|
||||
AS
|
||||
BEGIN
|
||||
@@ -5654,7 +5648,7 @@ BEGIN
|
||||
IF @TYPE_NAME IN ('VARCHAR','VECTOR STRING')
|
||||
INSERT INTO @TBRESULT (AttributID,AttributTitle,AttributType,ValueText,ADDED_WHEN,CHANGED_WHEN)
|
||||
select
|
||||
@ATTR_ID,@ATTR_TITLE,@TYPE_NAME,[dbo].[FNIDB_GET_TERM_TEXT] (@IDB_OBJ_ID,@ATTR_ID),T.ADDED_WHEN,T.CHANGED_WHEN
|
||||
@ATTR_ID,@ATTR_TITLE,@TYPE_NAME,[dbo].[FNIDB_GET_TERM_TEXT] (@IDB_OBJ_ID,@ATTR_ID,@LANG_CODE),T.ADDED_WHEN,T.CHANGED_WHEN
|
||||
from
|
||||
TBIDB_OBJECT_METADATA T
|
||||
WHERE T.IDB_OBJ_ID = @IDB_OBJ_ID AND T.ATTR_ID = @ATTR_ID
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user