gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,994 Commits 12 Branches 481 Tags 2.4 GiB
bed6a58c6c
Commit Graph

146 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
12efd0a0fe
Replace replication statements with new terminology 
SHOW MASTER LOGS was removed in MySQL 8.4.0 and SHOW BINARY LOGS is
available since MySQL 4.1.1.

As of MySQL 8.2.0, SHOW BINARY LOG STATUS is available.
As of MariaDB 10.5.2, SHOW BINLOG STATUS is available.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-31 13:50:11 -03:00
Peter de Kraker
10a8943cfc
Add RocksDB support 
Signed-off-by: Peter de Kraker <peterdekraker@umito.nl>
 2024-03-15 20:13:58 -03:00
Luca Camillo
78335aac87
Add role based auth for MySQL 8.x and compatibles (#18814) 
* add role based auth for mysql 8.x or compatible like mariadb/aws rds aurora mysql

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>

* Using cache and check server version

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>

* implement tests for getCurrentRolesAndHost / getCurrentRoles functions

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>

* fix role checks on mariadb

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>

* Simplify code + ignore NONE as result of CURRENT_ROLE()

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>

* Fix tests

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Fixes #18782

---------

Signed-off-by: Luca Camillo <luca.camillo@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2024-03-02 19:31:03 -03:00
Dmitrii Kustov
4bdf519588
Improve collations support for MariaDB 10.10+ (#18760) 
* Added new charset queries

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Improve collations support for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Using dbi to check for MariaDB

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed unnecessary query

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Cleanup

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Whitespaces

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Switched to getVersion()

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Removed use of version_compare

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Test for MariaDB 10.10+

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>

* Update test/classes/CharsetsTest.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18769

---------

Signed-off-by: Dmitrii Kustov <simbiat@outlook.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit ef92f1f484)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-10-31 15:28:20 -03:00
Kamil Tekiela
1c6c661298 Fix bookmark delete 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-09-16 13:45:18 +01:00
Maximilian Krög
bd066b3d8b
Add test for SimulateDml with condition WHERE 0 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2023-08-26 21:35:43 +02:00
Maximilian Krög
836c5bd7ea
Fix some type declarations 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2023-08-26 21:35:39 +02:00
Kamran
135724f0d4
fix: simulate query matched rows wrong count (#18536) 
* bugfix for simulate query matched rows wrong count

Signed-off-by: kamioon <kamran.azari@gmail.com>

* remove extra parentheses
add space before and after the else keyword

Signed-off-by: kamioon <kamran.azari@gmail.com>

* replaced with suggested commit from @MoonE with the <=> operator

Signed-off-by: kamioon <kamran.azari@gmail.com>

* add parentheses for the main where condition in simulated update query

Signed-off-by: kamioon <kamran.azari@gmail.com>

* update tests for the simulated update query changes

Signed-off-by: kamioon <kamran.azari@gmail.com>

---------

Signed-off-by: kamioon <kamran.azari@gmail.com>
 2023-08-26 16:26:08 -03:00
Maurício Meneghini Fauth
d3c01539c7
Fail tests with not supported queries 
Instead of marking them as incomplete.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-08-06 13:42:03 -03:00
Maurício Meneghini Fauth
7b88ab16af
Fix a case where a fatal error message was not displayed 
A fatal error message was not displayed when the ResponseRenderer object
already had some HTML, because the output buffer is only displayed when
there is no HTML.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-06-03 17:01:51 -03:00
Maurício Meneghini Fauth
6875680de9
Fix double encoding on User Groups pages 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-05-07 17:52:26 -03:00
Maurício Meneghini Fauth
cf764231b5
Fix incomplete test 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-26 12:37:32 -03:00
Kamil Tekiela
e9b9c120af Fix getTablesFull() and related tests 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-15 19:59:35 +00:00
William Desportes
2443570ce6
Merge #17851 - Fix #17028, #17683 - Re build query count management 
Pull-request: #17851
Fixes: #17028
Fixes: #17683

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-02-08 13:12:00 +01:00
William Desportes
725e067f6d
Fix tests after full group by changes 
Ref: 305fe52d9e

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2023-01-22 01:22:50 +04:00
William Desportes
86b93afdfd
Replace '*' in query to count results 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-10-31 14:44:40 +01:00
William Desportes
8a2fbda34a
Ref #17028 - Use statement build instead of replacing tokens 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-10-31 14:37:54 +01:00
Maurício Meneghini Fauth
d0b71b7fa6
Use Psalm annotation for ResultInterface::getIterator 
Adds Psalm's prefix for the return annotation to avoid lint errors.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-09-19 23:14:06 -03:00
Maurício Meneghini Fauth
3412fb2c03
Add ChangeLog entry for #17271 
Fixes #17271

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-06-10 00:27:14 -03:00
Maurício Meneghini Fauth
2653b2942b
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-03-11 13:02:15 -03:00
Kamil Tekiela
541f08035b Adjust tests 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-02-13 18:03:34 +00:00
Maurício Meneghini Fauth
de0244b3e6
Mark test as incomplete if it doesn't has all select dbs 
Related to #17300.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-12 11:51:53 -03:00
Maurício Meneghini Fauth
7b1dd0ea6c
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-02-12 11:42:17 -03:00
William Desportes
c26c153a11
Improve DbiDummy::addResult phpdoc 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-11 22:31:03 +01:00
William Desportes
65c9f49c1e
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-06 15:45:57 +01:00
William Desportes
4e68f548f9
Ref #17298, #17344 - fix ODS import tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-06 14:20:59 +01:00
Maurício Meneghini Fauth
76bb42957e
Fix failing tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 15:02:39 -03:00
Maurício Meneghini Fauth
04176cd9db
Mark test as incomplete for not supported queries 
Instead of printing the query, it marks the test as incomplete, this way
we have a stack trace that help finding why it happened.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 11:39:27 -03:00
Kamil Tekiela
47a039d70c Implement ResultInterface & MysqliResult 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-12-31 23:59:24 +00:00
Maurício Meneghini Fauth
feca48cc76
Change return type of DatabaseInterface::getError method 
Now, it returns last error message or an empty string instead of false
if no errors occurred.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-27 14:43:14 -03:00
Maurício Meneghini Fauth
44fe103b9c
Remove @access annotations 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-22 11:43:45 -03:00
Maurício Meneghini Fauth
fa5c684f27
Replace the master/slave terminology 
Replaces master with primary and slave with replica.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-18 14:26:56 -03:00
Maurício Meneghini Fauth
2c125f0a87
Add basic unit test for Export\ExportController 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-30 16:15:48 -03:00
Kamil Tekiela
3a3bb2dc29 Fix tryMultiQuery signature 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2021-11-25 13:45:56 +00:00
Maurício Meneghini Fauth
e8f57353f5
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-28 14:10:04 -03:00
Maurício Meneghini Fauth
7bcccf7bdc
Remove connection parameter from getClientInfo 
Related to #16911

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-28 13:53:15 -03:00
Maurício Meneghini Fauth
3e0856c77b
Remove useless string concatenations 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-27 21:40:22 -03:00
Maurício Meneghini Fauth
f00d70cccb
Remove useless whitespaces 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-15 17:05:40 -03:00
Maurício Meneghini Fauth
9f3510d11a
Add bool return type where possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-14 20:11:51 -03:00
Maurício Meneghini Fauth
7f6472b2c2
Add void return type where possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-13 15:29:11 -03:00
Maurício Meneghini Fauth
e3554879ef
Extract actions from controllers to new controllers 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-07 21:19:43 -03:00
William Desportes
806e2740ba
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-27 22:09:55 +02:00
William Desportes
483df1d961
Add $this->dummyDbi->addErrorCode method to be able to test error code behaviors 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-27 03:17:18 +02:00
William Desportes
2c28a715b4
Add methods to DbiDummy and AbstractTestCase to control changing databases 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-24 02:01:00 +02:00
Maurício Meneghini Fauth
f7fc4177af
Add support for account locking 
- https://dev.mysql.com/doc/refman/en/account-locking.html
- https://mariadb.com/kb/en/account-locking/

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-08-21 00:55:33 -03:00
Maurício Meneghini Fauth
a1379fa1c6
Remove $dbi mock from PrivilegesTest::testGetHtmlForUserProperties test 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-08-13 17:00:18 -03:00
William Desportes
20e9d5bf39
Improve debug of assertAllQueriesConsumed 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-07-20 19:29:24 +02:00
William Desportes
3a87667cab
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-07-20 17:52:16 +02:00
William Desportes
e7483689cb
Implement DbiDummy::removeDefaultResults 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-07-20 01:30:37 +02:00
William Desportes
f0db5fb57e
Add tests for Mroonga support 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-07-11 21:54:36 +02:00