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

81 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
f66841d8ef Fix coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-05-01 14:47:27 -03:00
William Desportes
fbd89fb882
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-01 17:53:24 +02:00
William Desportes
e39ae0f989
Fix #14614 - "# 2014 - Commands out of sync; you can't run this command now" returned when stored procedure does not return any result set 
Fixes: #14614
Pull-request: #15234
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-01 17:08:36 +02:00
William Desportes
77fc2c58e9
Fix #14614 - Commands are out of sync with $cfg['DBG']['sqllog'] = true; 
Fixes: #14614
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-04-29 23:08:23 +02:00
Maurício Meneghini Fauth
2b79b8e50a Replace dbi global with $this in DatabaseInterface 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-18 01:51:26 -03:00
Maurício Meneghini Fauth
17195fbe72 Get $dbi from DIC instead of global in entry points 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-18 01:09:38 -03:00
Maurício Meneghini Fauth
525a436162 Fix some PHPStan errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 16:48:54 -03:00
Maurício Meneghini Fauth
4001839460 Upgrade PHPStan to v0.11.4 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-18 20:29:02 -03:00
Maurício Meneghini Fauth
ae7db62823 Fix TypeError on insert page when there are invisible columns 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-03-07 21:15:35 -03:00
Rob Ratcliffe
02c16b0acc Removing inline styles from php files and adding class to css 
Closes #14696

Signed-off-by: Rob Ratcliffe <rlr@tcliffe.codes>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-02-24 21:06:29 -03:00
Vincent Milum Jr
31b40f71bb Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536) 
Fixes #14514
Fixes #14515
Possible fix for #14516

 #14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views.

 #14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute.

 #14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters.

Signed-off-by: Vincent Milum Jr <git@darkain.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 3f6e360a4e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-02-15 17:27:55 -02:00
Vincent Milum Jr
3f6e360a4e Fix for SYSTEM VERSIONED tables #14514, #14515, and #14516 (#14536) 
Fixes #14514
Fixes #14515
Possible fix for #14516

#14514 Tables which enable the new MariaDB 10.3 versioning show up as "SYSTEM VERSIONED" instead of "BASE TABLE" inside of information schema. This patch now checks for both, so these new table types don't incorrectly display as views.

#14515 MariaDB 10.3 also supports INVISIBLE columns, which is optionally paired with SYSTEM VERSIONED tabled (or implemented separately). This patch helps handle this new column attribute.

#14516 This patch cannot be fully tested and verified with current MariaDB builds. Version 10.3.9 (currently unreleased) corrects an issue with column information for SYSTEM VERSIONED columns that this patch relies on. https://jira.mariadb.org/browse/MDEV-16804 - the reason for checking with preg_match instead of adding to the list is because there are now combined "extra" information for columns, such as INVISIBLE columns. Just matching entire strings also has a bug with these other "extra" parameters.

Signed-off-by: Vincent Milum Jr <git@darkain.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-02-15 14:16:13 -02:00
Hugues Peccatte
f1e140be05 Reduce nested ifs 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-01-12 23:06:04 +01:00
Maurício Meneghini Fauth
25e480666e Fix doc comments alignment 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-07 15:09:32 -02:00
Maurício Meneghini Fauth
23c3579804 Format array declarations 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-07 14:31:39 -02:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
3a7e1503ac Fix some coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-04 19:42:10 -02:00
William Desportes
ca072c96d9
fix #14749 - Uncaught TypeError in routines 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-27 11:57:38 +01:00
ales-bulko
0be9c13689 Fixes #14658 - Regression on multi table query (#14681) 
Added functionality to generate SELECT query with JOINs of requested tables. It was mentioned that it's just a bug and it was working in previous versions, but I did not see any code fragments that would make it possible. Please, feel free to suggest any better solution if you don't like that one.

Fixes #14658

Signed-off-by: Aleš Buľko <ales.bulko@student.tuke.sk>
(cherry picked from commit 23ce7cec52)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-26 20:59:58 -02:00
ales-bulko
23ce7cec52 Fixes #14658 - Regression on multi table query (#14681) 
Added functionality to generate SELECT query with JOINs of requested tables. It was mentioned that it's just a bug and it was working in previous versions, but I did not see any code fragments that would make it possible. Please, feel free to suggest any better solution if you don't like that one.

Fixes #14658

Signed-off-by: Aleš Buľko <ales.bulko@student.tuke.sk>
 2018-11-26 20:34:09 -02:00
Tomas Votruba
38301a6a9f fixup! [cs] remove unused brackets, clean unused property assign 
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
 2018-11-26 17:55:14 +01:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign 
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
 2018-11-26 17:54:40 +01:00
