ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 18:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Redefined ordering for list databases to be by name (#103)

Browse Source
This commit is contained in:
Mitchell Sternke
2016-10-19 10:57:20 -07:00
committed by GitHub
parent b001f428bf
commit b62f67607f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
View File

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.ServiceLayer.Connection.Contracts; using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
@@ -397,11 +398,12 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
connection.Open(); connection.Open();
List<string> results = new List<string>(); List<string> results = new List<string>();
var systemDatabases = new string[] {"master", "model", "msdb", "tempdb"};
using (DbCommand command = connection.CreateCommand()) using (DbCommand command = connection.CreateCommand())
{ {
command.CommandText = "SELECT name FROM sys.databases ORDER BY database_id ASC"; command.CommandText = "SELECT name FROM sys.databases ORDER BY name ASC";
command.CommandTimeout = 15; command.CommandTimeout = 15;
command.CommandType = CommandType.Text; command.CommandType = CommandType.Text;
using (var reader = command.ExecuteReader()) using (var reader = command.ExecuteReader())
{ {
@@ -412,6 +414,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
} }
} }
// Put system databases at the top of the list
results =
results.Where(s => systemDatabases.Any(s.Equals)).Concat(
results.Where(s => systemDatabases.All(x => !s.Equals(x)))).ToList();
connection.Close(); connection.Close();
ListDatabasesResponse response = new ListDatabasesResponse(); ListDatabasesResponse response = new ListDatabasesResponse();