Skip to content

Commit 172f62f

Browse files
ErikEJErikEJ
authored
Support special casing with Fabric endpoints (#3084)
* Support special casing with Fabric endpoints * Ad more endpoints * Remove localization * Address PR feddback * fix res * revert Strings.Designer.cs changes
1 parent 33083f3 commit 172f62f

File tree

20 files changed

+80
-256
lines changed

20 files changed

+80
-256
lines changed

‎doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,6 +1872,7 @@
18721872
<item>.database.usgovcloudapi.net</item>
18731873
<item>.database.cloudapi.de</item>
18741874
<item>.database.windows.net</item>
1875+
<item>.database.fabric.microsoft.com</item>
18751876
</list>
18761877
</item>
18771878
<item><c>Authentication</c> is one of the 'Active Directory' authentication types.</item>

‎doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,7 @@
16381638
<item>.database.usgovcloudapi.net</item>
16391639
<item>.database.cloudapi.de</item>
16401640
<item>.database.windows.net</item>
1641+
<item>.database.fabric.microsoft.com</item>
16411642
</list>
16421643
</item>
16431644
<item>

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -750,16 +750,31 @@ internal static Version GetAssemblyVersion()
750750

751751
private const string ONDEMAND_PREFIX = "-ondemand";
752752
private const string AZURE_SYNAPSE = "-ondemand.sql.azuresynapse.";
753+
private const string FABRIC_DATAWAREHOUSE = "datawarehouse.fabric.microsoft.com";
754+
private const string PBI_DATAWAREHOUSE = "datawarehouse.pbidedicated.microsoft.com";
755+
private const string PBI_DATAWAREHOUSE2 = ".pbidedicated.microsoft.com";
756+
private const string PBI_DATAWAREHOUSE3 = ".pbidedicated.windows.net";
757+
private const string AZURE_SQL = ".database.windows.net";
758+
private const string AZURE_SQL_GERMANY = ".database.cloudapi.de";
759+
private const string AZURE_SQL_USGOV = ".database.usgovcloudapi.net";
760+
private const string AZURE_SQL_CHINA = ".database.chinacloudapi.cn";
761+
private const string AZURE_SQL_FABRIC = ".database.fabric.microsoft.com";
753762

754763
internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
755764
{
756-
return IsEndpoint(dataSource, ONDEMAND_PREFIX) || dataSource.Contains(AZURE_SYNAPSE);
765+
return IsEndpoint(dataSource, ONDEMAND_PREFIX)
766+
|| dataSource.Contains(AZURE_SYNAPSE)
767+
|| dataSource.Contains(FABRIC_DATAWAREHOUSE)
768+
|| dataSource.Contains(PBI_DATAWAREHOUSE)
769+
|| dataSource.Contains(PBI_DATAWAREHOUSE2)
770+
|| dataSource.Contains(PBI_DATAWAREHOUSE3);
757771
}
758772

759-
internal static readonly string[] s_azureSqlServerEndpoints = { StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint),
760-
StringsHelper.GetString(Strings.AZURESQL_GermanEndpoint),
761-
StringsHelper.GetString(Strings.AZURESQL_UsGovEndpoint),
762-
StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint)};
773+
internal static readonly string[] s_azureSqlServerEndpoints = { AZURE_SQL,
774+
AZURE_SQL_GERMANY,
775+
AZURE_SQL_USGOV,
776+
AZURE_SQL_CHINA,
777+
AZURE_SQL_FABRIC };
763778