Tomas Votruba
bf720bad29 remove unused and fix @param, @var and @return annotation values 
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
 2018-11-24 21:47:26 +01:00
Maurício Meneghini Fauth
d4b4124a5e Remove $GLOBALS['dbi'] from Relation class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-30 19:05:09 -03:00
Maurício Meneghini Fauth
9b69b7936f Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-15 01:29:26 -03:00
William Desportes
8a7f2c30ef
Fix getDatabasesFull query 
Execute: $this->dbi->getDatabasesFull("pma_test")
Fixes missing space after alias

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:32 +02:00
William Desportes
e816e45c18 phpstan level 0 (#14405) 
* Fix phpdoc @return

- Fixed @return typehint

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix incorrect case on function calls

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Type hint + typo fix

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fixes

- @return fix
- @var fix
- Class names
- Throws fix
- test/classes/Plugins/Export/ExportSqlTest.php any() invoked with 1 parameter, 0 required
-  libraries/classes/Controllers/Table/TableStructureController.php Array has 2 duplicate keys with value 'columns_list'
- Call parent constructor  libraries/classes/Error.php

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Access to an undefined property

- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\PdfRelationSchema::$diagram_row
- Access to an undefined property PhpMyAdmin\Plugins\Schema\Pdf\Pdf::$cMargin
- Undefined properties

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Update config

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix bootstrap-phpstan

Signed-off-by: William Desportes <williamdes@wdes.fr>

* Fix typos and phpstan config

Fixes: #14399
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-06-25 20:34:46 -03:00
Maurício Meneghini Fauth
2d58411bee Some coding style fixes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-06-18 21:30:06 -03:00
Isaac Bennetch
9b28b02582 Fixes #14400, another Uncaught TypeError 
This one in the database structure page when dropping multiple tables.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-06-16 16:37:09 -04:00
Maurício Meneghini Fauth
2005cca77f Fix methods and properties visibility issues 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 21:02:26 -03:00
Maurício Meneghini Fauth
285e38e931 Fix some PSR-2 coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 09:07:56 -03:00
Maurício Meneghini Fauth
b9c0463d96 Use short array syntax instead of long array syntax 
Replaces array() with [].

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-30 01:42:21 -03:00
Maurício Meneghini Fauth
6cf8ee0831 Enable strict mode in some classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:03:57 -03:00
Michal Čihař
35e13eada7 Merge branch 'QA_4_8' 2018-05-02 12:14:41 +02:00
William Desportes
8af0343bb2 Patch for issue #14246 
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-05-02 12:13:49 +02:00
Maurício Meneghini Fauth
a6e313a3d3 Add type declarations to DatabaseInterface 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-28 17:11:51 -03:00
Maurício Meneghini Fauth
89c3fa902b Add constant visibility to DatabaseInterface 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-28 05:29:41 -03:00
Maurício Meneghini Fauth
e83f739218 Drop support for mysql extension 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-12 22:57:05 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-25 19:32:13 -03:00
Gabriel Caruso
6ff73257e2 Simplify returns 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-16 10:16:56 -02:00
Michal Čihař
1ebf6c4953 Remove references to sourceforge.net issue trackers 
We do not use it for years and all issues have been migrated.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-02 13:24:05 +01:00
Gabriel Caruso
a8bd364e02 Clean elses 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2017-12-14 22:02:17 -02:00
Maurício Meneghini Fauth
c930c7a030 Fix coding standard errors 
Automatic fixes by phpcbf.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:40:36 -02:00
Maurício Meneghini Fauth
01fd301003 Use 'elseif' keyword istead of 'else if' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-12-04 13:31:25 -02:00
Michal Čihař
3b6a994dcd Move collation connection setting to user preferences 
It is now handled same way as other user settings.

Issue #11688
Issue #13466

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-29 14:16:31 +01:00
Michal Čihař
0f79721570 Remove not needed param from DatabaseInterface::postConnect 
It is called only for user link, so there is no need to make that
parameter.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:30 +01:00
Michal Čihař
2bc8afea5f Move storage zeroconfig to the DBI post connect 
This way it is executed only when needed.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:23 +01:00
Michal Čihař
1f968ce29b Fix setting variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:24:45 +02:00
Michal Čihař
2c248fa83d Fix documentation for DatabaseInterface::getDefinition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00
Michal Čihař
ae0a259bac Move link parameter as last in getTablesFull 
It is currently not used here, so move it to the end.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-25 10:21:18 +02:00