Commit Graph

356 Commits

Author SHA1 Message Date
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
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
Maximilian Krög
a8249efd9b
Fix linting errors
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2025-09-04 01:06:42 +02:00
Maurício Meneghini Fauth
e8c216b17e
Fix PHP 8.5 Reflection*::setAccessible() deprecations
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2025-08-17 13:32:00 -03:00
Maximilian Krög
0c6d29358a
Fix move column for table with foreign key
Signed-off-by: Maximilian Krög <maximilian.kroeg@geocept.com>
2025-07-09 16:41:57 +02:00
Maurício Meneghini Fauth
92efecc7f6
Add SQL parse error message when simulating DML
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18903

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2025-04-21 22:37:38 -03:00
Liviu-Mihail Concioiu
6ed8df9877 Fix badge colors
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2025-01-13 21:43:44 +01:00
Maurício Meneghini Fauth
f6ce169290
Fix issue when updating privs for various databases
The sql_query global variable should be a string, and it can be a string
in this case, which will cause an error as the string will not be
converted to array.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-11-05 15:09:21 -03:00
Maurício Meneghini Fauth
555ea56cbd
Make PHPUnit's assertions stricter
Backports #18993 to QA_5_2.

This makes merging QA_5_2 into master easier.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-10-12 15:33:45 -03:00
Maurício Meneghini Fauth
7fc96d6621
Call PHPUnit static methods using static calls
Backports #18907 to QA_5_2.

This makes merging QA_5_2 into master easier.
Changes done using Rector.

- #18907

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-10-12 14:28:22 -03:00
Maurício Meneghini Fauth
46f2c8871c
Backport some fixes for PHPUnit 10 compatibility
- Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070623

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-08-13 20:13:18 -03:00
Maurício Meneghini Fauth
587d185bb7
Validate *_structure_or_data param when exporting
- Fixes #19213