764779
internal static bool IsAzureSqlServerEndpoint(string dataSource)
765780
{

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs

Lines changed: 1 addition & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.cs.resx

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>Neshodné typy SourceColumn {0} z(e) {1} a DataColumn {2} z(e) {3} nelze převést.</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>V objektu DataTable {1} pro vlastnost SourceColumn {2} chybí objekt DataColumn {0}.</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>Definuje chování v období blokování pro fond připojení.</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>Definuje, zda je povolené ukládání metadat dotazu do mezipaměti.</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>Byla překročena maximální velikost vyrovnávací paměti: {0}</value>
47544739
</data>
4755-
</root>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>Nebyl nalezen objekt DataColumn {0} pro SourceColumn {2}.</value>
4742+
</data>
4743+
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>Nicht konvertierbarer Typenkonflikt zwischen SourceColumn '{0}' von {1} und DataColumn '{2}' von {3}.</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>DataColumn '{0}' in der DataTable '{1}' für SourceColumn '{2}' ist nicht vorhanden.</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>Definiert das Verhalten im Blockierungszeitraum für einen Verbindungspool.</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>Definiert, ob das Zwischenspeichern von Abfragemetadaten aktiviert ist.</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>Maximale Puffergröße überschritten: {0}</value>
47544739
</data>
4755-
</root>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>DataColumn '{0}' für SourceColumn '{2}' ist nicht vorhanden.</value>
4742+
</data>
4743+
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>Falta de coincidencia entre los tipos que no se pueden convertir SourceColumn '{0}' de {1} y DataColumn '{2}' de {3}.</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>Falta DataColumn '{0}' en DataTable '{1}' para SourceColumn '{2}'.</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>Define el comportamiento del período de bloqueo para un grupo de conexiones.</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>Define si está habilitado el almacenamiento en caché de los metadatos de consulta.</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>Se ha superado el tamaño máximo del búfer: {0}</value>
47544739
</data>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>Falta DataColumn '{0}' para SourceColumn '{2}'.</value>
4742+
</data>
47554743
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>Incompatibilité de type ne pouvant pas être converti entre SourceColumn '{0}' de {1} et DataColumn '{2}' de {3}.</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>DataColumn '{0}' manquant dans DataTable '{1}' pour SourceColumn '{2}'.</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>Définit le comportement de la période de blocage pour un pool de connexions.</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>Définit si la mise en cache des métadonnées de requête est activée.</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>Taille maximale de la mémoire tampon dépassée : {0}</value>
47544739
</data>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>DataColumn '{0}' manquant pour SourceColumn '{2}'.</value>
4742+
</data>
47554743
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>Impossibile eseguire la conversione. Il tipo della proprietà SourceColumn "{0}" di {1} non corrisponde a quello della proprietà DataColumn "{2}" di {3}.</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>DataColumn '{0}' mancante nella DataTable '{1}' per la SourceColumn '{2}'.</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>Consente di definire il comportamento del periodo di blocco per un pool di connessioni.</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>Consente di definire se la memorizzazione nella cache dei metadati della query è abilitata.</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>Superata la dimensione massima del buffer: {0}</value>
47544739
</data>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>DataColumn '{0}' mancante per la SourceColumn '{2}'.</value>
4742+
</data>
47554743
</root>

‎src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,9 +1845,6 @@
18451845
<data name="ADP_ColumnSchemaMismatch" xml:space="preserve">
18461846
<value>SourceColumn '{1}' の '{0}' と {3} の DataColumn '{2}' の間に変換不可能な型の不一致があります。</value>
18471847
</data>
1848-
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
1849-
<value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
1850-
</data>
18511848
<data name="ADP_ColumnSchemaMissing2" xml:space="preserve">
18521849
<value>SourceColumn '{2}' の DataTable '{1}' に DataColumn '{0}' が見つかりません。</value>
18531850
</data>
@@ -4446,18 +4443,6 @@
44464443
<data name="DbConnectionString_PoolBlockingPeriod" xml:space="preserve">
44474444
<value>接続プールのためのブロック期間ビヘイビアーを定義します。</value>
44484445
</data>
4449-
<data name="AZURESQL_GenericEndpoint" xml:space="preserve">
4450-
<value>.database.windows.net</value>
4451-
</data>
4452-
<data name="AZURESQL_GermanEndpoint" xml:space="preserve">
4453-
<value>.database.cloudapi.de</value>
4454-
</data>
4455-
<data name="AZURESQL_UsGovEndpoint" xml:space="preserve">
4456-
<value>.database.usgovcloudapi.net</value>
4457-
</data>
4458-
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
4459-
<value>.database.chinacloudapi.cn</value>
4460-
</data>
44614446
<data name="TCE_SqlConnection_ColumnEncryptionQueryMetadataCacheEnabled" xml:space="preserve">
44624447
<value>クエリ メタデータ キャッシュが有効であるかどうかを定義します。</value>
44634448
</data>
@@ -4752,4 +4737,7 @@
47524737
<data name="ArrayBufferWriterMaximumSizeExceeded" xml:space="preserve">
47534738
<value>バッファーの最大サイズを超えました: {0}</value>
47544739
</data>
4740+
<data name="ADP_ColumnSchemaMissing1" xml:space="preserve">
4741+
<value>SourceColumn '{2}' の DataColumn '{0}' が見つかりません。</value>
4742+
</data>
47554743
</root>

0 commit comments

Comments
 (0)