Code merge conflicts

bcgov · Dec 5, 2024 · 78d73f5 · 78d73f5
1 parent f7cd2d7
commit 78d73f5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/database/mssql/scripts/versions/revert/v_51_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_51_ddl_revert.sql
@@ -17,7 +17,6 @@ IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_RECEIPT] ADD [TRANSACTION_ID] [bigint] NULL
 
-
 IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_RECEIPT]  WITH CHECK ADD  CONSTRAINT [ORBC_RECEIPT_TRANSACTION_ID_FK] FOREIGN KEY([TRANSACTION_ID])
@@ -113,10 +112,18 @@ IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_TRANSACTION] DROP CONSTRAINT FK_ORBC_TRANSACTION_RECEIPT_ID
 
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+DROP INDEX IX_ORBC_TRANSACTION_RECEIPT_ID_FK ON [permit].[ORBC_TRANSACTION];
+
 IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_TRANSACTION] DROP COLUMN [RECEIPT_ID]
 
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+CREATE NONCLUSTERED INDEX IX_ORBC_RECEIPT_TRANSACTION_ID_FK ON [permit].[ORBC_RECEIPT] ([TRANSACTION_ID]);
+
 
 IF @@ERROR <> 0 SET NOEXEC ON
 GO

diff --git a/database/mssql/scripts/versions/v_51_ddl.sql b/database/mssql/scripts/versions/v_51_ddl.sql
@@ -16,6 +16,10 @@ IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_TRANSACTION] ADD [RECEIPT_ID] [bigint] NULL
 
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+CREATE NONCLUSTERED INDEX IX_ORBC_TRANSACTION_RECEIPT_ID_FK ON [permit].[ORBC_TRANSACTION] ([RECEIPT_ID]);
+
 IF @@ERROR <> 0 SET NOEXEC ON
 GO
 EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Receipt Id of the transaction' , @level0type=N'SCHEMA',@level0name=N'permit', @level1type=N'TABLE',@level1name=N'ORBC_TRANSACTION', @level2type=N'COLUMN',@level2name=N'RECEIPT_ID'
@@ -132,6 +136,10 @@ IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_RECEIPT] DROP CONSTRAINT ORBC_RECEIPT_TRANSACTION_ID_FK
 
+IF @@ERROR <> 0 SET NOEXEC ON
+GO
+  DROP INDEX IX_ORBC_RECEIPT_TRANSACTION_ID_FK ON [permit].[ORBC_RECEIPT];
+
 IF @@ERROR <> 0 SET NOEXEC ON
 GO
 ALTER TABLE [permit].[ORBC_RECEIPT] DROP COLUMN [TRANSACTION_ID]