Commit Graph

64 Commits

Author SHA1 Message Date
William Desportes
76cbe9f961
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-26 21:05:09 +01:00
Saurabh Srivastava
47fe92099b Fix #14853 - Insert page should not allow entering things into virtual columns
Fixes: #14853
Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
2019-03-26 20:55:09 +01: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
Maurício Meneghini Fauth
fedad552cc
Merge pull request #14849 from Tithugues/feature/replace-regexp-when-simple
Replace regular expressions when simple
2019-01-16 02:14:51 -03:00
Hugues Peccatte
9406e922cc Update PHPDoc
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-13 09:52:46 +01:00
Hugues Peccatte
6358cd49dc Fix wrong case in function names
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-12 13:36:27 +01:00
Hugues Peccatte
746fd8b417 Replace regular expressions when simple
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-12 02:06:28 +01:00
Maurício Meneghini Fauth
ae20364830 Upgrade phpmyadmin/coding-standard to v1.0
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-08 01:26:26 -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
999b4d14f0 Fix some coding standard errors
- Fixes array identation
- Removes empty statements

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:25:08 -02:00
Maurício Meneghini Fauth
38e5b12c1c Define an absolute path to use for require statements
Fixes #6167

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-22 14:37:31 -02:00
Maurício Meneghini Fauth
ef5d7dd66b Use Bootstrap buttons component
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:01:12 -02:00
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 00:12:54 -02:00
Maurício Meneghini Fauth
76d8bfdafa Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-12 21:04:19 -02:00
Madhura Jayaratne
d4ed31339a
Merge pull request #257 from phpmyadmin/bug-245
Fix #245 Remove transformation plugin includes
2018-12-04 19:55:29 +11:00
Maurício Meneghini Fauth
6a1ba61e29 Remove transformation plugin includes
Tranformation plugins should be loaded by the autoloader.

Fixes https://github.com/phpmyadmin/phpmyadmin-security/issues/245

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-27 18:44:30 -02: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
William Desportes
2c407224ef
phpstan level 2 - Fix plugins
The type is clearly a stdClass (see plugin template)

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-25 13:57:58 +01:00
William Desportes
cc2665121d
phpstan level 2 - fixes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-25 13:57:57 +01:00
William Desportes
bcefdd79fa
phpstan level 2 - Fix phpdoc
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-11-25 13:57:55 +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
d7affca556 Fix uncaught TypeError in Util::printableBitValue
Fixes #14718

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-12 21:50:42 -02:00
Maurício Meneghini Fauth
e7e7d56c75 Retrieve parameters from $_POST in browse foreigners
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:59 -02:00
Maurício Meneghini Fauth
3d9ed655cc Retrieve parameters from $_POST in insert/edit pages
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:58 -02:00
Mohammad Reza Mansouri
9e12c61055 consistent go button position (#14680)
* moves Go button to right on edit and insert tabs.
* moves Go button to right on import and export tabs.

Signed-off-by: beekalam <beekalam@gmail.com>
2018-11-03 17:53:17 -03: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
William Desportes
3dce65d913 phpstan level 1 (#14472)
* level +1
* Install sami/sami globaly to avoid dependency clash

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-08-18 14:37:41 -03:00
Lakshay arora
bdecea68df Increase input field width for varchar (#14379)
* Increase input field width for varchar
* Changed test cases for insertEdit

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-08-03 17:17:42 -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
Maurício Meneghini Fauth
244d4e8e81 Replace Template::get calls in libraries/classes
Uses Template::render() instead of Template::get().

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-06-18 18:18:24 -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
Maurício Meneghini Fauth
8bd91ffdaa Automatic phpcs fixes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-12 03:14:00 -03:00
Maurício Meneghini Fauth
aa32ace0dc Refactor FileListing methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-09 22:07:45 -03:00
William Desportes
c19dec2c47
Revert modifications/error
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-05-10 00:06:15 +02:00
Maurício Meneghini Fauth
dc72341b75 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-08 07:44:19 -03:00
Maurício Meneghini Fauth
de250fbae3 Fix MariaDB 10.2 current_timestamp()
Fixes #13968 and fixes #13999. Closes #14177.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-08 07:39:53 -03:00
William Desportes
e9d3fdd493
Binary foreign key enhancement #13894
Closes: #13894
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-05-02 15:23:42 +02:00
Maurício Meneghini Fauth
c73e72e7ca Refactor PhpMyAdmin\Transformations static methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-01 01:34:17 -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
Maurício Meneghini Fauth
9273cbe8ce Some coding style fixes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00
Maurício Meneghini Fauth
010c6aab57 Use DI for DatabaseInterface dependency
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00
Maurício Meneghini Fauth
76b0f64f21 Fix visibility of the methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00
Maurício Meneghini Fauth
e0b9ff1c00 Replace static methods with instance methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:56 -02:00
Maurício Meneghini Fauth
0db0ba0c55 Use template for getContinueInsertionForm method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-27 22:52:43 -02:00
Saksham Gupta
32a9d406d4 Allow Custom number of rows to be inserted
Enhances : https://github.com/phpmyadmin/phpmyadmin/issues/13578

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
2017-12-19 00:51:13 +05:30
Michal Čihař
7a83d83309
Merge pull request #13868 from carusogabriel/clean-elses
Clean elses
2017-12-15 08:41:50 +01:00