webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00
Code Activity
128,289 Commits 12 Branches 481 Tags
QA_5_2
Commit Graph

305 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
3adaad0c64 Backport DatabaseInterface::quoteString to QA_5_2 
This makes easier to merge new code into master branch.
Moves the responsability of quoting to the driver instead of the
DatabaseInterface class. Uses PHP 8.6's mysqli::quote_string()
if available.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
 2026-10-01 11:32:48 -03:00
Kamil Tekiela
80638e8371 Add LIMIT 0 when fetching metadata 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2026-08-17 14:09:48 +01:00
Maximilian Krög
215c37b548 Fix some type errors and update baselines 
Signed-off-by: Maximilian Krög <maximilian.kroeg@geocept.com>
 2026-02-12 16:12:03 +01:00
Maximilian Krög
41a17b79bd Set sql mode for sql-parser when connecting to db 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2026-01-31 07:16:33 +01:00
Maurício Meneghini Fauth
aeb649ac6d Fix collation error when checking for grant permission 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-11-07 15:15:23 -03:00
Kamil Tekiela
3c597dc229 Fix warning when using roles in MariaDB 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2025-10-17 10:41:18 -03:00
Maurício Meneghini Fauth
7a5ad92e5f Fix collation error when checking for grant permission 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-22 17:40:39 -03:00
Pin-Yi Song
3f1d357794 fix: change to tryQuery() to achieve silent failure. 
Signed-off-by: Pin-Yi Song <611077101@mail.nknu.edu.tw>
 2025-07-31 23:15:03 +08:00
William Desportes
4d51855d67 Fix #18129 - PHP warning while editting a view definition 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-01-16 02:56:56 +01:00
William Desportes
71fb45ace5 Fix #19500 - Use KILL instead of CALL mysql.rds_kill for non super users 
Fixes #19500

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-01-06 13:17:41 +01:00
Duane Morris
7280713fcb Update to fix replication that broke with MySQL 8.4.0 removal of master and slave commands (#19153) 
* Change to supported MySQL 8.4 commands

updated removed master and slave commands with the now supported commands

Signed-off-by: Duane Morris <duane.morris@cambiahealth.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>

* Add backwards compatibility

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>

---------

Signed-off-by: Duane Morris <duane.morris@cambiahealth.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Co-authored-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2024-10-23 23:07:55 -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
Maurício Meneghini Fauth
07a0c3ade6 Merge pull request #18913 from kamil-tekiela/Fix-bug-with-numeric-table-names 
Fix bug with numeric table names
 2024-01-31 11:47:14 -03:00
Kamil Tekiela
021912da3a Don't guess system schema collation 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-01-30 16:20:00 +01:00
Kamil Tekiela
3bde23aceb Fix bug with numeric table names 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-01-23 13:44:35 +01:00
Kamil Tekiela
ef0ea05a8f Measure time only for user queries 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-30 00:41:38 +01:00
Maurício Meneghini Fauth
0301e48a27 Add ChangeLog entry for #17702 
- Closes #17702

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2023-03-24 16:35:15 -03:00
Nicolas Hervouet
e4d9a1a66a Fix for handle large number of tables in a single database (more than 10k) 
getTablesFull was taking too much time, because MySQL do not have a real table where it stores all tables information.
So when it runs a query like select * from information_schema.TABLES ORDER BY Name limit 250 offset 0, MySQL has to read information about all tables to build his in memory table, then sort it by name, and then return 250 first tables.
But reading information about one table takes time, and that's why the query is very slow when you have a lot of tables.
Note that the problem is the same with 'SHOW TABLE STATUS'.

So, in order to speed up this query, we have to limit it to a small list of tables, as it, MySQL has to read table information only for few tables.
Note that SHOW TABLES is not that long, even with a large amount of tables.

The idea here is to use the result of SHOW TABLES query, to apply paging on this table list, and then to run the query on information_schema.TABLES only on tables we want.

Signed-off-by: Nicolas Hervouet <github@pico12.fr>
 2023-03-24 11:55:30 -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
Kamil Tekiela
3db245f462 Optimize export of many tables 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-15 19:59:35 +00:00
Kamil Tekiela
d7f599df00 Accept table with name 0 in getTablesFull 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-14 22:11:05 +00:00
Kamil Tekiela
282dc9a27e Fix a bug with numerical table name 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-03-14 21:35:10 +00:00
Kamil Tekiela
aa63c6821a Fix bug related to tables with numerical names 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2023-02-22 13:18:06 +00:00
Mo Sureerat
a07474f997 Handle array re-index + fix setVersion logic + hardcode version int 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 17:32:03 +07:00
Mo Sureerat
9ff395e888 Fix type 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 13:40:20 +07:00
Mo Sureerat
d97df6c00b Define type 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 13:12:07 +07:00
Mo Sureerat
cac09436c9 Rewrite method to set database info 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 13:01:19 +07:00
Mo Sureerat
7ea0a95646 Update code style 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 01:24:39 +07:00
Mo Sureerat
8c93351647 Relocate method and fix unit test fail 
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
 2022-10-11 01:18:52 +07: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
7be18653aa Fix broken column edit 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-02-13 18:03:34 +00:00
Maurício Meneghini Fauth
a57102412c Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 10:42:45 -03:00
Maurício Meneghini Fauth
feda222da9 Fix failing tests 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-26 10:02:26 -03:00
Maurício Meneghini Fauth
6177f83b03 Merge pull request #17279 from kamil-tekiela/Dbal-pt.4 
Major Dbal refactoring pt.4
 2022-01-19 12:16:14 -03:00
Maurício Meneghini Fauth
813ffbf562 Merge branch 'QA_4_9-security' into QA_5_1-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:20:04 -03:00
William Desportes
ca54f1db05 security - Fix - 2FA/U2F can be disabled without any code change 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-13 19:07:34 +01:00
Kamil Tekiela
b8f6fce3ef Fix parameter types 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 23:09:56 +00:00
Kamil Tekiela
86031d2bf6 Deimplement fetchAssoc() helper 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 22:44:53 +00:00
Kamil Tekiela
a4b2d7e524 Deimplement fetchRow() helper 
This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 22:44:53 +00:00
Kamil Tekiela
3e6e4fffbc Expose execution time as public property 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-09 21:21:55 +00:00
Kamil Tekiela
bcf2b7b322 Deimplement numFields() helper 
There were only two usages remaining. This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-07 23:27:37 +00:00
Kamil Tekiela
2edc9da063 Deimplement dataSeek() helper 
There were only two usages remaining. This helper isn't needed anymore.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-07 23:22:49 +00:00
Maurício Meneghini Fauth
290f026a02 Merge pull request #17272 from kamil-tekiela/queryAsControlUser 
Query as control user
 2022-01-06 21:32:46 -03:00
Kamil Tekiela
5883ca608e Add param and return type 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:38:21 +00:00
Kamil Tekiela
d5dbc316c0 Remove matching default values 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:38:20 +00:00
Kamil Tekiela
415eb2c8d7 Convert ternary to boolean expression 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:37:35 +00:00
Kamil Tekiela
a4cb49080a Extract common part from if 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:37:35 +00:00
Kamil Tekiela
01438e9d7a Update docblocks for nullable parameters 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:37:34 +00:00
Kamil Tekiela
f5bb90ebb9 Move queryAsControlUser - Dbal refactoring pt.3 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-06 19:31:27 +00:00
Kamil Tekiela
f38d3baa31 Remove $options parameter from fetchResult 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
 2022-01-01 01:46:17 +00:00