From a29f058d5826fe85de4bf50eaebbe8caf1e4f6e6 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 18 Jan 2022 15:25:12 +0100
Subject: [PATCH] EDMIService:  fix wrong return type of getscalarvaluemethod

---
 .../GetScalarValue/GetScalarValueMethod.vb         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb b/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
index 3d4c5cc4..ecf90fca 100644
--- a/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
+++ b/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
@@ -17,18 +17,18 @@ Namespace Methods.Database.GetScalarValue
         ''' </summary>
         Public Function Run(pData As GetScalarValueRequest) As GetScalarValueResponse
             Try
-                Dim oDatatable As DataTable = Nothing
+                Dim oResult As Object = Nothing
 
                 Select Case pData.DatabaseType
                     Case DatabaseType.MSSQL
                         If pData.NamedDatabase = DatabaseName.None Then
-                            oDatatable = GetScalarValueByConnectionId(pData.SqlCommand, pData.ConnectionId)
+                            oResult = GetScalarValueByConnectionId(pData.SqlCommand, pData.ConnectionId)
 
                         ElseIf pData.NamedDatabase = DatabaseName.ECM Then
-                            oDatatable = DatabaseECM.GetScalarValue(pData.SqlCommand)
+                            oResult = DatabaseECM.GetScalarValue(pData.SqlCommand)
 
                         ElseIf pData.NamedDatabase = DatabaseName.IDB Then
-                            oDatatable = DatabaseIDB.GetScalarValue(pData.SqlCommand)
+                            oResult = DatabaseIDB.GetScalarValue(pData.SqlCommand)
 
                         Else
                             LogAndThrow($"Unsupported Named Database supplied. SQL Command [{pData.SqlCommand}] was not executed!")
@@ -40,11 +40,11 @@ Namespace Methods.Database.GetScalarValue
 
                 End Select
 
-                If oDatatable Is Nothing Then
+                If oResult Is Nothing Then
                     LogAndThrow($"SQL Command did not return any results: [{pData.SqlCommand}]!")
                 End If
 
-                Return New GetScalarValueResponse(oDatatable)
+                Return New GetScalarValueResponse(oResult)
             Catch ex As Exception
                 Logger.Warn("Error occurred while getting database scalar value!")
                 Logger.Error(ex)
@@ -52,7 +52,7 @@ Namespace Methods.Database.GetScalarValue
             End Try
         End Function
 
-        Private Function GetScalarValueByConnectionId(pSQLCommand As String, pConnectionId As Integer) As DataTable
+        Private Function GetScalarValueByConnectionId(pSQLCommand As String, pConnectionId As Integer) As Object
             If pConnectionId = 0 Then
                 Return DatabaseECM.GetScalarValue(pSQLCommand)
             Else