Support special casing with Fabric endpoints #3084

ErikEJ · 2024-12-17T06:55:30Z

Support the special casing for Fabric endpoints

codecov · 2024-12-17T08:07:55Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.88%. Comparing base (b8e0c9f) to head (4c73ef8).
Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3084      +/-   ##
==========================================
+ Coverage   72.70%   72.88%   +0.18%     
==========================================
  Files         283      283              
  Lines       58975    58978       +3     
==========================================
+ Hits        42875    42984     +109     
+ Misses      16100    15994     -106

Flag	Coverage Δ
addons	`92.58% <ø> (ø)`
netcore	`75.58% <100.00%> (+0.07%)`	⬆️
netfx	`71.33% <100.00%> (+0.19%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

edwardneal

Only one comment on the code style, but the checks themselves are correct.

I think there are a handful of feature differences between Azure SQL and Fabric SQL which merit a test suite and documentation updates though. At a glance, the driver would be impacted by the lack of support for Always Encrypted and the BULK INSERT statement.

edwardneal · 2024-12-17T17:52:16Z

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

        }

        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)};
+                                                                        StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint),
+                                                                        ".database.fabric.microsoft.com"};


Perhaps this should be a resource string?

Yeah, wonder why the other ones are resource strings, I guess they are not localized ?

They are included in the resource files, but not localized, so seems unnecessary to add them to resource files.

Ok, so no need to localize any of them??

Yes, please move them to constants.

I would also like to see these move to constants.

ErikEJ · 2024-12-17T18:20:08Z

@edwardneal There are a number of feature differences between the many engine variations this driver supports or happen to work with - is it really the responsibility of the driver to document this, or is the page you are linking to not enough?

edwardneal · 2024-12-17T18:37:42Z

I think the page I linked to would cover most cases, I'm thinking primarily about a once-over to make sure that the SqlClient documentation doesn't contradict it and is clear enough for people to understand what functionality the feature depends upon. The example I had in mind was SqlBulkCopy - it might not be obvious that the lack of BULK INSERT support blocks this feature. I think that's probably the root cause of #2995.

ErikEJ · 2024-12-17T18:40:50Z

#2995 refers to Fabric warehouse, which is something completely different from Fabric SQL Database

edwardneal · 2024-12-19T20:53:43Z

Sorry, slightly delayed here!

You're right, but the root cause is similar: some of SqlClient's functionality can't be supported on a particular engine variation, because that functionality relies upon a feature the engine doesn't support (in this case, SqlBulkCopy relies upon the BULK INSERT statement, which neither Fabric Warehouse nor Fabric SQL Database support.)

My broader point is that we should make sure that the SqlClient documentation for functionality which depends on BULK INSERT or Always Encrypted doesn't claim to be compatible across all engine variations, and that specifically for SqlBulkCopy we should make it clear that the feature depends upon server-side BULK INSERT support (since that's hard to discover in the documentation, and without that insight it's hard to know what won't support the feature.) If you want to keep this PR scoped specifically to the endpoint detection, I'm happy enough to check that documentation in a separate PR.

ErikEJ · 2024-12-19T20:59:22Z

Sounds to me like a separate issue and PR would be suitable to prevent scope creep.

ErikEJ · 2025-02-27T19:19:52Z

@mdaigle any thoughts on this?

cheenamalhotra · 2025-03-06T20:07:06Z

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

-            return IsEndpoint(dataSource, ONDEMAND_PREFIX) || dataSource.Contains(AZURE_SYNAPSE);
+            return IsEndpoint(dataSource, ONDEMAND_PREFIX) 
+                || dataSource.Contains(AZURE_SYNAPSE)
+                || dataSource.Contains(FABRIC_DATAWAREHOUSE);
        }

        internal static readonly string[] s_azureSqlServerEndpoints = { StringsHelper.GetString(Strings.AZURESQL_GenericEndpoint),


There are quite a few endpoints we could add here, e.g. https://learn.microsoft.com/en-us/fabric/security/fabric-allow-list-urls#data-warehouse and yes, they need not be localized.

I will look into that.

@cheenamalhotra Are all the 7 endpoint listed in your link similar to Synapse serverless??

Remove localization

mdaigle

Thanks for cleaning up the resource files!
I just have two small requests.

mdaigle · 2025-03-10T16:47:25Z

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

        }

        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)};
+                                                                        StringsHelper.GetString(Strings.AZURESQL_ChinaEndpoint),
+                                                                        ".database.fabric.microsoft.com"};


I would also like to see these move to constants.

mdaigle · 2025-03-10T16:52:10Z

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -853,6 +853,7 @@
    <Compile Include="$(CommonSourceRoot)System\IO\StreamExtensions.netfx.cs">
      <Link>System\IO\StreamExtensions.netfx.cs</Link>
    </Compile>
+    <Compile Include="..\..\src\Resources\Strings.Designer.cs" />


This should already be included for compilation a little further down in the file.

Ups, unintended

edwardneal reviewed Dec 17, 2024

View reviewed changes

mdaigle added this to the 7.0-preview1 milestone Jan 7, 2025

mdaigle requested a review from a team January 7, 2025 18:21

cheenamalhotra reviewed Mar 6, 2025

View reviewed changes

ErikEJ and others added 2 commits March 7, 2025 07:10

Support special casing with Fabric endpoints

05fb45f

Ad more endpoints

5d127e0

Remove localization

ErikEJ force-pushed the az-endpoints branch from 4c73ef8 to 5d127e0 Compare March 7, 2025 09:20

mdaigle requested changes Mar 10, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support special casing with Fabric endpoints #3084

Support special casing with Fabric endpoints #3084

ErikEJ commented Dec 17, 2024

codecov bot commented Dec 17, 2024 •

edited

Loading

edwardneal left a comment

edwardneal Dec 17, 2024

ErikEJ Dec 17, 2024

cheenamalhotra Mar 6, 2025

ErikEJ Mar 6, 2025

cheenamalhotra Mar 7, 2025

mdaigle Mar 10, 2025

ErikEJ commented Dec 17, 2024

edwardneal commented Dec 17, 2024

ErikEJ commented Dec 17, 2024

edwardneal commented Dec 19, 2024

ErikEJ commented Dec 19, 2024

ErikEJ commented Feb 27, 2025

cheenamalhotra Mar 6, 2025

ErikEJ Mar 6, 2025

ErikEJ Mar 7, 2025

mdaigle left a comment

mdaigle Mar 10, 2025

mdaigle Mar 10, 2025

ErikEJ Mar 10, 2025

Support special casing with Fabric endpoints #3084

Are you sure you want to change the base?

Support special casing with Fabric endpoints #3084

Conversation

ErikEJ commented Dec 17, 2024

codecov bot commented Dec 17, 2024 • edited Loading

Codecov Report

edwardneal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ErikEJ commented Dec 17, 2024

edwardneal commented Dec 17, 2024

ErikEJ commented Dec 17, 2024

edwardneal commented Dec 19, 2024

ErikEJ commented Dec 19, 2024

ErikEJ commented Feb 27, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mdaigle left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Dec 17, 2024 •

edited

Loading