From 10c24aaeb34bc19bbd01e7fab759eb65a57b9885 Mon Sep 17 00:00:00 2001
From: Aasim Khan <aasimkhan30@gmail.com>
Date: Wed, 28 Apr 2021 16:52:24 -0700
Subject: [PATCH] Fixing a notebook history bug in SQL Agent (#1199)

* Added a leading 0 to notebook history runtimes

* Fixing comment

* Fix for getting run date and time for notebook jobs in a proper format - Try2

* Reverting back to previous query
---
 src/Microsoft.SqlTools.ServiceLayer/Agent/AgentService.cs    | 3 +--
 .../Agent/Jobs/AgentNotebookHelper.cs                        | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/AgentService.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/AgentService.cs
index 6f824146..1e247add 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/AgentService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/AgentService.cs
@@ -1551,8 +1551,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent
                 DataTable materializedNotebookTable = await AgentNotebookHelper.GetAgentNotebookHistories(connInfo, jobId, targetDatabase);
                 foreach (DataRow materializedNotebookRow in materializedNotebookTable.Rows)
                 {
-                    string materializedRunDateTime = materializedNotebookRow["run_date"].ToString() + materializedNotebookRow["run_time"].ToString();
-                    notebookHistoriesDict.Add(materializedRunDateTime, materializedNotebookRow);
+                    notebookHistoriesDict.Add(materializedNotebookRow["job_runtime"].ToString(), materializedNotebookRow);
                 }
 
                 // adding notebook information to job histories
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs
index 398995cb..8717652e 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Agent/Jobs/AgentNotebookHelper.cs
@@ -258,12 +258,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Agent
             @"
             SELECT
             materialized_id,
-            run_time,
-            run_date,
             notebook_error,
             pin,
             notebook_name,
-            is_deleted
+            is_deleted,
+            FORMAT(msdb.dbo.agent_datetime(run_date, run_time), 'yyyyMMddHHmmss') as job_runtime 
             FROM 
             notebooks.nb_materialized 
             WHERE job_id = @jobId";