gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,166 Commits 12 Branches 481 Tags 2.4 GiB
6ca6685ee0
Commit Graph

75 Commits

Author SHA1 Message Date
Michal Čihař
72572cb6c2 Merge branch 'QA_4_7' 2017-02-20 08:58:35 +01:00
Joshua Atkins
c4654d24df Copy db: Fix SQL error for copying PMADB metadata 
Fixes #13010.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-19 22:35:21 +01:00
Michal Čihař
fb25d6262b Merge branch 'QA_4_7' 2017-02-14 15:04:42 +01:00
Kyle Tse
2b6e5f8929 Allow to specify USING for TokuDB index 
Issue #12693

Signed-off-by: Kyle Tse <shtse8@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-14 14:02:32 +01:00
Michal Čihař
b55ff27f16 Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:25:26 +01:00
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Michal Čihař
a4a262c52a Merge branch 'QA_4_6' 2017-01-18 09:59:55 +01:00
Michal Čihař
89357ee0f1 Share code for getting lower_case_table_names value 
Issue #12861

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:58:29 +01:00
Mike Lewis
3bf78afeca Only convert table name to lower-case when installation forces it 
Issue #12861

A `lower_case_table_names` setting of `2` does not mean that the table needs to be forced to lower-case
This preserves case unless the `lower_case_table_names` setting is `1`, implying that lower-case should be forced

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-01-18 09:55:25 +01:00
Michal Čihař
98ef4de075 Merge branch 'QA_4_6' 2016-12-22 15:15:34 +01:00
Michal Čihař
1fb040a1df Fixed editing of virtual columns 
Fixes #12847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-22 15:15:20 +01:00
Deven Bansod
dabc2394c0 Merge branch 'QA_4_6' 2016-12-03 09:00:43 +05:30
Deven Bansod
fd231056ac $length can be blank, also precision in DEFAULT NULL is not required 
Fix #12778

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-03 08:54:19 +05:30
Michal Čihař
e4fa7a0ba5 Clarify that it expects uppercase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:56:07 +01:00
Michal Čihař
abfdb72259 Share code for isMerge method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:55:15 +01:00
Michal Čihař
1a99e008b0 Document todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:16:44 +01:00
Michal Čihař
ffda016966 Actually make isEngine work 
It did not have the current engine information...

Issue #12703, #12719

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 13:01:12 +01:00
arimourao
791a338946 Implement generic logic for checking table engine 
Fixes #12703

Signed-off-by: arimourao <amlima@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-01 12:33:45 +01:00
Michal Čihař
8c9f34eb8a Use https for links to dev.mysql.com 
Issue #12758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 12:18:43 +01:00
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Michal Čihař
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +01:00
Michal Čihař
5dc004dfe0 Merge branch 'QA_4_6' 2016-11-09 18:15:29 +01:00
Michal Čihař
14ccebbd4b Merge remote-tracking branch 'origin/pull/12685' into QA_4_6 2016-11-09 18:14:53 +01:00
Michal Čihař
2c90866b18 Merge branch 'QA_4_6' 2016-11-08 14:46:01 +01:00
Deven Bansod
1f439a4dcc Use a work around for testing if numRecords at least N 
Fix #12257

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-07 22:56:19 +05:30
Deven Bansod
9be7c55bd0 Allow for proper MySQL-allowed strings as identifiers 
Fix #12674

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-01 21:20:13 +05:30
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Michal Čihař
39f09e7aa9 Merge branch 'QA_4_6' 2016-10-25 10:31:26 +02:00
Michal Čihař
2c91327374 Merge pull request #12626 from madhuracj/bug12234 
Fix bug #12234 No page indicator in view
 2016-10-25 10:28:54 +02:00
Deven Bansod
7aad858dfb Merge branch 'QA_4_6' 
Conflicts:
	po/el.po
	po/ko.po
 2016-10-19 15:28:08 +05:30
Deven Bansod
1eac9c5ec2 Proper initialization of $_message variable according to value of $result 
While calling getDisplay, $_message should be an instance of PMA\libraries\Message.

Fix #12650

Also, spaces at the beginning of a table name are allowed if used inside backquotes.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-19 15:22:05 +05:30
Madhura Jayaratne
ba50cbb91c Fix bug #12234 No page indicator in view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-10-10 10:27:50 +11:00
Deven Bansod
4f023ac86a Allow for precision specification in TIMESTAMP datatype while editing/adding a column 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:36 +05:30
Deven Bansod
bd87fc0974 Merge branch 'QA_4_6' 2016-10-08 13:12:18 +05:30
Michal Čihař
6047e229b7 Merge branch 'QA_4_6' 2016-09-16 10:35:16 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Deven Bansod
37ff86315b Fix usage of backquote parameter in getNonGenerated func 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 16:31:59 +05:30
Deven Bansod
429c679f77 Fix tests, added testcase for Generated columns in moveCopy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 15:56:22 +05:30
Deven Bansod
4e534c977f Fix Export and Copy of Tables with Generated/Virtual columns 
We include only the non-generated columns insert using INSERT INTO .. SELECT .. FROM .. while copying data.

In Export too, we export the data of only the non-generated columns

Fix #12221
Fix #12518

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 14:18:26 +05:30
Michal Čihař
71336fb6cd Merge branch 'QA_4_6' 2016-08-25 14:33:57 +02:00
Michal Čihař
9882dcba3a Fixed editing of ENUM/SET/DECIMAL fields structure 
Fixes #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:33:21 +02:00
Michal Čihař
33348c5ed5 Allow to specify length of 0 
Issue #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:32:48 +02:00
Michal Čihař
be70f0c6bf Merge branches 'QA_4_6-security' and 'master' into master-security 2016-07-22 15:48:20 +02:00
Michal Čihař
28eb84ef43 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-22 15:48:09 +02:00
Michal Čihař
cd111e481a Merge branch 'QA_4_6' 2016-07-22 15:47:50 +02:00
Michal Čihař
99903101d9 Enfornce numeric field length when creating table 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-22 15:47:38 +02:00
Michal Čihař
24246115f5 Merge branch 'QA_4_6-security' into master-security 2016-07-12 17:43:52 +02:00
Michal Čihař
7ef96c5cdc Correctly escape MySQL username in queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 17:42:45 +02:00
Michal Čihař
fac96d342f Share code for columns formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:24:22 +02:00