Skip to content

Merge | DbConnectionOptions Prep Work #3343

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.

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 13 commits into from
May 29, 2025

Conversation

benrr101
Copy link
Contributor

Description: This one does some misc work before merging the netfx and netcore DbConnectionOptions partials into the existing DbConnectionOptions class. I could probably just merge it all together in one PR, but it feels like this should be its own PR.

  • Rename DbConnectionOptions.Common to DbConnectionOptions
  • Rename platform specific DbConnectionOptions partials to DbConnectionOptions.[netfx|netcore]
  • Move DbConnectionOptions (and partials) to the ConnectionString namespace
  • Separate debug code in DbConnectionOptions into its own partial
  • Remove the KEY and SYNONYM internal static classes from the DbConnectionOptions and replace them with usages of DbConnectionKeywords and DbConnectionSynonyms

Testing: Everything still builds and should pass tests

@benrr101 benrr101 added this to the 6.1-preview2 milestone May 12, 2025
@benrr101 benrr101 requested a review from a team May 12, 2025 16:43
@benrr101 benrr101 added the Common Project 🚮 Things that relate to the common project project label May 12, 2025
Copy link

codecov bot commented May 12, 2025

Codecov Report

Attention: Patch coverage is 68.57143% with 11 lines in your changes missing coverage. Please review.

Project coverage is 64.46%. Comparing base (1eabf80) to head (62f2e4d).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
...mmon/ConnectionString/DbConnectionOptions.Debug.cs 0.00% 8 Missing ⚠️
...ata/Common/ConnectionString/DbConnectionOptions.cs 90.47% 2 Missing ⚠️
...mmon/ConnectionString/DbConnectionOptions.netfx.cs 83.33% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3343      +/-   ##
==========================================
- Coverage   64.47%   64.46%   -0.02%     
==========================================
  Files         298      299       +1     
  Lines       65525    65525              
==========================================
- Hits        42248    42239       -9     
- Misses      23277    23286       +9     
Flag Coverage Δ
addons 92.58% <ø> (ø)
netcore 68.54% <65.51%> (+0.03%) ⬆️
netfx 65.31% <68.57%> (-0.06%) ⬇️

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.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

paulmedynski
paulmedynski previously approved these changes May 12, 2025
@benrr101 benrr101 force-pushed the dev/russellben/merge/dbconnectionoptions-debug branch from 485976b to d6b1244 Compare May 12, 2025 22:31
@benrr101 benrr101 requested review from mdaigle and paulmedynski May 16, 2025 18:19
mdaigle
mdaigle previously approved these changes May 16, 2025
paulmedynski
paulmedynski previously approved these changes May 22, 2025
# Conflicts:
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPool.cs
#	src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/DbConnectionPoolGroup.cs
@benrr101 benrr101 merged commit 072f318 into main May 29, 2025
251 checks passed
@benrr101 benrr101 deleted the dev/russellben/merge/dbconnectionoptions-debug branch May 29, 2025 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Common Project 🚮 Things that relate to the common project project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants