From 73b8d5c16925d0905fbc8dcacfe0c284e6c959c0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 16 Mar 2022 11:04:24 +0100 Subject: [PATCH] EDMIClient: Add _FromConnection variants for database functions --- Modules.EDMIAPI/Client.vb | 139 ++++++++++++++++++++++++++++++-------- 1 file changed, 109 insertions(+), 30 deletions(-) diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 0b597322..3ea33c20 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/Modules.EDMIAPI/Client.vb @@ -552,12 +552,12 @@ Public Class Client End Try End Function - Public Function GetDatatableFromIDB(pSQL As String, Optional pConnectionId As Integer = 0) As GetDatatableResponse +#Region "GetDatatable" + Public Function GetDatatableFromIDB(pSQL As String) As GetDatatableResponse Try Dim oResponse = Channel.ReturnDatatable(New GetDatatableRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB }) Return oResponse Catch ex As Exception @@ -566,11 +566,24 @@ Public Class Client End Try End Function - Public Function GetDatatableFromECM(pSQL As String, Optional pConnectionId As Integer = 0) As GetDatatableResponse + Public Function GetDatatableFromECM(pSQL As String) As GetDatatableResponse Try Dim oResponse = Channel.ReturnDatatable(New GetDatatableRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.ECM + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Function GetDatatableFromConnection(pSQL As String, pConnectionId As Integer) As GetDatatableResponse + Try + Dim oResponse = Channel.ReturnDatatable(New GetDatatableRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -580,12 +593,24 @@ Public Class Client End Try End Function - Public Async Function GetDatatableFromIDBAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of GetDatatableResponse) + Public Async Function GetDatatableFromIDBAsync(pSQL As String) As Task(Of GetDatatableResponse) Try Dim oResponse = Await Channel.ReturnDatatableAsync(New GetDatatableRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Async Function GetDatatableFromECMAsync(pSQL As String) As Task(Of GetDatatableResponse) + Try + Dim oResponse = Await Channel.ReturnDatatableAsync(New GetDatatableRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.ECM }) Return oResponse Catch ex As Exception @@ -594,11 +619,11 @@ Public Class Client End Try End Function - Public Async Function GetDatatableFromECMAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of GetDatatableResponse) + Public Async Function GetDatatableFromConnectionAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of GetDatatableResponse) Try Dim oResponse = Await Channel.ReturnDatatableAsync(New GetDatatableRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -607,13 +632,14 @@ Public Class Client Throw ex End Try End Function +#End Region - Public Function GetScalarValueFromIDB(pSQL As String, Optional pConnectionId As Integer = 0) As GetScalarValueResponse +#Region "GetScalarValue" + Public Function GetScalarValueFromIDB(pSQL As String) As GetScalarValueResponse Try Dim oResponse = Channel.ReturnScalarValue(New GetScalarValueRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB }) Return oResponse Catch ex As Exception @@ -622,11 +648,24 @@ Public Class Client End Try End Function - Public Function GetScalarValueFromECM(pSQL As String, Optional pConnectionId As Integer = 0) As GetScalarValueResponse + Public Function GetScalarValueFromECM(pSQL As String) As GetScalarValueResponse Try Dim oResponse = Channel.ReturnScalarValue(New GetScalarValueRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.ECM + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Function GetScalarValueFromConnection(pSQL As String, pConnectionId As Integer) As GetScalarValueResponse + Try + Dim oResponse = Channel.ReturnScalarValue(New GetScalarValueRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -636,12 +675,11 @@ Public Class Client End Try End Function - Public Async Function GetScalarValueFromIDBAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of GetScalarValueResponse) + Public Async Function GetScalarValueFromIDBAsync(pSQL As String) As Task(Of GetScalarValueResponse) Try Dim oResponse = Await Channel.ReturnScalarValueAsync(New GetScalarValueRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB }) Return oResponse Catch ex As Exception @@ -650,11 +688,24 @@ Public Class Client End Try End Function - Public Async Function GetScalarValueFromECMAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of GetScalarValueResponse) + Public Async Function GetScalarValueFromECMAsync(pSQL As String) As Task(Of GetScalarValueResponse) Try Dim oResponse = Await Channel.ReturnScalarValueAsync(New GetScalarValueRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.ECM + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Async Function GetScalarValueFromConnectionAsync(pSQL As String, pConnectionId As Integer) As Task(Of GetScalarValueResponse) + Try + Dim oResponse = Await Channel.ReturnScalarValueAsync(New GetScalarValueRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -663,13 +714,27 @@ Public Class Client Throw ex End Try End Function +#End Region - Public Function ExecuteNonQueryFromIDB(pSQL As String, Optional pConnectionId As Integer = 0) As ExecuteNonQueryResponse +#Region "ExecuteNonQuery" + Public Function ExecuteNonQueryFromIDB(pSQL As String) As ExecuteNonQueryResponse Try Dim oResponse = Channel.ExecuteNonQuery(New ExecuteNonQueryRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Function ExecuteNonQueryFromECM(pSQL As String) As ExecuteNonQueryResponse + Try + Dim oResponse = Channel.ExecuteNonQuery(New ExecuteNonQueryRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.ECM }) Return oResponse Catch ex As Exception @@ -678,11 +743,11 @@ Public Class Client End Try End Function - Public Function ExecuteNonQueryFromECM(pSQL As String, Optional pConnectionId As Integer = 0) As ExecuteNonQueryResponse + Public Function ExecuteNonQueryFromConnection(pSQL As String, pConnectionId As Integer) As ExecuteNonQueryResponse Try Dim oResponse = Channel.ExecuteNonQuery(New ExecuteNonQueryRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -692,12 +757,11 @@ Public Class Client End Try End Function - Public Async Function ExecuteNonQueryFromIDBAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of ExecuteNonQueryResponse) + Public Async Function ExecuteNonQueryFromIDBAsync(pSQL As String) As Task(Of ExecuteNonQueryResponse) Try Dim oResponse = Await Channel.ExecuteNonQueryAsync(New ExecuteNonQueryRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.IDB, - .ConnectionId = pConnectionId + .NamedDatabase = DatabaseName.IDB }) Return oResponse Catch ex As Exception @@ -706,11 +770,24 @@ Public Class Client End Try End Function - Public Async Function ExecuteNonQueryFromECMAsync(pSQL As String, Optional pConnectionId As Integer = 0) As Task(Of ExecuteNonQueryResponse) + Public Async Function ExecuteNonQueryFromECMAsync(pSQL As String) As Task(Of ExecuteNonQueryResponse) Try Dim oResponse = Await Channel.ExecuteNonQueryAsync(New ExecuteNonQueryRequest() With { .SqlCommand = pSQL, - .NamedDatabase = DatabaseName.ECM, + .NamedDatabase = DatabaseName.ECM + }) + Return oResponse + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Function + + Public Async Function ExecuteNonQueryFromConnectionAsync(pSQL As String, pConnectionId As Integer) As Task(Of ExecuteNonQueryResponse) + Try + Dim oResponse = Await Channel.ExecuteNonQueryAsync(New ExecuteNonQueryRequest() With { + .SqlCommand = pSQL, + .NamedDatabase = DatabaseName.None, .ConnectionId = pConnectionId }) Return oResponse @@ -719,6 +796,8 @@ Public Class Client Throw ex End Try End Function +#End Region + Public Function GetDatatableByName(DatatableName As String, Optional FilterExpression As String = "", Optional SortByColumn As String = "") As TableResult Try