Skip to content
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

Remove deprecated fields from modResource #16187

Merged

Conversation

JoshuaLuckers
Copy link
Contributor

What does it do?

Removes the fields from the schema and drops them from the table.

  • privateweb
  • privatemgr
  • donthit

Why is it needed?

Fields are marked as deprecated and are no longer in use in the core.

How to test

Install/update MODX and see the columns not longer being present in the table.

Related issue(s)/PR(s)

Closes #16174

@cla-bot cla-bot bot added the cla-signed CLA confirmed for contributors to this PR. label May 17, 2022
@opengeek opengeek added this to the v3.1.0 milestone May 25, 2022
@Ibochkarev Ibochkarev added the pr/ready-for-merging Pull request reviewed and tested and ready for merging. label Aug 10, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jan 22, 2023

Codecov Report

Base: 17.95% // Head: 17.90% // Decreases project coverage by -0.05% ⚠️

Coverage data is based on head (9ad5f39) compared to base (32aba73).
Patch coverage: 87.50% of modified lines in pull request are covered.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@             Coverage Diff              @@
##                3.x   #16187      +/-   ##
============================================
- Coverage     17.95%   17.90%   -0.05%     
- Complexity    10442    10478      +36     
============================================
  Files           561      561              
  Lines         39051    39222     +171     
============================================
+ Hits           7010     7024      +14     
- Misses        32041    32198     +157     
Impacted Files Coverage Δ
core/src/Revolution/modResource.php 44.56% <ø> (ø)
core/src/Revolution/modParser.php 67.28% <66.66%> (-0.11%) ⬇️
core/src/Revolution/Filters/modInputFilter.php 100.00% <100.00%> (+3.12%) ⬆️
core/src/Revolution/Processors/Context/GetList.php 57.14% <0.00%> (-17.86%) ⬇️
...Revolution/Processors/Element/Category/GetList.php 45.23% <0.00%> (-9.31%) ⬇️
core/src/Revolution/Sources/modMediaSource.php 41.63% <0.00%> (-0.22%) ⬇️
core/src/Revolution/modPhpThumb.php 0.00% <0.00%> (ø)
core/src/Revolution/Sources/modS3MediaSource.php 0.00% <0.00%> (ø)
core/src/Revolution/Processors/Source/GetList.php 0.00% <0.00%> (ø)
core/src/Revolution/Sources/modFTPMediaSource.php 0.00% <0.00%> (ø)
... and 12 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@JoshuaLuckers
Copy link
Contributor Author

I probably have to redo this, I used the GitHub "sync fork" option which did a merge instead of rebase..

@Mark-H
Copy link
Collaborator

Mark-H commented Jan 22, 2023

Do merge commits (* that do not actually include any other commits) still matter if we squash when merging @opengeek?

@opengeek
Copy link
Member

Do merge commits (* that do not actually include any other commits) still matter if we squash when merging @opengeek?

They matter because all of those changes become part of this PR.

@opengeek
Copy link
Member

Or looking at it, maybe they don't? I have no idea.

@opengeek
Copy link
Member

I'd prefer out-of-date changes to be rebased, however. And if there are no conflicts, there is no reason to do this.

@opengeek
Copy link
Member

That said, this can be left alone. I'll deal with it when integrating it.

@JoshuaLuckers
Copy link
Contributor Author

Ok! The UI of GitHub didn't mention the strategy used for syncing the fork, neither did it ask for confirmation 😅. Next time I'll use the CLI again.

@opengeek
Copy link
Member

Ok! The UI of GitHub didn't mention the strategy used for syncing the fork, neither did it ask for confirmation 😅. Next time I'll use the CLI again.

I've never tried to use that other than on a clean fork. I'll do some more research, but it looks like it did a squash merge, and that's why there are no changes from the merge showing up as part of the PR. If that is the case, there may be no problem doing it that way.

@opengeek opengeek removed the pr/ready-for-merging Pull request reviewed and tested and ready for merging. label Jan 25, 2023
@JoshuaLuckers JoshuaLuckers added the pr/review-needed Pull request requires review and testing. label Jan 31, 2023
@Mark-H
Copy link
Collaborator

Mark-H commented Jan 31, 2023

I think you probably did not mean to commit setup/includes/upgrades/mysql/3.0.2-pl.php? Makes sense IMO to add this into 3.1 only.

@JoshuaLuckers
Copy link
Contributor Author

@Mark-H yes that’s my mistake, will fix it tomorrow

@JoshuaLuckers JoshuaLuckers force-pushed the 3x-remove-deprecated-resource-fields branch from b17eab5 to 9ad5f39 Compare February 4, 2023 11:51
@JoshuaLuckers JoshuaLuckers removed their assignment Feb 4, 2023
@Mark-H Mark-H requested a review from opengeek February 4, 2023 14:07
@JoshuaLuckers
Copy link
Contributor Author

@opengeek if you have time please re-review this PR!

Copy link
Member

@opengeek opengeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, but can someone confirm it works if the "upgrade" is re-run?

@Mark-H Mark-H merged commit 7a54b6e into modxcms:3.x Feb 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed CLA confirmed for contributors to this PR. pr/review-needed Pull request requires review and testing.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MODX >2.8.4 and >3.0.1: Remove privateweb privatemgr columns in site_content
6 participants