[do not review] History separation with separated raw resources

src/Microsoft.Health.Fhir.SqlServer.UnitTests/Features/Search/HashingSqlQueryParameterManagerTests.cs

@@ -34,8 +34,8 @@ public void GivenParametersThatShouldNotBeHashed_WhenAdded_ResultsInNoChangeToHa
             AssertDoesNotChangeHash(parameters, () =>
             {
                 parameters.AddParameter(1, includeInHash: false);
-                parameters.AddParameter(VLatest.Resource.ResourceId, "abc", false);
-                parameters.AddParameter(VLatest.Resource.ResourceId, (object)"123", false);
+                parameters.AddParameter(VLatest.ResourceCurrent.ResourceId, "abc", false);
+                parameters.AddParameter(VLatest.ResourceCurrent.ResourceId, (object)"123", false);
             });
 
             Assert.False(parameters.HasParametersToHash);

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/SchemaVersion.cs

@@ -93,5 +93,6 @@ public enum SchemaVersion
         V81 = 81,
         V82 = 82,
         V83 = 83,
+        V84 = 84,
     }
 }

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/SchemaVersionConstants.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Health.Fhir.SqlServer.Features.Schema
     public static class SchemaVersionConstants
     {
         public const int Min = (int)SchemaVersion.V80;
-        public const int Max = (int)SchemaVersion.V83;
+        public const int Max = (int)SchemaVersion.V84;
         public const int MinForUpgrade = (int)SchemaVersion.V80; // this is used for upgrade tests only
         public const int SearchParameterStatusSchemaVersion = (int)SchemaVersion.V6;
         public const int SupportForReferencesWithMissingTypeVersion = (int)SchemaVersion.V7;

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Scripts/TransactionCheckWithInitialiScript.sql

@@ -19,6 +19,6 @@ Go
 
 INSERT INTO dbo.SchemaVersion
 VALUES
-    (83, 'started')
+    (84, 'started')
 
 Go

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/DisableIndexes.sql

@@ -39,7 +39,7 @@ BEGIN TRY
       WHERE NOT EXISTS (SELECT * FROM dbo.IndexProperties WHERE TableName = Tbl AND IndexName = Ind)
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='Info',@Target='IndexProperties',@Action='Insert',@Rows=@@rowcount
 
-  DELETE FROM @Indexes WHERE Tbl = 'Resource' OR IndId = 1
+  DELETE FROM @Indexes WHERE Tbl IN ('Resource','ResourceCurrent','ResourceHistory') OR IndId = 1
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='Info',@Target='@Indexes',@Action='Delete',@Rows=@@rowcount
 
   WHILE EXISTS (SELECT * FROM @Indexes)

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/GetResources.sql

@@ -29,7 +29,7 @@ BEGIN TRY
             ,IsRawResourceMetaSet
             ,SearchParamHash
         FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys) A
-             JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
+             JOIN dbo.Resource B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
         OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
     ELSE
       SELECT *
@@ -43,7 +43,7 @@ BEGIN TRY
                     ,IsRawResourceMetaSet
                     ,SearchParamHash
                 FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys WHERE Version IS NOT NULL) A
-                     JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId_Version) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
+                     JOIN dbo.Resource B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId AND B.Version = A.Version
               UNION ALL
               SELECT B.ResourceTypeId
                     ,B.ResourceId
@@ -55,7 +55,7 @@ BEGIN TRY
                     ,IsRawResourceMetaSet
                     ,SearchParamHash
                 FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys WHERE Version IS NULL) A
-                     JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+                     JOIN dbo.Resource B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
                 WHERE IsHistory = 0
              ) A
         OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
@@ -70,7 +70,7 @@ BEGIN TRY
           ,IsRawResourceMetaSet
           ,SearchParamHash
       FROM (SELECT TOP (@DummyTop) * FROM @ResourceKeys) A
-           JOIN dbo.Resource B WITH (INDEX = IX_Resource_ResourceTypeId_ResourceId) ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
+           JOIN dbo.Resource B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceId = A.ResourceId
       WHERE IsHistory = 0
       OPTION (MAXDOP 1, OPTIMIZE FOR (@DummyTop = 1))
 
