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

16001 Commits

Author SHA1 Message Date
Madhura Jayaratne
e0923d54e2 Merge branch 'QA_4_6' into bug12234 2016-10-12 11:44:21 +11:00
Madhura Jayaratne
088d2c36f6 Fix string concatenation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-10-12 09:52:37 +11:00
Deven Bansod
2fdb15c36e Replace call to an old and unavailable function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-11 11:44:26 +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
Michal Čihař
ddf580c51b Fix OmniWeb version match (issue #12615) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:02:02 +02:00
Michal Čihař
cd4c8374b1 Fixed regexp for matching browser versions 
Fixes #12615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:51:29 +02:00
Deven Bansod
26c7a58533 Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 
Fix #12419 wrong description on GRANT option of table/routine privileges
 2016-10-04 10:54:21 +05:30
Michal Čihař
0292b89c4a Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 2016-10-03 19:35:07 +02:00
Michal Čihař
4e020dea6b Update SQL parser to 3.4.10 
Fixes #12612

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 18:29:05 +02:00
Michal Čihař
aa19ffde32 Update SQL parser to 3.4.9 
- issue #12316 Correct export of complex SELECT statements
- issue #12080 Fixed parsing of subselect queries
- issue #11740 Fixed handling DELETE ... USING queries
- issue #12100 Fixed handling of CASE operator

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 16:06:10 +02:00
Deven Bansod
6a53b89cb7 Escape database name properly to be used in MySQL wildcard statements 
Fix #12602

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 14:14:11 +05:30
Deven Bansod
4fb7d73401 Don't assume justBrowsing if there is a Join in the query 
Fix #12189

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 10:50:32 +05:30
Deven Bansod
96eba72fa6 Fix #12327: Show as PHP No longer works 
Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:47:31 +05:30
Michal Čihař
a1c27b957c Cleanup code for getting table information 
Fixes #12475

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:44:57 +02:00
Michal Čihař
d956922a61 Remove duplicate code in SQL escaping 
Fixes #12508

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:40:04 +02:00
Michal Čihař
b6263ede84 Use example.com as example domain 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:20:08 +02:00
Deven Bansod
2f0ec14993 Refactor check function instead of separate function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-23 11:12:06 +05:30
Deven Bansod
19c91010c6 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-09-22 14:10:37 +05:30
Deven Bansod
5a9813e11f Do not backquote the user and host if already backquoted 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 14:09:36 +05:30
Michal Čihař
b83ba03bd4 Merge pull request #12580 from devenbansod/fix_12321 
Assign LIMIT clause only to syntactically correct queries
 2016-09-22 09:50:16 +02:00
Deven Bansod
f4877a7826 Assign LIMIT clause only to syntactically correct queries 
Assigning LIMIT clause to an syntactically-wrong query is not needed.
Also we would want to show the true query and the true error message to the query executor

Fix #12321

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:26:02 +05:30
Deven Bansod
2d69d40fa2 Fix error in adcaf7c 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:01:47 +05:30
Deven Bansod
adcaf7ca4b Use intval to prevent XSS instead, and use numeric to check valid datatype 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:24:00 +05:30
Deven Bansod
38cb18b0de Fix #12242 : Edit routine detail dialog does not fill "Return length" field in mysql functions 
Use correct field to get the details about the length of returning value's datatype

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 17:00:15 +05:30
Michal Čihař
d519c9039e Update SQL parser to 3.4.7 
- issue #12298 Fixed export of view definitions

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-20 09:11:55 +02:00
Michal Čihař
f7f03127f7 Store create options in serapate array instead of polluting global namespace 
This is just a minor cleanup to avoid possible problems when MySQL
create table options would collide with our variable names.

See also issue #12567

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-19 11:34:43 +02:00
Michal Čihař
bccd690673 Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 2016-09-19 10:50:39 +02:00
Michal Čihař
e2ac325a7a Merge remote-tracking branch 'origin/pull/12557' into QA_4_6 2016-09-19 10:46:56 +02:00
Michal Čihař
b5c10991e9 Merge pull request #12553 from devenbansod/fix_12320 
Fix #12320 : Copying a user does not copy usergroup
 2016-09-16 10:36:41 +02:00
Michal Čihař
3424fae642 Merge pull request #12548 from devenbansod/fix_12518 
Fix Export and Copy of Tables with Generated/Virtual columns
 2016-09-16 10:34:02 +02:00
Deven Bansod
a52597f048 Include explaning statements near related code 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:56:15 +05:30
Deven Bansod
023ced3552 Don't use PMA_DROP_IMPORT on Table insert if it has Blob field 
If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files feature
on Table Insert page with blob field

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:55:46 +05:30
Deven Bansod
815bf44584 Fix error messages to suit better localization 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:50 +05:30
Deven Bansod
f8ea67f2bc Fix #12530: Show enabled links for Edit and Execute after proper priv checks 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:34 +05:30
Michal Čihař
ee7d7d0b45 Fixed rendering BBCode links in setup 
The URL validation needs to be adjusted for setup as the links need to
go one level up.

Fixes #12512

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 09:47:29 +02:00
Michal Čihař
b593bfeb7c Update SQL parser to 3.4.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 16:04:50 +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
Michal Čihař
16474f3dde Update SQL parser to 3.4.5 
- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 11:04:53 +02:00
Deven Bansod
5145c8c323 Fix #12320 : Copying a user does not copy usergroup 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 13:09:34 +05:30
Deven Bansod
bc589dfbbf Fix Class name 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:13:55 +05:30
Deven Bansod
7fdffa313f Fix label for Add User Group form 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:08:56 +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ř
42d54a938a Remove MySQL version caching 
In my testing the session/cache access is slower than fetching single
value from MySQL and calculating the values.

Also the caching would need some logic for invalidation as the server
can be upgraded or configuration changed.

Fixes #11924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:28:13 +02:00
Michal Čihař
28c981dd31 Merge pull request #12532 from devenbansod/fix_12531 
Fix #12531 : Properly flag queries as DROP DATABASE
 2016-09-06 11:31:53 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Deven Bansod
6bcc593c84 Fix 'Unsupported query' message from Travis logs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-05 23:00:12 +05:30
Michal Čihař
e803caed71 Use single quotes in PHP code 
Fixes #12405

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:23:21 +02:00
Michal Čihař
e01f404804 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:40:18 +02:00