Commit Graph

250 Commits

Author SHA1 Message Date
Isaac Bennetch
85fdd3cef3 Merge branch 'D-storm-so'
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
2014-06-13 09:43:56 -04:00
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-13 00:39:28 +05:30
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-09 22:44:07 +05:30
Ann + J.M
fea0fe03ef Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-06-04 18:02:44 +02:00
Marc Delisle
673fce8145 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-03 12:33:25 -04:00
Ann + J.M
5facff36bd Add missing break in # comment detection switch
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-21 21:43:20 +02:00
Ann + J.M
9207203a56 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:51:33 +02:00
Michal Čihař
28ba7dd094 Remove not needed initializations
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-06 19:25:05 +02:00
Michal Čihař
5094ec150c Set correct type for mysql type of comments
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-05-06 19:23:27 +02:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-20 09:36:48 +01:00
Marc Delisle
2fac99a707 Merge commit 'cd46fbe' 2014-01-21 05:54:07 -05:00
Marc Delisle
cd46fbef11 Another case for bug #4239
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-21 05:52:25 -05:00
Madhura Jayaratne
6335b10574 Fix coding style
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 14:35:15 +05:30
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:34:51 +01:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 22:13:10 +01:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Marc Delisle
99b477ffd4 Fix merge conflicts 2013-10-06 09:40:17 -04:00
Marc Delisle
a498a6c8cb bug #3995 Drizzle server charset notice 2013-10-06 09:32:24 -04:00
Michal Čihař
91bd7e4f0e Remove no longer needed doc name mappings 2013-08-07 08:11:32 +02:00
Michal Čihař
add10c5cd4 Wrap some long lines 2013-08-06 15:22:51 +02:00
Michal Čihař
4085726b5e Better formatting of if statements 2013-08-06 15:18:53 +02:00
Michal Čihař
b8ea23ab9f Drop $cfg['SQP']['fmtType']
It has no effect anyway and in case we would want to make syntax
highlighting optional, it needs to be done in javascript and needs
better configuration name than this one.
2013-08-06 13:35:09 +02:00
Michal Čihař
9473fb8fed Remove code for adding MySQL documentation links to query
This does not work anyway with CodeMirror based highlighter.
2013-08-06 12:00:06 +02:00
Michal Čihař
6bb21aec66 Do not try to add documentation links with disabled docs 2013-08-06 11:56:37 +02:00
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
adamgsoc2013
5ca23f337d add test case for parse_analyze.inc.php 2013-07-22 22:19:11 +08:00
adamgsoc2013
5bb741c886 add test case for PMA_SQL_parser 2013-07-19 00:21:10 +08:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Marc Delisle
98fa211957 Fix typo 2013-07-15 07:57:24 -04:00
Marc Delisle
8ce9acb65b Merge pull request #503 from scnakandala/gsoc_2013_2
Refactoring SQL executor
2013-07-14 13:05:14 -07:00
Spun Nakandala
6c9da035ff check for CALL transferred to the sql parser 2013-07-14 21:19:28 +05:30
adamgsoc2013
43f0653f50 add function in source file, so that sqlparser.data.php can be covered by PHPUnit 2013-07-14 22:13:39 +08:00
Michal Čihař
31a1167f19 End sentence with a stop 2013-07-12 14:58:09 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables
Found by PMD on our CI server
2013-07-10 14:53:05 +02:00
Marc Delisle
3e261e8c83 Fix typo 2013-06-23 15:22:05 -04:00
ayushchd
52c9617887 Group string type functions into classes, fix resp. tests 2013-06-21 00:15:29 +05:45
ayushchd
2e542c4f95 Group native and mb string functions into classes 2013-06-20 12:30:04 +05:45
Marc Delisle
27f5ec3b57 Merge pull request #428 from scnakandala/gsoc_2013
Refactoring SQL executor
2013-06-16 04:54:54 -07:00
Spun Nakandala
ac2dcec785 changed such that $first_reserved_word is checked for the reserved word SHOW 2013-06-15 22:04:32 +05:30
Spun Nakandala
00a3354499 changed to look the $first_reserved_word rather than any $upper_data 2013-06-15 20:55:56 +05:30
Spun Nakandala
7cecc2f23d code related to analyzing the sql query transferred to the sql analyzer 2013-06-15 14:50:31 +05:30
Marc Delisle
f4f710a3e2 - Fix typo
- Frames are gone!
2013-06-13 17:10:54 -04:00
Spun Nakandala
6f8152857b error corrected 2013-06-14 02:02:15 +05:30
Spun Nakandala
adf26c5223 documentation added for new queryflags (reload, drop_database) 2013-06-13 23:06:32 +05:30
Spun Nakandala
ae9ff0a8be check for drop database transfered to sql parser 2013-06-13 23:00:06 +05:30
Spun Nakandala
653bc9bd2c Checking for reload the navigation transfered to the sql parser 2013-06-13 23:00:04 +05:30
Marc Delisle
3216740323 No longer need to confirm at the PHP level 2013-06-13 12:34:05 -04:00
Marc Delisle
25a3a03e0c Merge pull request #415 from scnakandala/gsoc_2013
Refactoring SQL executor
2013-06-13 09:20:43 -07:00
Spun Nakandala
ca8d81b95c PMA_isDropDatabase($sql_query) method added to sqlparser.lib.php 2013-06-12 22:05:24 +05:30