@@ -83,5 +83,5 @@ BEGIN CATCH
 END CATCH
 GO
 --DECLARE @ResourceKeys dbo.ResourceKeyList
---INSERT INTO @ResourceKeys SELECT TOP 1 ResourceTypeId, ResourceId, NULL FROM Resource
+--INSERT INTO @ResourceKeys SELECT 96, newid(), NULL
 --EXECUTE dbo.GetResources @ResourceKeys

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/MergeResources.sql

@@ -411,7 +411,7 @@ BEGIN CATCH
 
   EXECUTE dbo.LogEvent @Process=@SP,@Mode=@Mode,@Status='Error',@Start=@st;
 
-  IF @RaiseExceptionOnConflict = 1 AND error_number() IN (2601, 2627) AND error_message() LIKE '%''dbo.Resource''%'
+  IF @RaiseExceptionOnConflict = 1 AND error_number() IN (2601, 2627) AND (error_message() LIKE '%''dbo.Resource%' OR error_message() LIKE '%''dbo.RawResources''%') -- handles old and separated tables
     THROW 50409, 'Resource has been recently updated or added, please compare the resource content in code for any duplicate updates', 1;
   ELSE
     THROW

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Sprocs/UpdateResourceSearchParams.sql

@@ -29,11 +29,12 @@ BEGIN TRY
   BEGIN TRANSACTION
 
   -- Update the search parameter hash value in the main resource table
-  UPDATE B
-    SET SearchParamHash = A.SearchParamHash
-    OUTPUT deleted.ResourceTypeId, deleted.ResourceSurrogateId INTO @Ids 
-    FROM @Resources A JOIN dbo.Resource B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
-    WHERE B.IsHistory = 0
+  -- Avoid join to enable update via view
+  UPDATE A
+    SET SearchParamHash = (SELECT SearchParamHash FROM @Resources B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId)
+    FROM dbo.Resource A
+    WHERE IsHistory = 0
+      AND EXISTS (SELECT * FROM @Resources B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId)
   SET @Rows = @@rowcount
 
   -- First, delete all the search params of the resources to reindex.

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Tables/Resource.sql

@@ -1,52 +1,104 @@
-CREATE TABLE dbo.Resource
+CREATE TABLE dbo.RawResources
 (
-    ResourceTypeId              smallint                NOT NULL,
-    ResourceId                  varchar(64)             COLLATE Latin1_General_100_CS_AS NOT NULL,
-    Version                     int                     NOT NULL,
-    IsHistory                   bit                     NOT NULL,
-    ResourceSurrogateId         bigint                  NOT NULL,
-    IsDeleted                   bit                     NOT NULL,
-    RequestMethod               varchar(10)             NULL,
-    RawResource                 varbinary(max)          NOT NULL,
-    IsRawResourceMetaSet        bit                     NOT NULL DEFAULT 0,
-    SearchParamHash             varchar(64)             NULL,
-    TransactionId               bigint                  NULL,     -- used for main CRUD operation 
-    HistoryTransactionId        bigint                  NULL      -- used by CRUD operation that moved resource version in invisible state 
-
-    CONSTRAINT PKC_Resource PRIMARY KEY CLUSTERED (ResourceTypeId, ResourceSurrogateId) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId(ResourceTypeId),
-    CONSTRAINT CH_Resource_RawResource_Length CHECK (RawResource > 0x0)
-)
-
-ALTER TABLE dbo.Resource SET ( LOCK_ESCALATION = AUTO )
-
-CREATE INDEX IX_ResourceTypeId_TransactionId ON dbo.Resource (ResourceTypeId, TransactionId) WHERE TransactionId IS NOT NULL ON PartitionScheme_ResourceTypeId (ResourceTypeId)
-CREATE INDEX IX_ResourceTypeId_HistoryTransactionId ON dbo.Resource (ResourceTypeId, HistoryTransactionId) WHERE HistoryTransactionId IS NOT NULL ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+    ResourceTypeId              smallint                NOT NULL
+   ,ResourceSurrogateId         bigint                  NOT NULL
+   ,RawResource                 varbinary(max)          NULL
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Resource_ResourceTypeId_ResourceId_Version ON dbo.Resource
-(
-    ResourceTypeId,
-    ResourceId,
-    Version
+    CONSTRAINT PKC_RawResources_ResourceTypeId_ResourceSurrogateId PRIMARY KEY CLUSTERED (ResourceTypeId, ResourceSurrogateId) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
 )
