Commit Graph

128920 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
ec6db6b516
Fix CSS build artifacts at wrong directory
Now it uses the root build directory instead of public/build.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-08-09 14:05:24 -03:00
Hojat Ghanad
ddd3d98559
Translated using Weblate (Persian)
Currently translated at 22.7% (773 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fa/
Signed-off-by: Hojat Ghanad <hojat.ghanad@gmail.com>
2024-08-09 16:09:17 +02:00
Maurício Meneghini Fauth
04ce8db2b0
Merge pull request #19247 from MauricioFauth/DatabaseStructure-js-global-removal
Remove DatabaseStructure JS global variable
2024-08-07 15:28:25 -03:00
Maurício Meneghini Fauth
e1ef15bf69
Remove DatabaseStructure JS global variable
Extracts the adjustTotals functions into a separate file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-08-06 17:09:58 -03:00
phpMyAdmin bot
c29a07ff86 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2024-08-04 00:21:59 +00:00
Maurício Meneghini Fauth
6531a04b63
Merge pull request #19244 from MauricioFauth/yarn-corepack
Add yarn 1.22 to the package.json's packageManager field
2024-08-02 11:28:46 -03:00
Maurício Meneghini Fauth
c048688186
Add yarn 1.22 to the package.json's packageManager field
This defines which package manager is expected to be used.

- https://nodejs.org/api/packages.html#packagemanager
- https://yarnpkg.com/corepack
- https://yarnpkg.com/getting-started/install
- https://nodejs.org/api/corepack.html

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2024-08-01 20:51:41 -03:00
Moha684
27befc1914
Translated using Weblate (Breton)
Currently translated at 13.7% (468 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/br/
Signed-off-by: Moha684 <nahil82466@gmail.com>
2024-08-01 18:01:52 +02:00
Maurício Meneghini Fauth
eb9125102d
Upgrade Composer dependencies
- Upgrading phpmyadmin/motranslator (dev-master 29ab5aa => dev-master afbfffe)
  - Upgrading phpmyadmin/shapefile (dev-master 4b64f4e => dev-master f825d8f)
  - Upgrading phpmyadmin/sql-parser (dev-master 417ad4c => dev-master 3bc8d0d)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-31 21:14:10 -03:00
Maurício Meneghini Fauth
7039a1f765
Merge pull request #19241 from MauricioFauth/function-global-removal
Remove the Functions JS global object
2024-07-31 20:34:21 -03:00
Maurício Meneghini Fauth
61c13b02e6
Merge pull request #19243 from MauricioFauth/php82
Bump minimum PHP version to 8.2.0
2024-07-31 20:33:57 -03:00
Maurício Meneghini Fauth
b1ae10df76
Bump minimum PHP version to 8.2.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-31 15:14:12 -03:00
Maurício Meneghini Fauth
238de3ab8b
Upgrade Composer dependencies
- Upgrading code-lts/u2f-php-server (v1.2.1 => v1.2.2)
  - Upgrading composer/pcre (3.1.4 => 3.2.0)
  - Upgrading phpstan/phpstan (1.11.7 => 1.11.8)
  - Upgrading phpunit/phpunit (10.5.28 => 10.5.29)
  - Upgrading roave/security-advisories (dev-latest d8b471f => dev-latest a7df4da)
  - Upgrading squizlabs/php_codesniffer (3.10.1 => 3.10.2)
  - Upgrading symfony/cache (v6.4.8 => v6.4.10)
  - Upgrading symfony/console (v6.4.9 => v6.4.10)
  - Upgrading symfony/dependency-injection (v6.4.9 => v6.4.10)
  - Upgrading symfony/string (v6.4.9 => v6.4.10)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-30 19:24:24 -03:00
Maurício Meneghini Fauth
b627a7986d
Merge pull request #19219 from florisluiten/master
Remove unneeded var assignment
2024-07-29 16:39:02 -03:00
phpMyAdmin bot
8f650dc793 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2024-07-28 00:22:51 +00:00
Maurício Meneghini Fauth
d65d0b220c
Remove the Functions JS global object
Exports each function individually and removes the Functions global
object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-27 15:38:41 -03:00
Maurício Meneghini Fauth
f12b453ef3
Merge pull request #19240 from MauricioFauth/Functions.sqlPrettyPrint-removal
Remove Functions.sqlPrettyPrint() function
2024-07-27 15:22:18 -03:00
Maurício Meneghini Fauth
20bf3d2307
Remove Functions.sqlPrettyPrint() function
This function is not used anywhere.
It was removed by 1aa0ac8b79.

- Related to https://github.com/phpmyadmin/phpmyadmin/issues/10437

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-27 13:16:03 -03:00
Moha684
948d4380de
Translated using Weblate (Breton)
Currently translated at 13.6% (466 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/br/
Signed-off-by: Moha684 <nahil82466@gmail.com>
2024-07-26 08:05:27 +02:00
Maurício Meneghini Fauth
2295812c27
Merge pull request #19239 from MauricioFauth/pma-constant-removal
Remove the PHPMYADMIN constant
2024-07-25 17:32:59 -03:00
Maurício Meneghini Fauth
bd2140576b
Remove the PHPMYADMIN constant
This constant was used to avoid non-entry-points scripts being called
directly. As phpMyAdmin has a public directory now, directly calling
scripts outside public is not possible anymore.

Introduced by afbb2a9dc2.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-25 16:48:18 -03:00
Andrei Stepanov
878f8cc706
Translated using Weblate (Russian)
Currently translated at 100.0% (3405 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ru/
Signed-off-by: Andrei Stepanov <adem4ik@gmail.com>
2024-07-25 13:09:29 +02:00
Maurício Meneghini Fauth
11af922ed1
Merge pull request #19236 from liviuconcioiu/19138
Fix #19138 - Adjust chart size in System Monitor
2024-07-24 16:03:18 -03:00
Maurício Meneghini Fauth
97d46a13c0
Clear _SERVER global for Http\Factory\ServerRequestFactoryTest
This fixes some test failures.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-23 19:59:49 -03:00
Liviu-Mihail Concioiu
9ddfab7a83 Adjust chart size in System Monitor
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2024-07-22 21:35:34 +02:00
Maurício Meneghini Fauth
70105294ef
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-22 15:44:41 -03:00
phpMyAdmin bot
6251a70859 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2024-07-21 00:22:22 +00:00
Maurício Meneghini Fauth
2e8bf5f7c4
Upgrade Composer dependencies
- Upgrading composer/ca-bundle (1.5.0 => 1.5.1)
  - Upgrading composer/semver (3.4.0 => 3.4.2)
  - Upgrading guzzlehttp/psr7 (2.6.2 => 2.7.0)
  - Upgrading phpunit/phpunit (10.5.25 => 10.5.28)
  - Upgrading roave/security-advisories (dev-latest 4a150f6 => dev-latest d8b471f)
  - Upgrading williamdes/mariadb-mysql-kbs (v1.2.14 => v1.3.0)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-20 15:00:48 -03:00
Maurício Meneghini Fauth
a55dc7f741
Merge #19234 Validate *_structure_or_data param when exporting
- Closes #19234

- 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-20 14:41:02 -03:00
Maurício Meneghini Fauth
fc67c0f4fd
Merge pull request #19231 from MauricioFauth/root-test-path-constant
Remove TEST_PATH constant
2024-07-18 18:45:16 -03:00
Maurício Meneghini Fauth
3f4fe51e9b
Fix Error\ErrorTest when tests dir is in another place
Some distributions may run the tests with the 'tests' directory in
a different location than the source code.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-18 18:30:23 -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
Maurício Meneghini Fauth
b4eb2f46a3
Merge pull request #19233 from MauricioFauth/static-variables
Replace static variables with static class properties
2024-07-18 12:22:25 -03:00
Maurício Meneghini Fauth
a97cca5f39
Replace static variables with static class properties
Static variables are better suitable for standalone functions. For
methods, static properties are better because they are easier to handle.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-17 22:24:06 -03:00
Maurício Meneghini Fauth
c8525a89d8
Merge #19203 Fix Query Generator single quotes and backslashes
- Closes #19203

Hello 👋

This PR fixes the generated query when the criteria text contains single quotes or backslashes.

For now it only escapes the first `single quote` and the first `backslash`, which generates an invalid query.

![Screenshot from 2024-06-19 18-49-43](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/264f2fc9-8d7c-47be-8114-153f6dfbda2f)

After merging this PR it will escape all the `single quotes` and all the `backslashes`.

![Screenshot from 2024-06-19 18-44-15](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/b1050188-7750-4b9e-90a6-a57a6c1f90f6)

- phpMyAdmin version: 5.2.2-dev, 6.0.0-dev

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-17 12:37:08 -03:00
Maurício Meneghini Fauth
bc22629b34
Merge #19181 Query generator support for IN() and NOT IN()
- Closes #19181

Hellooo 👋🏻

In this PR I have added `Query Generator` support to `IN()` and `NOT IN()`.

This is what it generates for now on both `IN()` and `NOT IN()`, which is not valid.

![Screenshot 2024-05-26 031847](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/5f295cd7-eb9f-4d4a-8b98-20edfe4be640)

This how it will looks after merging this PR, generating a valid one.

> Separate the values by commas

As you can see I have added a hint that shows only when choosing `IN()` or `NOT INT()`.

![Screenshot 2024-05-26 033921](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/7c0e77dd-8e82-4ac0-8c26-bc5457a038e2)

- phpMyAdmin version: 5.2.2-dev, 6.0.0-dev

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-17 12:33:04 -03:00
faissaloux
95866fd8cf
Query generator support for IN() and NOT IN()
Query Generator IN() support

Signed-off-by: faissaloux <fwahabali@gmail.com>

Query Generator NOT IN() support

Signed-off-by: faissaloux <fwahabali@gmail.com>

fix hint duplicates

Signed-off-by: faissaloux <fwahabali@gmail.com>

dont escape single quote on IN() and NOT IN()

Signed-off-by: faissaloux <fwahabali@gmail.com>

makes linter happy

Signed-off-by: faissaloux <fwahabali@gmail.com>

refactor

Signed-off-by: faissaloux <fwahabali@gmail.com>
2024-07-17 12:32:04 -03:00
Maurício Meneghini Fauth
cd1604345c
Merge #19167 Fix Query Generator criteria on column *
- Closes #19167

When choosing `*` in the column we can't use it in condition. This generates a non-valid query.

![Screenshot from 2024-05-15 16-45-48](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/b6d28c2f-cb23-44c2-bf03-6b26c4c6f1fa)

To fix this issue I have added another select in the criteria area where we can choose the column (* not included) that we want the criteria to be applied on

![Screenshot from 2024-05-15 16-50-52](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/ac8bf739-436a-4f37-a50b-afd8b4823cfe)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-17 12:12:45 -03:00
faissaloux
6aa461cb52
Fix Query Generator criteria on column *
add op column

Signed-off-by: faissaloux <fwahabali@gmail.com>

use op column to generate condition

Signed-off-by: faissaloux <fwahabali@gmail.com>

var -> const

Signed-off-by: faissaloux <fwahabali@gmail.com>
2024-07-17 12:12:16 -03:00
Maurício Meneghini Fauth
185d086f01
Merge #19163 Fix Query Generator IS NULL / IS NOT NULL
- Closes #19163

Hellooo 👋🏻

In this PR I fixed the bug in the `Query Generator`  that generates a non-valid query when using `IS NULL` and `IS NOT NULL`.

As you can see it adds the criteria string before `IS NULL`  which is empty in this case (Same thing for `IS NOT NULL`).
Which is not a valid query. 

![Screenshot from 2024-05-14 21-07-52](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/16be3b2c-d7e7-4ffd-a37b-04e1793f87fa)

Valid 
![Screenshot from 2024-05-14 21-10-06](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/882cd744-577d-49b3-8106-bc3f651a9f85)

[Screencast from 14-05-24 21:53:10.webm](https://github.com/phpmyadmin/phpmyadmin/assets/60013703/2c6b308f-9f26-40fe-a0ea-2c0e09dacc0f)

- phpMyAdmin version: 5.2.2-dev, 6.0.0-dev

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-17 12:04:21 -03:00
faissaloux
506d2c561b
fix Query Generator IS NULL / IS NOT NULL
Signed-off-by: faissaloux <fwahabali@gmail.com>

hide criteria on operators without arg

clear criteria input when hide it
2024-07-17 12:03:43 -03:00
lin ber
2ef5038494
Translated using Weblate (Korean)
Currently translated at 97.9% (3335 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ko/
Signed-off-by: lin ber <linber865@gmail.com>
2024-07-17 11:55:02 +02:00
Maurício Meneghini Fauth
ed1ca20848
Merge #19221 Show query stats for count(*) query
- Closes #19221
- Fixes #16869

Treat `SELECT COUNT(*) ...` query more like a normal select query.

If no group by is included (always only one row) then, like before, no
navigation is shown. Otherwise it shows with navigation like any other
select.
Before this PR the `nav_bar` property controlled the navigation and
the query duration, now the new `query_stats` property allows to show
the stats without navigation.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-16 18:20:34 -03:00
Maurício Meneghini Fauth
67a5c14e81
Remove TEST_PATH constant
Replace the TEST_PATH constant with __DIR__ to make the tests more
portable.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-16 14:10:16 -03:00
phpMyAdmin bot
57e6f048c8 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2024-07-14 00:22:16 +00:00
Maurício Meneghini Fauth
f18e71e4cc
Merge pull request #19228 from MauricioFauth/preg_match-boolean-return
Fix boolean usage of the return value of preg_match()
2024-07-13 17:01:20 -03:00
Maurício Meneghini Fauth
dc1bd60dd1
Fix boolean usage of the return value of preg_match()
preg_match() and preg_match_all() returns the number of pattern matches
(which might be zero), or false on failure. However, preg_match() always
returns 1 when a pattern is matched as it stops searching after the
first match.

- https://www.php.net/manual/en/function.preg-match.php
- https://www.php.net/manual/en/function.preg-match-all.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-13 14:43:05 -03:00
Maurício Meneghini Fauth
12e1bf6425
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-13 13:19:30 -03:00
Maurício Meneghini Fauth
7af58fc2b1
Merge #19200 Add fractional seconds to current_timestamp()
Add fractional seconds to current_timestamp().

Fixes #19199

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2024-07-13 12:47:04 -03:00
Liviu-Mihail Concioiu
02b508276e
Add fractional seconds to current_timestamp()
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2024-07-13 12:45:34 -03:00