Skip to content

Support special casing with Fabric endpoints #3084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 21, 2025
Merged

Support special casing with Fabric endpoints #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c64b9e
Support special casing with Fabric endpoints
ErikEJ Dec 17, 2024
4cd0183
Ad more endpoints
ErikEJ Mar 7, 2025
8a8eb34
Address PR feddback
ErikEJ Mar 20, 2025
a343d19
fix res
ErikEJ Mar 20, 2025
84c3588
revert Strings.Designer.cs changes
ErikEJ Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,6 +1872,7 @@
<item>.database.usgovcloudapi.net</item>
<item>.database.cloudapi.de</item>
<item>.database.windows.net</item>
<item>.database.fabric.microsoft.com</item>
</list>
</item>
<item><c>Authentication</c> is one of the 'Active Directory' authentication types.</item>
Expand Down
1 change: 1 addition & 0 deletions doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,7 @@
<item>.database.usgovcloudapi.net</item>
<item>.database.cloudapi.de</item>
<item>.database.windows.net</item>
<item>.database.fabric.microsoft.com</item>
</list>
</item>
<item>
Expand Down
25 changes: 20 additions & 5 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,16 +750,31 @@ internal static Version GetAssemblyVersion()

private const string ONDEMAND_PREFIX = "-ondemand";
private const string AZURE_SYNAPSE = "-ondemand.sql.azuresynapse.";
private const string FABRIC_DATAWAREHOUSE = "datawarehouse.fabric.microsoft.com";
private const string PBI_DATAWAREHOUSE = "datawarehouse.pbidedicated.microsoft.com";
private const string PBI_DATAWAREHOUSE2 = ".pbidedicated.microsoft.com";
private const string PBI_DATAWAREHOUSE3 = ".pbidedicated.windows.net";
private const string AZURE_SQL = ".database.windows.net";
private const string AZURE_SQL_GERMANY = ".database.cloudapi.de";
private const string AZURE_SQL_USGOV = ".database.usgovcloudapi.net";
private const string AZURE_SQL_CHINA = ".database.chinacloudapi.cn";
private const string AZURE_SQL_FABRIC = ".database.fabric.microsoft.com";

internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
{
return IsEndpoint(dataSource, ONDEMAND_PREFIX) || dataSource.Contains(AZURE_SYNAPSE);
return IsEndpoint(dataSource, ONDEMAND_PREFIX)
|| dataSource.Contains(AZURE_SYNAPSE)
|| dataSource.Contains(FABRIC_DATAWAREHOUSE)
|| dataSource.Contains(PBI_DATAWAREHOUSE)
|| dataSource.Contains(PBI_DATAWAREHOUSE2)
|| dataSource.Contains(PBI_DATAWAREHOUSE3);
}

internal static readonly string[] s_azureSqlServerEndpoints = { StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint),
StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint),
StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint),
StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint)};
internal static readonly string[] s_azureSqlServerEndpoints = { AZURE_SQL,
AZURE_SQL_GERMANY,
AZURE_SQL_USGOV,
AZURE_SQL_CHINA,
AZURE_SQL_FABRIC };

internal static bool IsAzureSqlServerEndpoint(string dataSource)
{
Expand Down
37 changes: 1 addition & 36 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 4 additions & 16 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>Neshodné typy SourceColumn {0} z(e) {1} a DataColumn {2} z(e) {3} nelze převést.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>V objektu DataTable {1} pro vlastnost SourceColumn {2} chybí objekt DataColumn {0}.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>Definuje chování v období blokování pro fond připojení.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>Definuje, zda je povolené ukládání metadat dotazu do mezipaměti.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>Byla překročena maximální velikost vyrovnávací paměti: {0}</value>
</data>
</root>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
</data>
</root>
20 changes: 4 additions & 16 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>Nicht konvertierbarer Typenkonflikt zwischen SourceColumn '{0}' von {1} und DataColumn '{2}' von {3}.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>DataColumn '{0}' in der DataTable '{1}' für SourceColumn '{2}' ist nicht vorhanden.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>Definiert das Verhalten im Blockierungszeitraum für einen Verbindungspool.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>Definiert, ob das Zwischenspeichern von Abfragemetadaten aktiviert ist.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>Maximale Puffergröße überschritten: {0}</value>
</data>
</root>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
</data>
</root>
18 changes: 3 additions & 15 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>Falta de coincidencia entre los tipos que no se pueden convertir SourceColumn '{0}' de {1} y DataColumn '{2}' de {3}.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>Falta DataColumn '{0}' en DataTable '{1}' para SourceColumn '{2}'.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>Define el comportamiento del período de bloqueo para un grupo de conexiones.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>Define si está habilitado el almacenamiento en caché de los metadatos de consulta.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>Se ha superado el tamaño máximo del búfer: {0}</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
</data>
</root>
18 changes: 3 additions & 15 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>Incompatibilité de type ne pouvant pas être converti entre SourceColumn '{0}' de {1} et DataColumn '{2}' de {3}.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>DataColumn '{0}' manquant dans DataTable '{1}' pour SourceColumn '{2}'.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>Définit le comportement de la période de blocage pour un pool de connexions.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>Définit si la mise en cache des métadonnées de requête est activée.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>Taille maximale de la mémoire tampon dépassée : {0}</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
</data>
</root>
18 changes: 3 additions & 15 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>Impossibile eseguire la conversione. Il tipo della proprietà SourceColumn "{0}" di {1} non corrisponde a quello della proprietà DataColumn "{2}" di {3}.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>DataColumn '{0}' mancante nella DataTable '{1}' per la SourceColumn '{2}'.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>Consente di definire il comportamento del periodo di blocco per un pool di connessioni.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>Consente di definire se la memorizzazione nella cache dei metadati della query è abilitata.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>Superata la dimensione massima del buffer: {0}</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
</data>
</root>
18 changes: 3 additions & 15 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>SourceColumn '{1}' の '{0}' と {3} の DataColumn '{2}' の間に変換不可能な型の不一致があります。</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>SourceColumn '{2}' の DataTable '{1}' に DataColumn '{0}' が見つかりません。</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>接続プールのためのブロック期間ビヘイビアーを定義します。</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>クエリ メタデータ キャッシュが有効であるかどうかを定義します。</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>バッファーの最大サイズを超えました: {0}</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
</data>
</root>
18 changes: 3 additions & 15 deletions src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,9 +1845,6 @@
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
<value>{1}의 SourceColumn '{0}'과(와) {3}의 DataColumn '{2}'의 유형이 일치하지 않습니다.</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>SourceColumn '{2}'에 DataColumn '{0}'이(가) 없습니다.</value>
</data>
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
<value>SourceColumn '{2}'의 DataTable '{1}'에 DataColumn '{0}'이(가) 없습니다.</value>
</data>
Expand Down Expand Up @@ -4446,18 +4443,6 @@
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
<value>연결 풀에 대한 차단 기간 동작을 정의합니다.</value>
</data>
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
<value>.database.windows.net</value>
</data>
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
<value>.database.cloudapi.de</value>
</data>
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
<value>.database.usgovcloudapi.net</value>
</data>
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
<value>쿼리 메타데이터 캐싱을 사용하는지를 정의합니다.</value>
</data>
Expand Down Expand Up @@ -4752,4 +4737,7 @@
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
<value>버퍼 최대 크기 초과: {0}</value>
</data>
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
<value>SourceColumn '{2}'에 DataColumn '{0}'이(가) 없습니다.</value>
</data>
</root>
Loading