-ON PartitionScheme_ResourceTypeId(ResourceTypeId)
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Resource_ResourceTypeId_ResourceId ON dbo.Resource
-(
-    ResourceTypeId,
-    ResourceId
-)
-INCLUDE -- We want the query in UpsertResource, which is done with UPDLOCK AND HOLDLOCK, to not require a key lookup
+ALTER TABLE dbo.RawResources SET ( LOCK_ESCALATION = AUTO )
+GO
+CREATE TABLE dbo.ResourceCurrent
 (
-    Version,
-    IsDeleted
+    ResourceTypeId              smallint                NOT NULL
+   ,ResourceSurrogateId         bigint                  NOT NULL
+   ,ResourceId                  varchar(64)             COLLATE Latin1_General_100_CS_AS NOT NULL
+   ,Version                     int                     NOT NULL
+   ,IsHistory                   bit                     NOT NULL CONSTRAINT DF_ResourceCurrent_IsHistory DEFAULT 0, CONSTRAINT CH_ResourceCurrent_IsHistory CHECK (IsHistory = 0)
+   ,IsDeleted                   bit                     NOT NULL
+   ,RequestMethod               varchar(10)             NULL
+   ,RawResource                 varbinary(max)          NULL
+   ,IsRawResourceMetaSet        bit                     NOT NULL CONSTRAINT DF_ResourceCurrent_IsRawResourceMetaSet DEFAULT 0
+   ,SearchParamHash             varchar(64)             NULL
+   ,TransactionId               bigint                  NULL      -- used for main CRUD operation 
+   ,HistoryTransactionId        bigint                  NULL      -- used by CRUD operation that moved resource version in invisible state 
+
+    CONSTRAINT PKC_ResourceCurrent_ResourceTypeId_ResourceSurrogateId PRIMARY KEY CLUSTERED (ResourceTypeId, ResourceSurrogateId) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+   ,CONSTRAINT U_ResourceCurrent_ResourceTypeId_ResourceId UNIQUE (ResourceTypeId, ResourceId) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
 )
-WHERE IsHistory = 0
-ON PartitionScheme_ResourceTypeId(ResourceTypeId)
 