This is not the best fix, but will avoid generating an invalid file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-18 16:07:46 -03:00
Maximilian Krög
3b84890770
Fix simulating query with -- comment
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2024-06-01 00:58:42 +02:00
Maximilian Krög
3b992e6a13
Preserve check constraint during column move
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2024-04-19 22:01:43 +02:00
Maurício Meneghini Fauth
a850e44479 Add unit test Table\IndexRenameController class
Adds unit test for preview SQL button when renaming an index and using
an old MySQL server.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-12-30 20:49:01 -03:00
Kamil Tekiela
d7a64dc0a8 Fix ENUM value parsing
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-11-29 15:22:22 +01:00
Maurício Meneghini Fauth
5c7e84047e
Merge pull request #18693 from kamil-tekiela/parseEnumSetValues_52
Fix enum/set value escaping
2023-10-03 16:54:56 -03:00
Kamil Tekiela
dba0086b90 Fix AJAX real-row-count
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-09-15 21:01:15 +01:00
Kamil Tekiela
09fe98bbfe Add simpler implementation of parseEnumSetValues
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-09-05 21:57:50 +01:00
Kamil Tekiela
910c43db3b Fix: Cannot execute stored procedure with SELECT using the SQL tab
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-08-07 13:59:48 +01: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
Maximilian Krög
d716e30e60
Change deprecated ReflectionProperty method call
Is being deprecated in PHP 8.3

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-07-20 01:30:37 +02:00
William Desportes
4655646219
Fix testCheckFavoriteTable
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-07-14 17:47:32 +02:00
Maurício Meneghini Fauth
746a34c009
Fix the actions not being hidden in the Triggers, Routines, Events pages
Fixes #17392

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-29 16:46:42 -03:00
Maurício Meneghini Fauth
d464a8d081
Fix GisDataEditorControllerTest namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-04-11 23:03:24 -03:00
MoonE
0ff3f10134
Fix editing GEOMETRYCOLLECTION EMPTY (#18189)
* Test editing empty geometry collection

- 'GEOMETRYCOLLECTION()'
- 'GEOMETRYCOLLECTION EMPTY'

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>

* Fix editing GEOMETRYCOLLECTION EMPTY

Instead of searching for first parenthesis look for word end.
Parsing was and is somewhat unsafe, though it works with the data
received from ST_AsText.

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>

---------

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
2023-04-08 15:12:40 -03:00
Kamil Tekiela
c19f6ae9ce Fix isNumeric
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2022-10-10 15:02:15 +01:00
Maurício Meneghini Fauth
dbe3db564e
Fix Enum/Set editor error when creating a new column
Fixes #17551

https://github.com/phpmyadmin/phpmyadmin/issues/17551#issuecomment-1136074722

Co-authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-20 20:54:07 -03:00
Ankush Patil
987cb5043d
fixed find replace regex issue if no matching result set found
When find and replace searching used with regex, at the time of replace
empty CASE END condition was causing issue.

Fixes #17388
Closes #17641

Signed-off-by: Ankush Patil <aspraz2658@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19 15:28:43 -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
Liviu-Mihail Concioiu
fb1afbe444 Fix database names dissapearing from Processes tab
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2022-05-30 00:44:38 +02:00
Liviu-Mihail Concioiu
e9a5ec01f5 Revert "Fix database names dissapearing from Processes tab"
This reverts commit af4434dee2.
2022-05-30 00:39:39 +02:00
Liviu-Mihail Concioiu
af4434dee2 Fix database names dissapearing from Processes tab
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2022-05-29 19:54:04 +02:00
Maurício Meneghini Fauth
9f076774e5
Remove table-light CSS classes
These classes were added by 6408b7179a.
However they aren't exactly the same as thead-light classes that exists
in Bootstrap 4.

Related to https://github.com/phpmyadmin/phpmyadmin/issues/17455.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-14 17:31:31 -03: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
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
2d56a8baac
Move Import and ImportStatus ctrls to Controllers\Import ns
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-27 10:27:28 -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
bf49480160
Populate relation Session with RelationParameters class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:15 -03:00
Maurício Meneghini Fauth
aaee7961c1
Remove Template dependency from Relation class
Related to 2299a62e49.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:14 -03:00
Maurício Meneghini Fauth
c411121fd8
Move Relation classes into the ConfigStorage namespace
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-17 12:09:13 -03:00
Maurício Meneghini Fauth
2299a62e49
Extract HTML from Relation::getRelationsParamDiagnostic
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-05 16:44:29 -03:00
Maurício Meneghini Fauth
e936cad542
Add basic test for Table\OperationsController class
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-12-01 11:47:19 -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
51f4017b32
Refactor destroy controller (#17194)
* Remove redundant conditions

They were always true. First, the variable is set to -1.
If the variable is -1, then set it to Message.
If the variable is Message then set the JSON array. All of this is
redundant.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* $sqlQuery is not used anywhere

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Enforce $selected to be an array

I can't remove it as it is a global. Previously, it was set to a POST
variable. Since we validate that the variable is set and is not null,
we can use the value from $params. If we validate that it's also an
array we can replace for loop with foreach.
There is no passing by reference, so this change should be safe.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Replace $rebuildDatabaseList with input validation

The validation message says 'No databases selected.' so I assume that
we should check that we actually got at least one entry in the list.
If that is true, then the $rebuildDatabaseList is not needed and the
condition redundant.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* drop_selected_dbs is always set and is redundant

I am not sure if this is necessary. The AJAX request sends a value of "1"
but the code doesn't really do anything with it other than checking if
it is actually set. Is there some other path possible?

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Flatten the array with a single element

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Remove redundant isset

The variable is set, so !isset === is_null. Why check for null if we can
check just for !is_array.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Update psalm-baseline.xml

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>

* Adhere to the coding standard

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2021-11-19 14:26:04 -03:00
Maurício Meneghini Fauth
b2a51c4d84
Create the RelationParameters value object
Replaces the $cfgRelation array with the RelationParameters value
object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-11-14 18:22:36 -03:00
Maurício Meneghini Fauth
67e96cf40c
Get default config values from Config\Settings classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-09-30 12:04:47 -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