Skip to content

Conversation

@Lupennat
Copy link
Contributor

The pull request enables support for the poolCluster's restoreNodeTimeout option, which should resolve the issue #2315.

@wellwelwel wellwelwel added the mysqljs/mysql incompatibilities Previously: feligxe-mysql-incompatibilities label Nov 18, 2024
@codecov
Copy link

codecov bot commented Nov 18, 2024

Codecov Report

Attention: Patch coverage is 97.74436% with 3 lines in your changes missing coverage. Please review.

Project coverage is 88.45%. Comparing base (e8fdad7) to head (df0b318).
Report is 25 commits behind head on master.

Files with missing lines Patch % Lines
lib/pool_cluster.js 97.70% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3218      +/-   ##
==========================================
+ Coverage   87.99%   88.45%   +0.45%     
==========================================
  Files          83       83              
  Lines       12985    13067      +82     
  Branches     1366     1392      +26     
==========================================
+ Hits        11426    11558     +132     
+ Misses       1559     1509      -50     
Flag Coverage Δ
compression-0 87.84% <97.74%> (-0.15%) ⬇️
compression-1 88.21% <97.74%> (+0.22%) ⬆️
tls-0 87.84% <97.74%> (?)
tls-1 88.02% <97.74%> (+0.02%) ⬆️

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.

@wellwelwel
Copy link
Collaborator

Thanks, @Lupennat! I consider this to be a feat: rather than a fix:, since it's a new feature for MySQL2. What do you think? 🤝

I noticed that a test was changed (test/unit/pool-cluster/test-restore.test.cjs) for this new feature. December is usually a bit of a rush, but as soon as possible, to avoid an unexpected breaking change, I'd just like to run a few local tests before merging 🙋🏻‍♂️

@wellwelwel wellwelwel linked an issue Dec 3, 2024 that may be closed by this pull request
@Lupennat
Copy link
Contributor Author

Lupennat commented Dec 3, 2024

I initially thought it was a fix, as the implementation was incomplete. However, I don't see any issues with identifying it as a feat. Please let me know if I need to make any changes to the pull request.
I've added new tests and modified what you pointed out, as this comment was present in the test.

// TODO: RestoreNodeTimeout is currently unsupported.

Most of the tests are simply porting the existing ones from the mysql project.
I have performed the tests locally and I have not noticed any problems, however I await your feedback in case there is anything else to add/modify.

@wellwelwel
Copy link
Collaborator

Thanks for clarifying 🙋🏻‍♂️

I've looked at the node-mysql implementation and it looks good to me 🤝

