gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,073 Commits 12 Branches 481 Tags 2.4 GiB
176d63f108
Commit Graph

202 Commits

Author SHA1 Message Date
Michal Čihař
76b10187c3 Fallback to default collation connection 
If user supplied wrong string we should gracefully fallback.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 15:00:19 +01:00
Michal Čihař
c197c3fba5 Fix handling of databases with dot in a name 
We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 17:06:58 +01:00
Michal Čihař
e405586584 Avoid conversion of MySQL error messages 
The messages are properly encoded based on connection collation. This
seems to be the case since introduction of the collations, but the code
has stayed in phpMyAdmin since the times before it.

Fixes #11788

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 11:49:32 +01:00
Michal Čihař
17930c26df Properly report error on connecting 
The $link can be false at this point and DBI backends handle this
correctly to get global error. This usually happens on connecting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 12:13:47 +01:00
Madhura Jayaratne
74dcc98f11 Merge branch 'QA_4_4' into QA_4_5 2015-09-18 20:57:01 +10:00
Madhura Jayaratne
89d10fcbb6 Fix #11487 Warning when entering Query page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-18 20:55:13 +10:00
Madhura Jayaratne
9131b59936 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:34:47 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:31:52 +10:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-03 09:53:34 +10:00
Marc Delisle
c7342b7ffd Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:37:58 -04:00
Marc Delisle
9642af4ed5 Fixes #11447 MySQL 5.5 and the language system variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:32:50 -04:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 17:10:32 +10:00
Marc Delisle
c6a3671e6c Fixes #11434 Class 'SqlParser\Lexer' not found 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-28 08:19:40 -04:00
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Dan Ungureanu
b6fc66649e Added tests for sql.lib.php and parse_analyze.inc.php. 
Removed dead code.
Fixed miscellaneous issues.
Fixed a bug in PMA_isJustBrowsing().
Updated sql-parser library to udan11/sql-parser@e713c9f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Madhura Jayaratne
6711e4a520 We shouldn't be setting PMA_DRIZZLE arbitrarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 12:07:20 +05:30
Madhura Jayaratne
29184d4e57 Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 11:56:37 +05:30
Madhura Jayaratne
dcd537e4c4 New 'sys' schema (http://mysqlserverteam.com/the-mysql-sys-schema-in-mysql-5-7-7/) is a system schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 11:52:10 +05:30
Madhura Jayaratne
ac672d967e Opening braces should be on a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 08:06:09 +05:30
Madhura Jayaratne
1cd690b11f Fix doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:53:39 +05:30
Hugues Peccatte
e29101e06f Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 22:20:28 +02:00
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
2e47bb08eb bug #4967 Field named '0' is not recognized 2015-06-23 10:38:12 +05:30
Madhura Jayaratne
81659dc2cb Match the old query, so the tests won't complain 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 08:17:20 +05:30
Madhura Jayaratne
eac19b87ad bug #4966 MySQL errors are not shown when DebugSQL is enabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 19:47:58 +05:30
Madhura Jayaratne
b91101e190 Make the method more generic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 10:30:38 +05:30
Nisarg Jhaveri
d608832a9d Group/Ungroup queries in console SQL debug 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 20:23:53 +05:30
Nisarg Jhaveri
e524023def SQL debugging in console 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 15:52:13 +05:30
Hugues Peccatte
3827e3e988 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-12 22:24:32 +02:00
Jason
4ecdba9100 Refactoring tbl_indexes.lib.php & tbl_chart.lib.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-06-08 21:54:27 +08:00
Madhura Jayaratne
c37a3d9bb0 Inline control structures are discouraged 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:33:06 +05:30
Madhura Jayaratne
fd7907a041 Opening braces should be in a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:31:53 +05:30
Madhura Jayaratne
1de1cd6c8d Identify MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 16:02:00 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30
Hugues Peccatte
e1d0646fed Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-23 01:21:30 +02:00
Madhura Jayaratne
d465bc0e5f Fix collation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 19:00:04 +05:30
Madhura Jayaratne
535c1a4cb5 Adhere to DisableIS here as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:19:19 +05:30
Madhura Jayaratne
9323bd5044 Allow avoiding querying information_schema for listing routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 16:10:55 +05:30
Madhura Jayaratne
f2fc6b335d There is a comment field for routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 15:29:45 +05:30
Madhura Jayaratne
7d9222fbfc Match column names returned by SHOW query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:44:09 +05:30
Madhura Jayaratne
1b968b4e87 Respect DisableIS directive when fetching events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:43:12 +05:30
Madhura Jayaratne
5abed64ae1 Remove unused parameter 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:08:07 +05:30
Madhura Jayaratne
75d5890022 bug #4910 Slowness due to large number of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-19 12:00:13 +05:30
Jason
ce3c8b0c66 Refactoring tbl_view.lib and add PMA\Template 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-15 03:48:25 +08:00
Madhura Jayaratne
5857fe163d Fix spacing after opening brace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:05:08 +05:30
Marc Delisle
0fe34e4ef2 Merge branch 'QA_4_4' 2015-04-21 11:28:35 -04:00
Marc Delisle
b0ddd7e743 bug #4861 Use of undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-21 11:28:08 -04:00
Madhura Jayaratne
c177ebeaea Avoid loose comparing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:11:12 +05:30