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

Fix broken sort #14036

Merged
merged 17 commits into from Feb 22, 2018

Conversation

Projects
None yet
4 participants
@mauriciofauth
Member

mauriciofauth commented Feb 22, 2018

Fix #13931

Related to #13887

@mauriciofauth mauriciofauth requested a review from nijel Feb 22, 2018

@codecov

This comment has been minimized.

codecov bot commented Feb 22, 2018

Codecov Report

Merging #14036 into QA_4_7 will decrease coverage by 0.02%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           QA_4_7   #14036      +/-   ##
==========================================
- Coverage   54.29%   54.26%   -0.03%     
==========================================
  Files         467      467              
  Lines       70253    70189      -64     
==========================================
- Hits        38141    38090      -51     
+ Misses      32112    32099      -13
@nijel

nijel requested changes Feb 22, 2018 edited

Seems like some fixes from master are still missing. Here is list of related fixes in master and at least first few ones are missing, I haven't checked rest:

  • 1fc566f Share code for parsing data-post attribute
  • 2bc8721 Adjust RTE oprations to use POST
  • 613a146 Adjust field drop to use POST
  • 7508205 Adjust optimize table to use POST
  • 599a981 Adjust partition manipulations to use POST
  • e7eaea8 Adjust browsing distinct values to use POST
  • 6ee2f12 Adjust adding table key operations to use POST
  • 8332861 Adjust table drop operation to use POST
  • ff20564 Adjust table truncate operation to use POST
  • 99e9854 Always use POST for links containing SQL query
  • 816c426 Add tests for Util::linkOrButton
  • 3b9fb2b Simplify handling of long URLs in Util::linkOrButton

mauriciofauth and others added some commits Feb 22, 2018

Revert "Force using POST for SQL query in Util::linkOrButton"
This reverts commit 44df4a3.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Simplify handling of long URLs in Util::linkOrButton
We no longer create form, but rather rather tag the link to be handled
as POST on the client side.

This way the code is way simpler without need on any special case
handling on server side.

Fixes #13649

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 3b9fb2b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Add tests for Util::linkOrButton
Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 816c426)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Always use POST for links containing SQL query
This way the SQL queries will not apper in the web server logs.

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 99e9854)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Handle data-post with leading ?
This makes it easier to convert existing code.

Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit f059baa)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust table truncate operation to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit ff20564)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust table drop operation to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 8332861)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust adding table key operations to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 6ee2f12)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust browsing distinct values to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit e7eaea8)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust partition manipulations to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 599a981)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust optimize table to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 7508205)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust field drop to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 613a146)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust RTE oprations to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 2bc8721)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Adjust table operations to use POST
Issue #13866

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 6b5d535)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Share code for parsing data-post attribute
It can include leading question mark and we should deal with it in all
locations.

Fixes #13913

Signed-off-by: Michal Čihař <michal@cihar.com>
(cherry picked from commit 1fc566f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Fix getPostData function
dataPost can be undefined

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 367f49b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Update tbl_operations.js
fix maintenance operations

Signed-off-by: Gemorroj <wapinet@gmail.com>
(cherry picked from commit b3c9a0c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
@mauriciofauth

This comment has been minimized.

Member

mauriciofauth commented Feb 22, 2018

@nijel What do you think now?

@nijel nijel self-assigned this Feb 22, 2018

@nijel nijel merged commit c21a9cf into phpmyadmin:QA_4_7 Feb 22, 2018

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
DCO All commits have a DCO sign-off from the author
@nijel

This comment has been minimized.

Member

nijel commented Feb 22, 2018

I think it's good to merge now, thanks! Still this needs heavy testing now to discover possible breakages...

@nijel nijel added this to the 4.7.9 milestone Feb 22, 2018

@mauriciofauth mauriciofauth deleted the mauriciofauth:broken-sort branch Feb 22, 2018

@devenbansod

This comment has been minimized.

Member

devenbansod commented Mar 1, 2018

This should ideally fix the issue at #13887 too, right?

nijel added a commit that referenced this pull request Mar 1, 2018

Changelog for #14036
Signed-off-by: Michal Čihař <michal@cihar.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment