From 1d8d50c7069febfa0b04ef471e4674f020a24e2a Mon Sep 17 00:00:00 2001 From: praju-aot Date: Tue, 28 Jan 2025 15:41:55 -0500 Subject: [PATCH] Resolve code conflicts --- .../revert/{v_57_ddl_revert.sql => v_58_ddl_revert.sql} | 2 +- database/mssql/scripts/versions/{v_57_ddl.sql => v_58_ddl.sql} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename database/mssql/scripts/versions/revert/{v_57_ddl_revert.sql => v_58_ddl_revert.sql} (93%) rename database/mssql/scripts/versions/{v_57_ddl.sql => v_58_ddl.sql} (99%) diff --git a/database/mssql/scripts/versions/revert/v_57_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_58_ddl_revert.sql similarity index 93% rename from database/mssql/scripts/versions/revert/v_57_ddl_revert.sql rename to database/mssql/scripts/versions/revert/v_58_ddl_revert.sql index 14f2ffdc2..d86f2a22f 100644 --- a/database/mssql/scripts/versions/revert/v_57_ddl_revert.sql +++ b/database/mssql/scripts/versions/revert/v_58_ddl_revert.sql @@ -22,7 +22,7 @@ GO DECLARE @VersionDescription VARCHAR(255) SET @VersionDescription = 'Reverting updates to support new vehicle types for TROS and TROW' -INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (56, @VersionDescription, getutcdate()) +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (57, @VersionDescription, getutcdate()) GO IF @@ERROR <> 0 SET NOEXEC ON diff --git a/database/mssql/scripts/versions/v_57_ddl.sql b/database/mssql/scripts/versions/v_58_ddl.sql similarity index 99% rename from database/mssql/scripts/versions/v_57_ddl.sql rename to database/mssql/scripts/versions/v_58_ddl.sql index bbb006eb3..b3042e935 100644 --- a/database/mssql/scripts/versions/v_57_ddl.sql +++ b/database/mssql/scripts/versions/v_58_ddl.sql @@ -69,7 +69,7 @@ GO DECLARE @VersionDescription VARCHAR(255) SET @VersionDescription = 'Updates to support new vehicle types for TROS and TROW' -INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (57, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate()) +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (58, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate()) IF @@ERROR <> 0 SET NOEXEC ON GO