Resolve merge conflicts in PR #197 (MSSQL connector)#3
Merged
Conversation
Resolved conflicts between PR unjs#197 (MSSQL connector) and upstream main: - Updated docker-compose.yaml to use port mappings for all services (pg, mysql, mssql) - Merged formatting changes in src/types.ts - Merged package.json dependency updates - Regenerated pnpm-lock.yaml to resolve merge conflicts - Applied tsconfig.json updates from upstream - Included all MSSQL connector files and tests Build and lint verified successfully. Co-authored-by: vkuttyp <146238+vkuttyp@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix conflicts in pull request #197
Resolve merge conflicts in PR #197 (MSSQL connector)
Feb 1, 2026
vkuttyp
approved these changes
Feb 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR unjs#197 adding MSSQL connector support conflicts with upstream
maindue to overlapping changes in docker-compose.yaml, dependency files, and type definitions.Changes
docker-compose.yaml
ports: ["1433:1433"]) to match upstream's migration fromnetwork_mode: "host"for postgres/mysqlpnpm-lock.yaml
src/types.ts
Other files
Notes
Code review identified pre-existing connection pooling issues in the MSSQL connector (closes connection after each request, no dispose method). These should be addressed in a follow-up PR focused on connector improvements.
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.