Commit Graph

67 Commits

Author SHA1 Message Date
William Desportes
aa5a18659b
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-23 09:08:01 +01:00
William Desportes
2da5d8f390
Fix #14931 - count(): Parameter must be an array or an object that implements Countable, ./libraries/classes/Sql.php#1623
Fixes: #14931
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-03-23 08:53:12 +01:00
Dhyey Thakore
7d66500669 Fix #14607 - Count rows only if needed (#14821)
Signed-off-by: Dhyey Thakore <dhyey35@gmail.com>
(cherry picked from commit feca784567)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-03-05 16:13:38 -03:00
Dhyey Thakore
feca784567 Fix #14607 - Count rows only if needed (#14821)
Signed-off-by: Dhyey Thakore <dhyey35@gmail.com>
2019-03-05 16:12:14 -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
Maurício Meneghini Fauth
c44d0f8227 Fix broken tests
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-02-15 15:26:27 -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
f06883d2a7 Remove useless parenthesis
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-20 01:23:53 +01:00
Maurício Meneghini Fauth
728f61ec5d Extract HTML from PhpMyAdmin\Sql
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-15 03:50:38 -02:00
Maurício Meneghini Fauth
036a1877ae
Merge pull request #14848 from Tithugues/feature/update-phpdoc
Update PHPDoc
2019-01-14 22:52:54 -03:00
Maurício Meneghini Fauth
ca66136d99 Extract HTML from Sql::getHtmlForProfilingChart
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-14 02:33:33 -02:00
Maurício Meneghini Fauth
adef7b6f1c Extract HTML from Sql::getHtmlForBookmark
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-13 17:41:11 -02:00
Maurício Meneghini Fauth
2c5e6b17f6 Update PHPDoc returns
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-13 16:36:32 -02:00
Maurício Meneghini Fauth
8168dcf8ea Extract HTML from Sql::getHtmlForSqlQueryResults
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-13 12:39:50 -02: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
68b88d0537 Remove useless variables before return
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2019-01-12 01:33:22 +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
3a7e1503ac Fix some coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-04 19:42:10 -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
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
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
5109c1787e Retrieve parameters from $_POST in sql pages
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-11-10 20:48:58 -02:00
Maurício Meneghini Fauth
9b54078b07 Fix uncaught TypeError @ executeQueryAndGetQueryResponse
Fixes #14626

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-09-25 16:47:30 -03:00
Maurício Meneghini Fauth
fff7c5736c Remove $GLOBALS['dbi'] from Operations class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-09-15 18:51:39 -03:00
Maurício Meneghini Fauth
ddd43a25e1 Remove $GLOBALS['dbi'] from RelationCleanup class
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-09-02 12:53:47 -03:00
Maurício Meneghini Fauth
c5cda26fa8 Refactor RelationCleanup methods
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-31 00:44:03 -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
Isaac Bennetch
61a00bdeb8 Merge branch 'QA_4_8' 2018-08-22 08:44:34 -04:00
Maurício Meneghini Fauth
0f3eed1755 Remove object type declarations
'object' type declaration require PHP 7.2

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-18 15:26:02 -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
Madhura Jayaratne
00d90b3ae4 Fix #14548 [security] HTML injection in import warning messages
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-08-18 23:19:58 +10: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
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
Lakshay arora
0da5857b5d Fix for issues with spatial fields (#14125)
*  Fix for issues with spatial fields

Fixes the following issues:

1.    #14068 SPATIAL fields with no unique index/autoincrement error when clicking
      This error occurs when there is no unique column to uniquely identify a tuple. I've disabled the geomtery view and made view as wkt the default view in such cases.

2.    #14121 View spatial fields as WKT doesn't work

1.    #14067 IS NULL search operator produces no WHERE SQL with spatial fields

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields
This commit fixes view as BINARY not working in the previous commit.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields

Fixes typo in previous commits.

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 9231620c2d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-12 03:54:28 -03:00
Lakshay arora
9231620c2d Fix for issues with spatial fields (#14125)
*  Fix for issues with spatial fields

Fixes the following issues:

1.    #14068 SPATIAL fields with no unique index/autoincrement error when clicking
      This error occurs when there is no unique column to uniquely identify a tuple. I've disabled the geomtery view and made view as wkt the default view in such cases.

2.    #14121 View spatial fields as WKT doesn't work

1.    #14067 IS NULL search operator produces no WHERE SQL with spatial fields

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields
This commit fixes view as BINARY not working in the previous commit.
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

* Fix for issues with spatial fields

Fixes typo in previous commits.

Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
2018-05-12 03:44:58 -03:00
William Desportes
c19dec2c47
Revert modifications/error
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-05-10 00:06:15 +02: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
0889b52c36 Replace static methods with instance methods
Replace PhpMyAdmin\Sql static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-27 17:39:16 -03:00
Maurício Meneghini Fauth
a862add418 Replace static methods with instance methods
Replace PhpMyAdmin\Operations static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-25 12:43:49 -03:00
Michal Čihař
89d40d5e8d Merge branch 'QA_4_7' 2018-01-16 16:02:38 +01:00