Skip to content

Commit fdfe7a9

Browse files
MauricioFauthMauricioFauth
committed
Upgrade phpmyadmin/sql-parser
 - 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>
1 parent 3c48262 commit fdfe7a9

3 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎composer.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/unit/Display/ResultsTest.php‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,13 +1229,13 @@ public function testGetTable(): void
12291229
[
12301230
'column_name' => 'id',
12311231
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
1232-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
1233-
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
1232+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
1233+
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
12341234
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">id'
12351235
. '<input type="hidden" value="'
12361236
. 'index.php?route=/sql&db=test_db&table=test_table'
1237-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
1238-
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
1237+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
1238+
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
12391239
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
12401240
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
12411241
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@@ -1244,8 +1244,8 @@ public function testGetTable(): void
12441244
. '&discard_remembered_sort=1">' . "\n"
12451245
. '<input type="hidden" name="url-add-order" value="'
12461246
. 'index.php?route=/sql&db=test_db&table=test_table'
1247-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60id%60+ASC+'
1248-
. '&sql_signature=5b09494be0beb7899b460ba6b695504ca89d1ad1fbc8705f3b60f7da71f61b2f'
1247+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60id%60+ASC'
1248+
. '&sql_signature=8e37a2f4521e45af28e26a01518e63de65737b7028e73c9536a86e83046ac1be'
12491249
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
12501250
'comments' => '',
12511251
'is_browse_pointer_enabled' => true,
@@ -1256,13 +1256,13 @@ public function testGetTable(): void
12561256
[
12571257
'column_name' => 'name',
12581258
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
1259-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
1260-
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
1259+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
1260+
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
12611261
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">name'
12621262
. '<input type="hidden" value="'
12631263
. 'index.php?route=/sql&db=test_db&table=test_table'
1264-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
1265-
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
1264+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
1265+
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
12661266
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
12671267
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
12681268
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@@ -1271,8 +1271,8 @@ public function testGetTable(): void
12711271
. '&discard_remembered_sort=1">' . "\n"
12721272
. '<input type="hidden" name="url-add-order" value="'
12731273
. 'index.php?route=/sql&db=test_db&table=test_table'
1274-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0AORDER+BY+%60name%60+ASC+'
1275-
. '&sql_signature=deb7ae82acc39ae4faa69b87f757edb5c3a6a714196d2f5fefe5cccc06985aba'
1274+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0AORDER+BY+%60name%60+ASC'
1275+
. '&sql_signature=aec7d5c52573ac9d51c318d643fc62a8578baab162d902ce6d10318d6c5e0674'
12761276
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
12771277
'comments' => '',
12781278
'is_browse_pointer_enabled' => true,
@@ -1283,15 +1283,15 @@ public function testGetTable(): void
12831283
[
12841284
'column_name' => 'datetimefield',
12851285
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
1286-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
1287-
. 'ORDER+BY+%60datetimefield%60+DESC+'
1288-
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
1286+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
1287+
. 'ORDER+BY+%60datetimefield%60+DESC'
1288+
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
12891289
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en" class="sortlink">datetimefield'
12901290
. '<input type="hidden" value="'
12911291
. 'index.php?route=/sql&db=test_db&table=test_table'
1292-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
1293-
. 'ORDER+BY+%60datetimefield%60+DESC+'
1294-
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
1292+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
1293+
. 'ORDER+BY+%60datetimefield%60+DESC'
1294+
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
12951295
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en"></a>'
12961296
. '<input type="hidden" name="url-remove-order" value="index.php?route=/sql&db=test_db'
12971297
. '&table=test_table&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60'
@@ -1300,9 +1300,9 @@ public function testGetTable(): void
13001300
. '&discard_remembered_sort=1">' . "\n"
13011301
. '<input type="hidden" name="url-add-order" value="'
13021302
. 'index.php?route=/sql&db=test_db&table=test_table'
1303-
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60+%0A'
1304-
. 'ORDER+BY+%60datetimefield%60+DESC+'
1305-
. '&sql_signature=d7f66b34e106a07349e748fa1f6c517fb33e0a717c285b623d10e7f0e24a3db4'
1303+
. '&sql_query=SELECT+%2A+FROM+%60test_db%60.%60test_table%60%0A'
1304+
. 'ORDER+BY+%60datetimefield%60+DESC'
1305+
. '&sql_signature=6c53a00ab0e73234883b7190dab079c6e9b9b0f96eca2ee78453305599d66fc1'
13061306
. '&session_max_rows=25&is_browse_distinct=0&server=2&lang=en">',
13071307
'comments' => '',
13081308
'is_browse_pointer_enabled' => true,
@@ -1345,17 +1345,17 @@ public function testGetTable(): void
13451345
],
13461346
'options' => [
13471347
[
1348-
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC',
1348+
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC',
13491349
'content' => 'PRIMARY (ASC)',
13501350
'is_selected' => false,
13511351
],
13521352
[
1353-
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC',
1353+
'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC',
13541354
'content' => 'PRIMARY (DESC)',
13551355
'is_selected' => false,
13561356
],
13571357
[
1358-
'value' => 'SELECT * FROM `test_db`.`test_table` ',
1358+
'value' => 'SELECT * FROM `test_db`.`test_table`',
13591359
'content' => 'None',
13601360
'is_selected' => true,
13611361
],
@@ -1524,13 +1524,13 @@ public function testGetTable2(): void
15241524
'column_name' => 'Rows',
15251525
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
15261526
. '&sql_query=SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table'
1527-
. '%60+GROUP+BY+%60name%60+%0AORDER+BY+%60Rows%60+ASC+&sql_signature='
1528-
. 'b59a5c54f352dded8e277991c63d71dfd1d69e31f9df167944efec3a010999af&session_max_rows=25'
1527+
. '%60+GROUP+BY+%60name%60%0AORDER+BY+%60Rows%60+ASC&sql_signature='
1528+
. '9711b509280946a71dcad03bf3c85b2d4b3062cab1ffd59119b299d80c07b577&session_max_rows=25'
15291529
. '&is_browse_distinct=1&server=2&lang=en" class="sortlink">Rows<input type="hidden" value="'
15301530
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
15311531
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
1532-
. '%60name%60+%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC+&sql_signature='
1533-
. '5f836002ccad9fb868c8aeb2d550f0bb57a20448a535400a64423bd6488b36ce&session_max_rows=25'
1532+
. '%60name%60%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC&sql_signature='
1533+
. 'faa662252a63157194e38f4b46b9cb425807cd110147664855decc2899d4ccc0&session_max_rows=25'
15341534
. '&is_browse_distinct=1&server=2&lang=en"></a><input type="hidden" name="url-remove-order"'
15351535
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
15361536
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+%60name'
@@ -1540,8 +1540,8 @@ public function testGetTable2(): void
15401540
. '<input type="hidden" name="url-add-order" value="'
15411541
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
15421542
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
1543-
. '%60name%60+%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC+&sql_signature='
1544-
. '5f836002ccad9fb868c8aeb2d550f0bb57a20448a535400a64423bd6488b36ce&session_max_rows=25'
1543+
. '%60name%60%0AORDER+BY+%60name%60+ASC%2C+%60Rows%60+ASC&sql_signature='
1544+
. 'faa662252a63157194e38f4b46b9cb425807cd110147664855decc2899d4ccc0&session_max_rows=25'
15451545
. '&is_browse_distinct=1&server=2&lang=en">',
15461546
'comments' => '',
15471547
'is_browse_pointer_enabled' => true,
@@ -1553,15 +1553,15 @@ public function testGetTable2(): void
15531553
'column_name' => 'name',
15541554
'order_link' => '<a href="index.php?route=/sql&db=test_db&table=test_table'
15551555
. '&sql_query=SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table'
1556-
. '%60+GROUP+BY+%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
1557-
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
1556+
. '%60+GROUP+BY+%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
1557+
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
15581558
. '&is_browse_distinct=1&server=2&lang=en" class="sortlink">name <img src="themes/dot.gif"'
15591559
. ' title="" alt="Ascending" class="icon ic_s_asc soimg"> <img src="themes/dot.gif" title=""'
15601560
. ' alt="Descending" class="icon ic_s_desc soimg hide"> <small>1</small><input type="hidden"'
15611561
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
15621562
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
1563-
. '%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
1564-
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
1563+
. '%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
1564+
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
15651565
. '&is_browse_distinct=1&server=2&lang=en"></a><input type="hidden" name="url-remove-order"'
15661566
. ' value="index.php?route=/sql&db=test_db&table=test_table&sql_query='
15671567
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
@@ -1570,8 +1570,8 @@ public function testGetTable2(): void
15701570
. '&discard_remembered_sort=1">' . "\n" . '<input type="hidden" name="url-add-order" value="'
15711571
. 'index.php?route=/sql&db=test_db&table=test_table&sql_query='
15721572
. 'SELECT+COUNT%28%2A%29+AS+%60Rows%60%2C+%60name%60+FROM+%60test_table%60+GROUP+BY+'
1573-
. '%60name%60+%0AORDER+BY+%60name%60+DESC+&sql_signature='
1574-
. 'ae1384a6e23120c32681d25ee73ae0a81aece8f894e921ca66dafc972ba845a8&session_max_rows=25'
1573+
. '%60name%60%0AORDER+BY+%60name%60+DESC&sql_signature='
1574+
. '5a8c171115c591960b9da8efe375a2f7f4faf44030b33230ad82053648f860ae&session_max_rows=25'
15751575
. '&is_browse_distinct=1&server=2&lang=en">',
15761576
'comments' => '',
15771577
'is_browse_pointer_enabled' => true,

‎tests/unit/SqlTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testGetSqlWithLimitClause(): void
8282
$GLOBALS['_SESSION']['tmpval']['pos'] = 1;
8383
$GLOBALS['_SESSION']['tmpval']['max_rows'] = 2;
8484

85-
self::assertSame('SELECT * FROM test LIMIT 1, 2 ', $this->callFunction(
85+
self::assertSame('SELECT * FROM test LIMIT 1, 2', $this->callFunction(
8686
$this->sql,
8787
Sql::class,
8888
'getSqlWithLimitClause',

0 commit comments

Comments
 (0)