AppStd/ClipboardWatcher
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Database from Monorepo, Add initial ODBC Support

Browse Source
This commit is contained in:
Jonathan Jenne
2019-08-06 15:41:02 +02:00
parent 6e6a483602
commit 43d3ba5ef2
15 changed files with 237 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/DD_Clipboard_Searcher/frmResultSQL.vb
View File

@@ -152,7 +152,7 @@ Public Class frmResultSQL
Private Function DoLoadSearches() As List(Of SQLSearch)
Dim oMatchingIds = String.Join(",", Current_MatchingProfiles.Select(Function(p) p.Guid).ToArray())
Dim oSQL = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
Dim oSearchesDataTable = clsDatabase.Return_Datatable(oSQL)
Dim oSearchesDataTable = Database.GetDatatable(oSQL)
Dim oSearches As New List(Of SQLSearch)
Dim oCounter As Integer = 0
@@ -165,7 +165,7 @@ Public Class frmResultSQL
oSQL = oRow.Item("SQL_COMMAND")
oSQL = clsPatterns.ReplaceAllValues(oSQL, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, oProfileId)
Dim oDatatable As DataTable = clsDatabase.Return_Datatable(oSQL)
Dim oDatatable As DataTable = Database.GetDatatable(oSQL)
oSearches.Add(New SQLSearch() With {
.DataTable = oDatatable,
.ProfileId = oProfileId,
@@ -211,7 +211,7 @@ Public Class frmResultSQL
Dim oDatatable As DataTable
oCommand = clsPatterns.ReplaceAllValues(oCommand, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, oProfID)
oDatatable = clsDatabase.Return_Datatable(oCommand)
oDatatable = Database.GetDatatable(oCommand)
RefreshTabData(oProfID, oDatatable, oTabIndex, oTabTitle)