Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
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
Michal Čihař
c162a75b9b Improve javascript loading
- jquery-ui-timepicker-addon.js is loaded in Header, no need to load it
  elsewhere
- jquery.validate.js is needed on way to many pages to benefit of
  loading only on some of them

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-12-15 08:36:23 +01:00
Gabriel Caruso
a8bd364e02 Clean elses
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-14 22:02:17 -02:00
Michal Čihař
72f109a99c Accept SQL query only from POST requests
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-12-14 10:34:45 +01: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ř
77f0d50bea Add missing dependency on jquery.validate.js
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-29 15:09:43 +01:00
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-27 14:24:42 +01:00
Michal Čihař
f29640c5d8 Remove $strip_img parameter from Util::linkOrButton
It did not behave as documented for ages, it only influenced
whether additional text was added to the link.

Callers should use parameters to Util::getIcon to achieve this
(if it is actually needed somewhere)

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-16 15:41:27 +01:00
Michal Čihař
50c65bc3fb Remove no longer needed $new_form from Util::linkOrButton
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-16 15:33:53 +01:00
Michal Čihař
99e47a90d9 Always define correct connection type
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-25 10:21:18 +02:00
Michal Čihař
d574aede08 Bind Types to DatabaseInterface
This wayt it's automatically passed with DBI.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-10-10 12:05:02 +02:00
Maurício Meneghini Fauth
1d4125f15c Add array type declarations
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-24 23:49:59 -03:00
Maurício Meneghini Fauth
e555b77946 Refactor file_listing functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-11 22:58:58 -03:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-22 20:51:27 -03:00
Maurício Meneghini Fauth
8a2dd938ef Refactor insert_edit functions to static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-08-19 20:55:52 -03:00