@wellwelwel wellwelwel changed the title fix(PoolCluster): implemented restoreNodeTimeout feat(PoolCluster): implemented restoreNodeTimeout Dec 4, 2024
@wellwelwel wellwelwel changed the title feat(PoolCluster): implemented restoreNodeTimeout feat(PoolCluster): implemented restoreNodeTimeout Dec 4, 2024
@wellwelwel wellwelwel merged commit 9a38601 into sidorares:master Dec 4, 2024
78 checks passed
@Lupennat Lupennat deleted the fix/pool-cluster-restore branch January 21, 2025 20:38
mergify bot added a commit to reisene/HulajDusza-serwis that referenced this pull request Jan 23, 2025
![snyk-io[bot]](https://badgen.net/badge/icon/snyk-io%5Bbot%5D/green?label=)
[<img width="16" alt="Powered by Pull Request Badge"
src="https://user-images.githubusercontent.com/1393946/111216524-d2bb8e00-85d4-11eb-821b-ed4c00989c02.png">](https://pullrequestbadge.com/?utm_medium=github&utm_source=reisene&utm_campaign=badge_info)<!--
PR-BADGE: PLEASE DO NOT REMOVE THIS COMMENT -->


![snyk-top-banner](https://redirect.github.com/andygongea/OWASP-Benchmark/assets/818805/c518c423-16fe-447e-b67f-ad5a49b5d123)


<h3>Snyk has created this PR to upgrade mysql2 from 3.11.5 to
3.12.0.</h3>

:information_source: Keep your dependencies up-to-date. This makes it
easier to fix existing vulnerabilities and to more quickly identify and
fix newly disclosed vulnerabilities when they affect your project.

<hr/>


- The recommended version is **2 versions** ahead of your current
version.

- The recommended version was released **a month ago**.



<details>
<summary><b>Release notes</b></summary>
<br/>
  <details>
    <summary>Package name: <b>mysql2</b></summary>
    <ul>
      <li>
<b>3.12.0</b> - <a
href="https://redirect.github.com/sidorares/node-mysql2/releases/tag/v3.12.0">2024-12-23</a></br><h2><a
href="https://redirect.github.com/sidorares/node-mysql2/compare/v3.11.5...v3.12.0">3.12.0</a>
(2024-12-23)</h2>
<h3>Features</h3>
<ul>
<li><strong>PoolCluster:</strong> <code>restoreNodeTimeout</code>
implementation (<a
href="https://redirect.github.com/sidorares/node-mysql2/issues/3218"
data-hovercard-type="pull_request"
data-hovercard-url="/sidorares/node-mysql2/pull/3218/hovercard">#3218</a>)
(<a
href="https://redirect.github.com/sidorares/node-mysql2/commit/9a3860186c12452c8e4b60d700d4e1599cc7aefa">9a38601</a>)</li>
</ul>
      </li>
      <li>
        <b>3.11.6-canary.9a386018</b> - 2024-12-04
      </li>
      <li>
<b>3.11.5</b> - <a
href="https://redirect.github.com/sidorares/node-mysql2/releases/tag/v3.11.5">2024-11-28</a></br><h2><a
href="https://redirect.github.com/sidorares/node-mysql2/compare/v3.11.4...v3.11.5">3.11.5</a>
(2024-11-28)</h2>
<h3>Bug Fixes</h3>
<ul>
<li>fix datetime fields returned without time part when time is 00:00:00
(<a href="https://redirect.github.com/sidorares/node-mysql2/issues/3204"
data-hovercard-type="pull_request"
data-hovercard-url="/sidorares/node-mysql2/pull/3204/hovercard">#3204</a>)
(<a
href="https://redirect.github.com/sidorares/node-mysql2/commit/bded4980065319e58a4f87d828cc355fb79f5bd3">bded498</a>)</li>
<li>resolve circular dependencies (<a
href="https://redirect.github.com/sidorares/node-mysql2/issues/3081"
data-hovercard-type="pull_request"
data-hovercard-url="/sidorares/node-mysql2/pull/3081/hovercard">#3081</a>)
(<a
href="https://redirect.github.com/sidorares/node-mysql2/commit/d5a76e6c49fbb1bfea405ad809e3076fe5bda39d">d5a76e6</a>)</li>
<li>Deno <code>v2</code> requires <code>commonjs</code> type explicitly
(<a href="https://redirect.github.com/sidorares/node-mysql2/issues/3209"
data-hovercard-type="pull_request"
data-hovercard-url="/sidorares/node-mysql2/pull/3209/hovercard">#3209</a>)
(<a
href="https://redirect.github.com/sidorares/node-mysql2/commit/cdc9415c7cbe5806996b05415841b283ae0bd85d">cdc9415</a>)</li>
</ul>
      </li>
    </ul>
from <a
href="https://redirect.github.com/sidorares/node-mysql2/releases">mysql2
GitHub release notes</a>
  </details>
</details>

---

> [!IMPORTANT]
>
> - Check the changes in this PR to ensure they won't cause issues with
your project.
> - This PR was automatically created by Snyk using the credentials of a
real user.

---

**Note:** _You are seeing this because you or someone else with access
to this repository has authorized Snyk to open upgrade PRs._

**For more information:** <img
src="https://api.segment.io/v1/pixel/track?data=eyJ3cml0ZUtleSI6InJyWmxZcEdHY2RyTHZsb0lYd0dUcVg4WkFRTnNCOUEwIiwiYW5vbnltb3VzSWQiOiIzYTczODNhMC1iNWUxLTRjZDgtYjM5YS1mMzdkZWY2Y2Y2YjkiLCJldmVudCI6IlBSIHZpZXdlZCIsInByb3BlcnRpZXMiOnsicHJJZCI6IjNhNzM4M2EwLWI1ZTEtNGNkOC1iMzlhLWYzN2RlZjZjZjZiOSJ9fQ=="
width="0" height="0"/>

> - 🧐 [View latest project
report](https://app.snyk.io/org/reisene/project/55e114f8-489e-4f14-b900-20574b041e59?utm_source&#x3D;github-cloud-app&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr)
> - 📜 [Customise PR
templates](https://docs.snyk.io/scan-using-snyk/pull-requests/snyk-fix-pull-or-merge-requests/customize-pr-templates?utm_source=&utm_content=fix-pr-template)
> - 🛠 [Adjust upgrade PR
settings](https://app.snyk.io/org/reisene/project/55e114f8-489e-4f14-b900-20574b041e59/settings/integration?utm_source&#x3D;github-cloud-app&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr)
> - 🔕 [Ignore this dependency or unsubscribe from future upgrade
PRs](https://app.snyk.io/org/reisene/project/55e114f8-489e-4f14-b900-20574b041e59/settings/integration?pkg&#x3D;mysql2&amp;utm_source&#x3D;github-cloud-app&amp;utm_medium&#x3D;referral&amp;page&#x3D;upgrade-pr#auto-dep-upgrades)

[//]: #
'snyk:metadata:{"customTemplate":{"variablesUsed":[],"fieldsUsed":[]},"dependencies":[{"name":"mysql2","from":"3.11.5","to":"3.12.0"}],"env":"prod","hasFixes":false,"isBreakingChange":false,"isMajorUpgrade":false,"issuesToFix":[],"prId":"3a7383a0-b5e1-4cd8-b39a-f37def6cf6b9","prPublicId":"3a7383a0-b5e1-4cd8-b39a-f37def6cf6b9","packageManager":"npm","priorityScoreList":[],"projectPublicId":"55e114f8-489e-4f14-b900-20574b041e59","projectUrl":"https://app.snyk.io/org/reisene/project/55e114f8-489e-4f14-b900-20574b041e59?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr","prType":"upgrade","templateFieldSources":{"branchName":"default","commitMessage":"default","description":"default","title":"default"},"templateVariants":[],"type":"auto","upgrade":[],"upgradeInfo":{"versionsDiff":2,"publishedDate":"2024-12-23T10:18:50.497Z"},"vulns":[]}'

## Podsumowanie przez Sourcery

Kompilacja:
- Zaktualizuj pliki package.json i package-lock.json, aby odzwierciedlić
uaktualnienie zależności.

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Build:
- Update the package.json and package-lock.json files to reflect the
dependency upgrade.

</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mysqljs/mysql incompatibilities Previously: feligxe-mysql-incompatibilities

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants