Fix uplevel SQL Server support and differentiate External and FileTable types in object explorer list (#567)

* Differentiate External and FileTable types in object explorer list - Add (External) and (File Table) to the labels - Pre-fetch these properties to avoid perf hit Note on testing: These are both quite hard to initialize, so adding tests to the integration tests would require always having a server with Polybase enabled / FileTable enabled. Given this I feel it should be OK to use manual testing. Long term, we should have unit-level tests that cover the functionality or figure out how to have a perfect pre-configured server and a set of tests to run the breadth of this logic against it. * Fix handling of vNext servers to default to latest known version - Default uplevel / unknown versions to the latest version - In the IsValidFor check also just see if the server version registers as "All" since this is the default for unknown servers. This is a backup handler, the 1st fix is the primary one
2026-01-14 01:25:40 -05:00 · 2017-12-08 17:52:49 -08:00
parent b51608f022
commit 392325036e
19 changed files with 5723 additions and 5647 deletions
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -2381,6 +2381,22 @@ namespace Microsoft.SqlTools.ServiceLayer
            }
        }

+        public static string External_LabelPart
+        {
+            get
+            {
+                return Keys.GetString(Keys.External_LabelPart);
+            }
+        }
+
+        public static string FileTable_LabelPart
+        {
+            get
+            {
+                return Keys.GetString(Keys.FileTable_LabelPart);
+            }
+        }
+
        public static string DatabaseNotAccessible
        {
            get
@@ -4639,6 +4655,12 @@ namespace Microsoft.SqlTools.ServiceLayer
            public const string SystemVersioned_LabelPart = "SystemVersioned_LabelPart";


+            public const string External_LabelPart = "External_LabelPart";
+
+
+            public const string FileTable_LabelPart = "FileTable_LabelPart";
+
+
            public const string DatabaseNotAccessible = "DatabaseNotAccessible";


--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.de.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.de.resx
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>Ein Skriptfehler ist aufgetreten.</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>Ein Syntaxfehler ist aufgetreten der bei Analyse von {0}</value></data>
  <data name="EE_ScriptError_FatalError"><value>Ein schwerwiegender Fehler ist aufgetreten.</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>Die Ausführung wurde {0} Mal abgeschlossen...</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>{0}-mal ausgeführt...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Sie haben die Abfrage abgebrochen.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Fehler während der Batchausführung.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Fehler während der Batchausführung, aber des Fehlers wurde ignoriert.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0}-malige Batchausführung wurde gestartet.</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Befehl {0} wird nicht unterstützt.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Die Variable {0} konnte nicht gefunden werden.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Fehler bei der SQL-Ausführung: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>Se ha producido un error de secuencias de comandos.</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>Se encontró sintaxis incorrecta mientras se estaba analizando {0}.</value></data>
  <data name="EE_ScriptError_FatalError"><value>Se ha producido un error grave.</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>La ejecución completó {0} veces...</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>La ejecución se completó {0} veces...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Se canceló la consulta.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Se produjo un error mientras se ejecutaba el lote.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Se produjo un error mientras se ejecutaba el lote, pero se ha omitido el error.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando bucle de ejecución de {0} veces...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>No se admite el comando {0}.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>La variable {0} no se encontró.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Error de ejecución de SQL: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.fr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.fr.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Vous avez annulé la requête.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Une erreur s'est produite lors de l'exécution du lot.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Une erreur s'est produite lors de l'exécution du lot, mais elle a été ignorée.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>Démarrage de la boucle d'exécution pour {0} fois...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>La commande {0} n'est pas prise en charge.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Impossible de trouver la variable {0}.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Erreur d’exécution de SQL : {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.it.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.it.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>È stata annullata la query.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Si è verificato un errore durante l'esecuzione del batch.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Si è verificato un errore durante l'esecuzione del batch, ma l'errore è stato ignorato.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>Avvio ciclo di esecuzione di {0} volte...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Il comando {0} non è supportato.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Impossibile trovare la variabile {0}.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Errore di esecuzione di SQL: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ja.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ja.resx
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>スクリプト エラーが発生しました。</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>{0} の解析中に不正な構文が見つかりました。</value></data>
  <data name="EE_ScriptError_FatalError"><value>致命的なエラーが発生しました。</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>{0} 回の実行が完了...</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>実行を {0} 回完了しました...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>クエリをキャンセルしました。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>バッチの実行中にエラーが発生しました。</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>バッチの実行中にエラーが発生しましたが、エラーを無視しました。</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 回の実行ループを開始しています.</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>コマンド {0} はサポートされていません。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>変数 {0} が見つかりませんでした。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL の実行エラー: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ko.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ko.resx
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>스크립팅 오류가 발생 했습니다.</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>{0}에 잘못된 구문이 발견되었습니다.</value></data>
  <data name="EE_ScriptError_FatalError"><value>치명적인 오류가 발생 했습니다.</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>실행 완료 {0} 회</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>{0}회 실행 완료...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>쿼리를 취소 했습니다.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>일괄 처리를 실행 하는 동안 오류가 발생 합니다.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>일괄 처리를 실행 하는 동안 오류가 발생했으나 그 오류는 무시되었습니다.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 번 루프 실행을 시작 하는 중...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>{0} 명령은 지원되지 않습니다.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>{0} 변수를 찾을 수 없습니다.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 실행 오류: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.pt-BR.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.pt-BR.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Você cancelou a consulta.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Ocorreu um erro enquanto o lote estava sendo executado.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Ocorreu um erro enquanto o lote estava sendo executado, mas o erro foi ignorado.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando a execução do loop {0} vezes...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Comando {0} não é suportado.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>A variável {0} não pôde ser encontrada.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Erro de execução de SQL: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
@@ -1378,6 +1378,14 @@
    <value>System-Versioned</value>
    <comment></comment>
  </data>
+  <data name="External_LabelPart" xml:space="preserve">
+    <value>External</value>
+    <comment></comment>
+  </data>
+  <data name="FileTable_LabelPart" xml:space="preserve">
+    <value>File Table</value>
+    <comment></comment>
+  </data>
  <data name="DatabaseNotAccessible" xml:space="preserve">
    <value>The database {0} is not accessible.</value>
    <comment></comment>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ru.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ru.resx
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>Произошла ошибка сценария.</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>Обнаружен неправильный синтаксис при обработке {0}.</value></data>
  <data name="EE_ScriptError_FatalError"><value>Произошла неустранимая ошибка.</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>Выполнено {0} раз...</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>Выполнение завершено такое количество раз: {0}...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Пользователь отменил запрос.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>При выполнении пакета произошла ошибка.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>В процессе выполнения пакета произошла ошибка, но она была проигнорирована.</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>Начало цикла выполнения {0} раз...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Команда {0} не поддерживается.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Переменная {0} не найдена.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Ошибка выполнения SQL: {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -684,6 +684,10 @@ History_LabelPart = History

 SystemVersioned_LabelPart = System-Versioned

+External_LabelPart = External
+
+FileTable_LabelPart = File Table
+
 DatabaseNotAccessible = The database {0} is not accessible.


--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -2343,6 +2343,16 @@
        <target state="new">Scripting as Execute is only supported for Stored Procedures</target>
        <note></note>
      </trans-unit>
+      <trans-unit id="External_LabelPart">
+        <source>External</source>
+        <target state="new">External</target>
+        <note></note>
+      </trans-unit>
+      <trans-unit id="FileTable_LabelPart">
+        <source>File Table</source>
+        <target state="new">File Table</target>
+        <note></note>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hans.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hans.resx
@@ -38,7 +38,7 @@
  <data name="ConnectionParamsValidateNullServerName"><value>ServerName 不能是 null 或是空白</value></data>
  <data name="ConnectionParamsValidateNullSqlAuth"><value>使用 SqlLogin 身份验证时，{0} 不可是 null 或是空</value></data>
  <data name="QueryServiceCancelAlreadyCompleted"><value>查询已完成，无法取消</value></data>
-  <data name="QueryServiceCancelDisposeFailed"><value>查询成功取消，无法处理查询。找不到的 URI 的所有者。</value></data>
+  <data name="QueryServiceCancelDisposeFailed"><value>查询成功取消，无法处理查询。找不到 URI 的所有者。</value></data>
  <data name="QueryServiceQueryCancelled"><value>查询已被用户取消</value></data>
  <data name="QueryServiceSubsetBatchNotCompleted"><value>该批处理尚未完成</value></data>
  <data name="QueryServiceSubsetBatchOutOfRange"><value>批量索引不能小于 0 或大于批量的总数</value></data>
@@ -87,11 +87,11 @@
  <data name="EE_ScriptError_Error"><value>出现脚本错误。</value></data>
  <data name="EE_ScriptError_ParsingSyntax"><value>正在分析 {0} 时发现语法错误。</value></data>
  <data name="EE_ScriptError_FatalError"><value>出现严重错误。</value></data>
-  <data name="EE_ExecutionInfo_FinalizingLoop"><value>执行已完成 {0} 次...</value></data>
+  <data name="EE_ExecutionInfo_FinalizingLoop"><value>已执行完 {0} 次...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>您已取消查询。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>执行批次处理时发生错误。</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>执行批次处理时发生错误，但该错误已被忽略。</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>正在开始执行循环的次数为 {0} 次...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>不支持命令 {0}。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>找不到变量 {0}。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 执行错误︰ {0}</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hant.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hant.resx
@@ -63,7 +63,7 @@
  <data name="QueryServiceSaveAsMiscStartingError"><value>在儲存工作啟動時，發生內部錯誤</value></data>
  <data name="QueryServiceSaveAsInProgress"><value>相同路徑的儲存要求正在進行中</value></data>
  <data name="QueryServiceSaveAsFail"><value>無法儲存 {0}: {1}</value></data>
-  <data name="QueryServiceResultSetNotRead"><value>無法讀取子集，除非已經從伺服器讀取結果</value></data>
+  <data name="QueryServiceResultSetNotRead"><value>從伺服器讀取結果前，無法讀取子集</value></data>
  <data name="QueryServiceResultSetStartRowOutOfRange"><value>開始資料列不能小於 0 或大於結果集中的資料列總數</value></data>
  <data name="QueryServiceResultSetRowCountOutOfRange"><value>資料列計數必須是正整數</value></data>
  <data name="QueryServiceResultSetNoColumnSchema"><value>無法從結果集擷取資料行結構描述</value></data>
@@ -79,8 +79,8 @@
  <data name="WorkspaceServicePositionColumnOutOfRange"><value>第 {0} 行位置超出資料行範圍</value></data>
  <data name="WorkspaceServiceBufferPositionOutOfOrder"><value>開始位置 （{0}，{1}） 必須先於或等於結束位置 （{2}，{3}）</value></data>
  <data name="EE_BatchSqlMessageNoProcedureInfo"><value>訊息 {0}，層級 {1} ，狀態 {2}，第 {3} 行</value></data>
-  <data name="EE_BatchSqlMessageWithProcedureInfo"><value>訊息 {0} 層級 {1} 狀態 {2} 程序 {3}、 第 {4} 行</value></data>
-  <data name="EE_BatchSqlMessageNoLineInfo"><value>Msg {0}，層級 {1} 狀態 {2}</value></data>
+  <data name="EE_BatchSqlMessageWithProcedureInfo"><value>訊息 {0} ，層級 {1}， 狀態 {2}， 程序 {3}，第 {4} 行</value></data>
+  <data name="EE_BatchSqlMessageNoLineInfo"><value>訊息 {0}，層級 {1} ，狀態 {2}</value></data>
  <data name="EE_BatchError_Exception"><value>處理批次時，發生錯誤。錯誤訊息是︰ {0}</value></data>
  <data name="EE_BatchExecutionInfo_RowsAffected"><value>（{0} 個資料列受到影響）</value></data>
  <data name="EE_ExecutionNotYetCompleteError"><value>前一個執行尚未完成。</value></data>
@@ -90,8 +90,8 @@
  <data name="EE_ExecutionInfo_FinalizingLoop"><value>已執行完成 {0} 次...</value></data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>您已取消查詢。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>執行此批次時發生錯誤。</value></data>
-  <data name="EE_BatchExecutionError_Ignoring"><value>執行批次，但被忽略的錯誤時，就會發生錯誤。</value></data>
-  <data name="EE_ExecutionInfo_InitializingLoop"><value>正在啟動 {0} 次執行迴圈...</value></data>
+  <data name="EE_BatchExecutionError_Ignoring"><value>執行此批次時發生錯誤，但錯誤以忽略。</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>不支援命令 {0}。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>找不到變數 {0}。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 執行錯誤︰ {0}</value></data>
@@ -102,9 +102,9 @@
  <data name="BatchParserWrapperExecutionEngineBatchCancelling"><value>正在取消批次剖析器包裝函式的批次執行。</value></data>
  <data name="EE_ScriptError_Warning"><value>指令碼警告。</value></data>
  <data name="TroubleshootingAssistanceMessage"><value>有關此錯誤的詳細資訊，請參閱產品文件中的疑難排解主題。</value></data>
-  <data name="BatchParser_CircularReference"><value>檔案 '{0}' 被遞迴方式包含。</value></data>
+  <data name="BatchParser_CircularReference"><value>檔案 '{0}' 具有遞迴。</value></data>
  <data name="BatchParser_CommentNotTerminated"><value>遺漏結束的註解記號 ' * /'。</value></data>
-  <data name="BatchParser_StringNotTerminated"><value>未封閉的雙引號記號之後的字元字串。</value></data>
+  <data name="BatchParser_StringNotTerminated"><value>字元字串後有未封閉的雙引號</value></data>
  <data name="BatchParser_IncorrectSyntax"><value>正在剖析 {0} 時遇到不正確的語法。</value></data>
  <data name="BatchParser_VariableNotDefined"><value>未定義變數 {0}。</value></data>
  <data name="TestLocalizationConstant"><value>測試</value></data>
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.cs
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTableCustomNode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTableCustomNode.cs
@@ -21,6 +21,14 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
                {
                    return $"{table.Schema}.{table.Name} ({SR.SystemVersioned_LabelPart})";
                }
+                else if (table != null && IsPropertySupported("IsExternal", smoContext, table, CachedSmoProperties) && table.IsExternal)
+                {
+                    return $"{table.Schema}.{table.Name} ({SR.External_LabelPart})"; 
+                }
+                else if (table != null && IsPropertySupported("IsFileTable", smoContext, table, CachedSmoProperties) && table.IsFileTable)
+                {
+                    return $"{table.Schema}.{table.Name} ({SR.FileTable_LabelPart})"; 
+                }
            }
            catch
            {
@@ -39,6 +47,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
                {
                    return "Temporal";
                }
+                // TODO carbon issue 3125 enable "External" subtype once icon is ready. Otherwise will get missing icon here.
+                // else if (table != null && IsPropertySupported("IsExternal", smoContext, table, CachedSmoProperties) && table.IsExternal)
+                // {
+                //     return "External";
+                // }
               // return string.Empty;

            }
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeDefinition.xml
@@ -79,8 +79,10 @@
      </Filter>
    </Filters>
    <Properties>
+      <Property Name="IsFileTable" ValidFor="Sql2012|Sql2014|Sql2016|Sql2017"/>
      <Property Name="IsSystemVersioned" ValidFor="Sql2016|Sql2017|AzureV12"/>
 	    <Property Name="TemporalType" ValidFor="Sql2016|Sql2017|AzureV12"/>
+      <Property Name="IsExternal" ValidFor="Sql2016|Sql2017|AzureV12"/>
    </Properties>
    <Child Name="SystemTables" IsSystemObject="1"/>
  </Node>
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/TreeNodeGenerator.cs
--- a/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SqlServerType.cs
@@ -45,7 +45,9 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
        /// <returns></returns>
        public static bool IsValidFor(ValidForFlag serverVersion, ValidForFlag validFor)
        {
-            return validFor == ValidForFlag.None || validFor.HasFlag(serverVersion);
+            // If either the flag is not set or if the serverVersion has a default value of "all", allow the check
+            // Otherwise, actually do the comparison of the flags
+            return validFor == ValidForFlag.None || serverVersion == ValidForFlag.All || validFor.HasFlag(serverVersion);
        }

        /// <summary>
@@ -108,6 +110,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer
                {
                    serverType = SqlServerType.Sql2017;
                }
+                else
+                {
+                    // vNext case - default to latest version
+                    serverType = SqlServerType.Sql2017;
+                }
            }

            return serverType;