gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade phpmyadmin/sql-parser

Browse Source 
- Upgrading phpmyadmin/sql-parser (dev-master 3bc8d0d => dev-master f2bafbb)
  - Upgrading roave/security-advisories (dev-latest 8938260 => dev-latest f8de2a8)

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
This commit is contained in:
Maurício Meneghini Fauth 2024-08-25 16:03:42 -03:00
parent 3c482628ad
commit fdfe7a92e9
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composer.lock generated
View File

@ -454,12 +454,12 @@
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/sql-parser.git",
"reference": "3bc8d0dde4daaee6d074349655a248f3ee88937b"
"reference": "f2bafbbe3160926b6e2a773bae790df4cd76ea9f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/3bc8d0dde4daaee6d074349655a248f3ee88937b",
"reference": "3bc8d0dde4daaee6d074349655a248f3ee88937b",
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/f2bafbbe3160926b6e2a773bae790df4cd76ea9f",
"reference": "f2bafbbe3160926b6e2a773bae790df4cd76ea9f",
"shasum": ""
},
"require": {
@ -538,7 +538,7 @@
"type": "other"
}
],
"time": "2024-08-01T00:10:53+00:00"
"time": "2024-08-25T18:42:36+00:00"
},
{
"name": "psr/cache",
@ -5738,12 +5738,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6"
"reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8938260885863ec2dd9f2aaf9a79ba14e58a92f6",
"reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f8de2a81061775002d96aea80b12f2ab3c5eeb8d",
"reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d",
"shasum": ""
},
"conflict": {
@ -5954,7 +5954,7 @@
"friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
"friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6",
"froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3",
"froxlor/froxlor": "<2.1.9",
"froxlor/froxlor": "<=2.2.0.0-RC3",
"frozennode/administrator": "<=5.0.12",
"fuel/core": "<1.8.1",
"funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
@ -6547,7 +6547,7 @@
"type": "tidelift"
}
],
"time": "2024-08-19T21:04:39+00:00"
"time": "2024-08-23T19:04:38+00:00"
},
{
"name": "sebastian/cli-parser",

72
tests/unit/Display/ResultsTest.php
View File

@ -1229,13 +1229,13 @@ class ResultsTest extends AbstractTestCase
[
'column_name' => 'id',
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">id'
. '<input type="hidden" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@ -1244,8 +1244,8 @@ class ResultsTest extends AbstractTestCase
. '&discard_remembered_sort=1">' . "\n"
. '<input type="hidden" name="url-add-order" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
'comments' => '',
'is_browse_pointer_enabled' => true,
@ -1256,13 +1256,13 @@ class ResultsTest extends AbstractTestCase
[
'column_name' => 'name',
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">name'
. '<input type="hidden" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@ -1271,8 +1271,8 @@ class ResultsTest extends AbstractTestCase
. '&discard_remembered_sort=1">' . "\n"
. '<input type="hidden" name="url-add-order" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
'comments' => '',
'is_browse_pointer_enabled' => true,
@ -1283,15 +1283,15 @@ class ResultsTest extends AbstractTestCase
[
'column_name' => 'datetimefield',
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
. 'ORDER+BY+%60datetimefield%60+DESC+'
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
. 'ORDER+BY+%60datetimefield%60+DESC'
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">datetimefield'
. '<input type="hidden" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
. 'ORDER+BY+%60datetimefield%60+DESC+'
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
. 'ORDER+BY+%60datetimefield%60+DESC'
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@ -1300,9 +1300,9 @@ class ResultsTest extends AbstractTestCase
. '&discard_remembered_sort=1">' . "\n"
. '<input type="hidden" name="url-add-order" value="'
. 'index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
. 'ORDER+BY+%60datetimefield%60+DESC+'
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
. 'ORDER+BY+%60datetimefield%60+DESC'
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
'comments' => '',
'is_browse_pointer_enabled' => true,
@ -1345,17 +1345,17 @@ class ResultsTest extends AbstractTestCase
],
'options' => [
[
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC',
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC',
'content' => 'PRIMARY (ASC)',
'is_selected' => false,
],
[
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC',
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC',
'content' => 'PRIMARY (DESC)',
'is_selected' => false,
],
[
'value' => 'SELECT * FROM `test_db`.`test_table` ',
'value' => 'SELECT * FROM `test_db`.`test_table`',
'content' => 'None',
'is_selected' => true,
],
@ -1524,13 +1524,13 @@ class ResultsTest extends AbstractTestCase
'column_name' => 'Rows',
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table'
. '%60+GROUP+BY+%60name%60+%0AORDER+BY+%60Rows%60+ASC+&sql_signature='
. 'b59a5c54f352dded8e277991c63d71dfd1d69e31f9df167944efec3a010999af&session_max_rows=25'
. '%60+GROUP+BY+%60name%60%0AORDER+BY+%60Rows%60+ASC&sql_signature='
. '9711b509280946a71dcad03bf3c85b2d4b3062cab1ffd59119b299d80c07b577&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en" class="sortlink">Rows<input type="hidden" value="'
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
. '%60name%60+%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC+&sql_signature='
. '5f836002ccad9fb868c8aeb2d550f0bb57a20448a535400a64423bd6488b36ce&session_max_rows=25'
. '%60name%60%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC&sql_signature='
. 'faa662252a63157194e38f4b46b9cb425807cd110147664855decc2899d4ccc0&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en"></a><input type="hidden" name="url-remove-order"'
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+%60name'
@ -1540,8 +1540,8 @@ class ResultsTest extends AbstractTestCase
. '<input type="hidden" name="url-add-order" value="'
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
. '%60name%60+%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC+&sql_signature='
. '5f836002ccad9fb868c8aeb2d550f0bb57a20448a535400a64423bd6488b36ce&session_max_rows=25'
. '%60name%60%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC&sql_signature='
. 'faa662252a63157194e38f4b46b9cb425807cd110147664855decc2899d4ccc0&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en">',
'comments' => '',
'is_browse_pointer_enabled' => true,
@ -1553,15 +1553,15 @@ class ResultsTest extends AbstractTestCase
'column_name' => 'name',
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
. '&sql_query=SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table'
. '%60+GROUP+BY+%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
. '%60+GROUP+BY+%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en" class="sortlink">name <img src="themes/dot.gif"'
. ' title="" alt="Ascending" class="icon ic_s_asc soimg"> <img src="themes/dot.gif" title=""'
. ' alt="Descending" class="icon ic_s_desc soimg hide"> <small>1</small><input type="hidden"'
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
. '%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
. '%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en"></a><input type="hidden" name="url-remove-order"'
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
@ -1570,8 +1570,8 @@ class ResultsTest extends AbstractTestCase
. '&discard_remembered_sort=1">' . "\n" . '<input type="hidden" name="url-add-order" value="'
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
. '%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
. '%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
. '&is_browse_distinct=1&server=2&lang=en">',
'comments' => '',
'is_browse_pointer_enabled' => true,

2
tests/unit/SqlTest.php
View File

@ -82,7 +82,7 @@ class SqlTest extends AbstractTestCase
$GLOBALS['_SESSION']['tmpval']['pos'] = 1;
$GLOBALS['_SESSION']['tmpval']['max_rows'] = 2;
self::assertSame('SELECT * FROM test LIMIT 1, 2 ', $this->callFunction(
self::assertSame('SELECT * FROM test LIMIT 1, 2', $this->callFunction(
$this->sql,
Sql::class,
'getSqlWithLimitClause',