Skip to content

Commit 3923250

Browse files
kevcunnanekevcunnane
authored
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
1 parent b51608f commit 3923250

File tree

19 files changed

+5723
-5647
lines changed

19 files changed

+5723
-5647
lines changed

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,6 +2381,22 @@ public static string SystemVersioned_LabelPart
23812381
}
23822382
}
23832383

2384+
public static string External_LabelPart
2385+
{
2386+
get
2387+
{
2388+
return Keys.GetString(Keys.External_LabelPart);
2389+
}
2390+
}
2391+
2392+
public static string FileTable_LabelPart
2393+
{
2394+
get
2395+
{
2396+
return Keys.GetString(Keys.FileTable_LabelPart);
2397+
}
2398+
}
2399+
23842400
public static string DatabaseNotAccessible
23852401
{
23862402
get
@@ -4639,6 +4655,12 @@ public class Keys
46394655
public const string SystemVersioned_LabelPart = "SystemVersioned_LabelPart";
46404656

46414657

4658+
public const string External_LabelPart = "External_LabelPart";
4659+
4660+
4661+
public const string FileTable_LabelPart = "FileTable_LabelPart";
4662+
4663+
46424664
public const string DatabaseNotAccessible = "DatabaseNotAccessible";
46434665

46444666

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.de.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<data name="EE_ScriptError_Error"><value>Ein Skriptfehler ist aufgetreten.</value></data>
8888
<data name="EE_ScriptError_ParsingSyntax"><value>Ein Syntaxfehler ist aufgetreten der bei Analyse von {0}</value></data>
8989
<data name="EE_ScriptError_FatalError"><value>Ein schwerwiegender Fehler ist aufgetreten.</value></data>
90-
<data name="EE_ExecutionInfo_FinalizingLoop"><value>Die Ausführung wurde {0} Mal abgeschlossen...</value></data>
90+
<data name="EE_ExecutionInfo_FinalizingLoop"><value>{0}-mal ausgeführt...</value></data>
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Sie haben die Abfrage abgebrochen.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>Fehler während der Batchausführung.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>Fehler während der Batchausführung, aber des Fehlers wurde ignoriert.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>{0}-malige Batchausführung wurde gestartet.</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>Befehl {0} wird nicht unterstützt.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>Die Variable {0} konnte nicht gefunden werden.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Fehler bei der SQL-Ausführung: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<data name="EE_ScriptError_Error"><value>Se ha producido un error de secuencias de comandos.</value></data>
8888
<data name="EE_ScriptError_ParsingSyntax"><value>Se encontró sintaxis incorrecta mientras se estaba analizando {0}.</value></data>
8989
<data name="EE_ScriptError_FatalError"><value>Se ha producido un error grave.</value></data>
90-
<data name="EE_ExecutionInfo_FinalizingLoop"><value>La ejecución completó {0} veces...</value></data>
90+
<data name="EE_ExecutionInfo_FinalizingLoop"><value>La ejecución se completó {0} veces...</value></data>
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Se canceló la consulta.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>Se produjo un error mientras se ejecutaba el lote.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>Se produjo un error mientras se ejecutaba el lote, pero se ha omitido el error.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando bucle de ejecución de {0} veces...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>No se admite el comando {0}.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>La variable {0} no se encontró.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Error de ejecución de SQL: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.fr.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Vous avez annulé la requête.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>Une erreur s'est produite lors de l'exécution du lot.</value></data>
9393
<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>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>Démarrage de la boucle d'exécution pour {0} fois...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>La commande {0} n'est pas prise en charge.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>Impossible de trouver la variable {0}.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Erreur d’exécution de SQL : {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.it.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>È stata annullata la query.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>Si è verificato un errore durante l'esecuzione del batch.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>Si è verificato un errore durante l'esecuzione del batch, ma l'errore è stato ignorato.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>Avvio ciclo di esecuzione di {0} volte...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>Il comando {0} non è supportato.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>Impossibile trovare la variabile {0}.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Errore di esecuzione di SQL: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ja.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<data name="EE_ScriptError_Error"><value>スクリプト エラーが発生しました。</value></data>
8888
<data name="EE_ScriptError_ParsingSyntax"><value>{0} の解析中に不正な構文が見つかりました。</value></data>
8989
<data name="EE_ScriptError_FatalError"><value>致命的なエラーが発生しました。</value></data>
90-
<data name="EE_ExecutionInfo_FinalizingLoop"><value>{0} 回の実行が完了...</value></data>
90+
<data name="EE_ExecutionInfo_FinalizingLoop"><value>実行を {0} 回完了しました...</value></data>
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>クエリをキャンセルしました。</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>バッチの実行中にエラーが発生しました。</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>バッチの実行中にエラーが発生しましたが、エラーを無視しました。</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 回の実行ループを開始しています.</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>コマンド {0} はサポートされていません。</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>変数 {0} が見つかりませんでした。</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>SQL の実行エラー: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ko.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<data name="EE_ScriptError_Error"><value>스크립팅 오류가 발생 했습니다.</value></data>
8888
<data name="EE_ScriptError_ParsingSyntax"><value>{0}에 잘못된 구문이 발견되었습니다.</value></data>
8989
<data name="EE_ScriptError_FatalError"><value>치명적인 오류가 발생 했습니다.</value></data>
90-
<data name="EE_ExecutionInfo_FinalizingLoop"><value>실행 완료 {0} 회</value></data>
90+
<data name="EE_ExecutionInfo_FinalizingLoop"><value>{0}회 실행 완료...</value></data>
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>쿼리를 취소 했습니다.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>일괄 처리를 실행 하는 동안 오류가 발생 합니다.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>일괄 처리를 실행 하는 동안 오류가 발생했으나 그 오류는 무시되었습니다.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 번 루프 실행을 시작 하는 중...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>{0} 명령은 지원되지 않습니다.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>{0} 변수를 찾을 수 없습니다.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>SQL 실행 오류: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.pt-BR.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Você cancelou a consulta.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>Ocorreu um erro enquanto o lote estava sendo executado.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>Ocorreu um erro enquanto o lote estava sendo executado, mas o erro foi ignorado.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando a execução do loop {0} vezes...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>Comando {0} não é suportado.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>A variável {0} não pôde ser encontrada.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Erro de execução de SQL: {0}</value></data>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,6 +1378,14 @@
13781378
<value>System-Versioned</value>
13791379
<comment></comment>
13801380
</data>
1381+
<data name="External_LabelPart" xml:space="preserve">
1382+
<value>External</value>
1383+
<comment></comment>
1384+
</data>
1385+
<data name="FileTable_LabelPart" xml:space="preserve">
1386+
<value>File Table</value>
1387+
<comment></comment>
1388+
</data>
13811389
<data name="DatabaseNotAccessible" xml:space="preserve">
13821390
<value>The database {0} is not accessible.</value>
13831391
<comment></comment>

‎src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ru.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
<data name="EE_ScriptError_Error"><value>Произошла ошибка сценария.</value></data>
8888
<data name="EE_ScriptError_ParsingSyntax"><value>Обнаружен неправильный синтаксис при обработке {0}.</value></data>
8989
<data name="EE_ScriptError_FatalError"><value>Произошла неустранимая ошибка.</value></data>
90-
<data name="EE_ExecutionInfo_FinalizingLoop"><value>Выполнено {0} раз...</value></data>
90+
<data name="EE_ExecutionInfo_FinalizingLoop"><value>Выполнение завершено такое количество раз: {0}...</value></data>
9191
<data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Пользователь отменил запрос.</value></data>
9292
<data name="EE_BatchExecutionError_Halting"><value>При выполнении пакета произошла ошибка.</value></data>
9393
<data name="EE_BatchExecutionError_Ignoring"><value>В процессе выполнения пакета произошла ошибка, но она была проигнорирована.</value></data>
94-
<data name="EE_ExecutionInfo_InitializingLoop"><value>Начало цикла выполнения {0} раз...</value></data>
94+
<data name="EE_ExecutionInfo_InitializingLoop"><value>Beginning execution loop</value></data>
9595
<data name="EE_ExecutionError_CommandNotSupported"><value>Команда {0} не поддерживается.</value></data>
9696
<data name="EE_ExecutionError_VariableNotFound"><value>Переменная {0} не найдена.</value></data>
9797
<data name="BatchParserWrapperExecutionEngineError"><value>Ошибка выполнения SQL: {0}</value></data>

0 commit comments

Comments
 (0)