-CREATE UNIQUE NONCLUSTERED INDEX IX_Resource_ResourceTypeId_ResourceSurrgateId ON dbo.Resource
+ALTER TABLE dbo.ResourceCurrent SET ( LOCK_ESCALATION = AUTO )
+
+-- Strictly speaking, IsHistory=0 filter in the index is not required because table has check constraint. 
+-- But SQL Server has a bug. For queries having IsHistory=0 in WHERE, SQL knows that only current table should be looked at.
+-- But when choosing indexes it forgets about this unless IsHistory=0 is also included in index definition.
+-- Without this redundant filtering clause in the index SQL chooses clustered index scan. For large tables it is a difference between running OK and timing out. 
+--CREATE UNIQUE INDEX IXU_ResourceTypeId_ResourceSurrogateId_WHERE_IsHistory_0_IsDeleted_0 ON dbo.ResourceCurrent (ResourceTypeId, ResourceSurrogateId) WHERE IsHistory = 0 AND IsDeleted = 0 WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+CREATE INDEX IX_ResourceTypeId_TransactionId_WHERE_TransactionId_NOT_NULL ON dbo.ResourceCurrent (ResourceTypeId, TransactionId) WHERE TransactionId IS NOT NULL WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+CREATE INDEX IX_ResourceTypeId_HistoryTransactionId_WHERE_HistoryTransactionId_NOT_NULL ON dbo.ResourceCurrent (ResourceTypeId, HistoryTransactionId) WHERE HistoryTransactionId IS NOT NULL WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+GO
+EXECUTE sp_rename 'ResourceCurrent', 'ResourceCurrentTbl'
+GO
+CREATE VIEW dbo.ResourceCurrent
+AS 
+SELECT A.ResourceTypeId
+      ,A.ResourceSurrogateId
+      ,ResourceId
+      ,Version
+      ,IsHistory
+      ,IsDeleted
+      ,RequestMethod
+      ,B.RawResource
+      ,IsRawResourceMetaSet
+      ,SearchParamHash
+      ,TransactionId 
+      ,HistoryTransactionId
+  FROM dbo.ResourceCurrentTbl A
+       LEFT OUTER JOIN dbo.RawResources B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+GO
+CREATE TABLE dbo.ResourceHistory
 (
-    ResourceTypeId,
-    ResourceSurrogateId
+    ResourceTypeId              smallint                NOT NULL
+   ,ResourceSurrogateId         bigint                  NOT NULL
+   ,ResourceId                  varchar(64)             COLLATE Latin1_General_100_CS_AS NOT NULL
+   ,Version                     int                     NOT NULL
+   ,IsHistory                   bit                     NOT NULL CONSTRAINT DF_ResourceHistory_IsHistory DEFAULT 1, CONSTRAINT CH_ResourceHistory_IsHistory CHECK (IsHistory = 1)
+   ,IsDeleted                   bit                     NOT NULL
+   ,RequestMethod               varchar(10)             NULL
+   ,RawResource                 varbinary(max)          NULL
+   ,IsRawResourceMetaSet        bit                     NOT NULL CONSTRAINT DF_ResourceHistory_IsRawResourceMetaSet DEFAULT 0
+   ,SearchParamHash             varchar(64)             NULL
+   ,TransactionId               bigint                  NULL      -- used for main CRUD operation 
+   ,HistoryTransactionId        bigint                  NULL      -- used by CRUD operation that moved resource version in invisible state 
+
+    CONSTRAINT PKC_ResourceHistory_ResourceTypeId_ResourceSurrogateId PRIMARY KEY CLUSTERED (ResourceTypeId, ResourceSurrogateId) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+   ,CONSTRAINT U_ResourceHistory_ResourceTypeId_ResourceId_Version UNIQUE (ResourceTypeId, ResourceId, Version) WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
 )
-WHERE IsHistory = 0 AND IsDeleted = 0
-ON PartitionScheme_ResourceTypeId(ResourceTypeId)
+
+ALTER TABLE dbo.ResourceHistory SET ( LOCK_ESCALATION = AUTO )
+
+CREATE INDEX IX_ResourceTypeId_TransactionId_WHERE_TransactionId_NOT_NULL ON dbo.ResourceHistory (ResourceTypeId, TransactionId) WHERE TransactionId IS NOT NULL WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+CREATE INDEX IX_ResourceTypeId_HistoryTransactionId_WHERE_HistoryTransactionId_NOT_NULL ON dbo.ResourceHistory (ResourceTypeId, HistoryTransactionId) WHERE HistoryTransactionId IS NOT NULL WITH (DATA_COMPRESSION = PAGE) ON PartitionScheme_ResourceTypeId (ResourceTypeId)
+GO
+EXECUTE sp_rename 'ResourceHistory', 'ResourceHistoryTbl'
+GO
+CREATE VIEW dbo.ResourceHistory
+AS 
+SELECT A.ResourceTypeId
+      ,A.ResourceSurrogateId
+      ,ResourceId
+      ,Version
+      ,IsHistory
+      ,IsDeleted
+      ,RequestMethod
+      ,B.RawResource
+      ,IsRawResourceMetaSet
+      ,SearchParamHash
+      ,TransactionId
+      ,HistoryTransactionId
+  FROM dbo.ResourceHistoryTbl A
+       LEFT OUTER JOIN dbo.RawResources B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+GO
+CREATE TABLE dbo.Dummy (Dummy int)
+GO

src/Microsoft.Health.Fhir.SqlServer/Features/Schema/Sql/Views/Resource.sql

