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

add missing udf type (#923)

Browse Source
This commit is contained in:
Alan Ren
2020-02-25 16:49:06 -08:00
committed by GitHub
parent 7c5b7541cd
commit e407d87fce
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.SqlTools.ServiceLayer/Metadata/MetadataService.cs
View File

@@ -24,9 +24,9 @@ namespace Microsoft.SqlTools.ServiceLayer.Metadata
public static MetadataService Instance => LazyInstance.Value; public static MetadataService Instance => LazyInstance.Value;
private static ConnectionService connectionService = null; private static ConnectionService connectionService = null;
/// <summary> /// <summary>
/// Internal for testing purposes only /// Internal for testing purposes only
/// </summary> /// </summary>
internal static ConnectionService ConnectionServiceInstance internal static ConnectionService ConnectionServiceInstance
@@ -139,7 +139,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Metadata
out connInfo); out connInfo);
ColumnMetadata[] metadata = null; ColumnMetadata[] metadata = null;
if (connInfo != null) if (connInfo != null)
{ {
using (SqlConnection sqlConn = ConnectionService.OpenSqlConnection(connInfo, "Metadata")) using (SqlConnection sqlConn = ConnectionService.OpenSqlConnection(connInfo, "Metadata"))
{ {
@@ -152,7 +152,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Metadata
await requestContext.SendResult(new TableMetadataResult await requestContext.SendResult(new TableMetadataResult
{ {
Columns = metadata Columns = metadata
}); });
} }
catch (Exception ex) catch (Exception ex)
@@ -176,13 +176,13 @@ namespace Microsoft.SqlTools.ServiceLayer.Metadata
@"SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type @"SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type
FROM sys.all_objects o FROM sys.all_objects o
INNER JOIN sys.schemas s ON o.schema_id = s.schema_id INNER JOIN sys.schemas s ON o.schema_id = s.schema_id
WHERE (o.[type] = 'P' OR o.[type] = 'V' OR o.[type] = 'U' OR o.[type] = 'AF' OR o.[type] = 'FN' OR o.[type] = 'IF') "; WHERE o.[type] IN ('P','V','U','AF','FN','IF','TF') ";
if (!IsSystemDatabase(sqlConn.Database)) if (!IsSystemDatabase(sqlConn.Database))
{ {
sql += @"AND o.is_ms_shipped != 1 "; sql += @"AND o.is_ms_shipped != 1 ";
} }
sql += @"ORDER BY object_type, schema_name, object_name"; sql += @"ORDER BY object_type, schema_name, object_name";
using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConn)) using (SqlCommand sqlCommand = new SqlCommand(sql, sqlConn))
@@ -207,7 +207,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Metadata
metadataType = MetadataType.SProc; metadataType = MetadataType.SProc;
metadataTypeName = "StoredProcedure"; metadataTypeName = "StoredProcedure";
} }
else if (objectType == "AF" || objectType == "FN" || objectType == "IF") else if (objectType == "AF" || objectType == "FN" || objectType == "IF" || objectType == "TF")
{ {
metadataType = MetadataType.Function; metadataType = MetadataType.Function;
metadataTypeName = "UserDefinedFunction"; metadataTypeName = "UserDefinedFunction";