ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-13 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

3715 Default database name for Kusto (#1076)

Browse Source 
* 3715 Refactored GetDatabaseName to load database names from kusto server when no database name available in connection string.

* 3715 Removed variable name from GetDatabaseName
This commit is contained in:
Justin M
2020-09-15 13:34:21 -07:00
committed by GitHub
parent f25fb3c5d7
commit c80b70bea4
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
View File

@@ -86,8 +86,8 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
public KustoDataSource(string connectionString, string azureAccountToken)
{
ClusterName = GetClusterName(connectionString);
DatabaseName = GetDatabaseName(connectionString);
UserToken = azureAccountToken;
DatabaseName = GetDatabaseName(connectionString);
SchemaState = Task.Run(() =>
KustoIntellisenseHelper.AddOrUpdateDatabaseAsync(this, GlobalState.Default, DatabaseName, ClusterName,
throwOnError: false)).Result;
@@ -117,14 +117,31 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
}
/// <summary>
/// Extracts the database name from the connectionstring, if it exists
/// <summary>
/// <param name="connectionString">A connection string coming over the Data management protocol</param>
private static string GetDatabaseName(string connectionString)
/// Extracts the database name from the connectionString if it exists
/// otherwise it takes the first database name from the server
/// </summary>
/// <param name="connectionString"></param>
/// <returns>Database Name</returns>
private string GetDatabaseName(string connectionString)
{
var csb = new SqlConnectionStringBuilder(connectionString);
return csb.InitialCatalog;
if (!string.IsNullOrWhiteSpace(csb.InitialCatalog))
{
return csb.InitialCatalog;
}
CancellationTokenSource source = new CancellationTokenSource();
CancellationToken token = source.Token;
string query = ".show databases | project DatabaseName";
using (var reader = ExecuteQuery(query, token))
{
var rows = reader.ToEnumerable();
var row = rows?.FirstOrDefault();
return row?[0].ToString() ?? string.Empty;
}
}
/// <summary>