@@ -0,0 +1,119 @@
+CREATE VIEW dbo.Resource
+AS
+SELECT ResourceTypeId
+      ,ResourceSurrogateId
+      ,ResourceId
+      ,Version
+      ,IsHistory
+      ,IsDeleted
+      ,RequestMethod
+      ,RawResource
+      ,IsRawResourceMetaSet
+      ,SearchParamHash
+      ,TransactionId
+      ,HistoryTransactionId
+  FROM dbo.ResourceHistory
+UNION ALL
+SELECT ResourceTypeId
+      ,ResourceSurrogateId
+      ,ResourceId
+      ,Version
+      ,IsHistory
+      ,IsDeleted
+      ,RequestMethod
+      ,RawResource
+      ,IsRawResourceMetaSet
+      ,SearchParamHash
+      ,TransactionId
+      ,HistoryTransactionId
+  FROM dbo.ResourceCurrent
+GO
+CREATE TRIGGER dbo.ResourceIns ON dbo.Resource INSTEAD OF INSERT
+AS
+BEGIN
+  INSERT INTO dbo.RawResources
+         ( ResourceTypeId, ResourceSurrogateId, RawResource )
+    SELECT ResourceTypeId, ResourceSurrogateId, RawResource
+      FROM Inserted
+
+  INSERT INTO dbo.ResourceCurrentTbl
+         ( ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId )
+    SELECT ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId
+      FROM Inserted
+      WHERE IsHistory = 0
+
+  INSERT INTO dbo.ResourceHistoryTbl
+         ( ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId )
+    SELECT ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId
+      FROM Inserted
+      WHERE IsHistory = 1
+END
+GO
+CREATE TRIGGER dbo.ResourceUpd ON dbo.Resource INSTEAD OF UPDATE
+AS
+BEGIN
+  IF UPDATE(IsDeleted) AND UPDATE(RawResource) AND UPDATE(SearchParamHash) AND UPDATE(HistoryTransactionId) AND NOT UPDATE(IsHistory) -- HardDeleteResource
+  BEGIN
+    UPDATE B
+      SET RawResource = A.RawResource
+      FROM Inserted A
+           JOIN dbo.RawResources B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+
+    UPDATE B
+      SET IsDeleted = A.IsDeleted
+         ,SearchParamHash = A.SearchParamHash
+         ,HistoryTransactionId = A.HistoryTransactionId
+      FROM Inserted A
+           JOIN dbo.ResourceCurrentTbl B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+
+    RETURN
+  END
+
+  IF UPDATE(SearchParamHash) AND NOT UPDATE(IsHistory)
+  BEGIN
+    UPDATE B
+      SET SearchParamHash = A.SearchParamHash
+      FROM Inserted A
+           JOIN dbo.ResourceCurrentTbl B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+      WHERE A.IsHistory = 0
+
+    RETURN
+  END
+
+  IF UPDATE(RawResource) -- invisible records
+    UPDATE B
+      SET RawResource = A.RawResource
+      FROM Inserted A
+           JOIN dbo.RawResources B ON B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId
+
+  IF NOT UPDATE(IsHistory)
+    RAISERROR('Generic updates are not supported via Resource view',18,127)
+
+  DELETE FROM A
+    FROM dbo.ResourceCurrentTbl A
+    WHERE EXISTS (SELECT * FROM Inserted B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId AND B.IsHistory = 1)
+
+  INSERT INTO dbo.ResourceHistoryTbl
+         ( ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId )
+    SELECT ResourceTypeId, ResourceSurrogateId, ResourceId, Version, IsDeleted, RequestMethod, IsRawResourceMetaSet, SearchParamHash, TransactionId, HistoryTransactionId
+      FROM Inserted
+      WHERE IsHistory = 1
+END
+GO
+CREATE TRIGGER dbo.ResourceDel ON dbo.Resource INSTEAD OF DELETE
+AS
+BEGIN
+  DELETE FROM A
+    FROM dbo.ResourceCurrentTbl A
+    WHERE EXISTS (SELECT * FROM Deleted B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId AND B.IsHistory = 0)
+
+  DELETE FROM A
+    FROM dbo.ResourceHistoryTbl A
+    WHERE EXISTS (SELECT * FROM Deleted B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId AND B.IsHistory = 1)
+
+  DELETE FROM A
+    FROM dbo.RawResources A
+    WHERE EXISTS (SELECT * FROM Deleted B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId)
+      AND NOT EXISTS (SELECT * FROM Resource B WHERE B.ResourceTypeId = A.ResourceTypeId AND B.ResourceSurrogateId = A.ResourceSurrogateId) 
+END
+GO