gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,867 Commits 12 Branches 481 Tags 2.4 GiB
3bdf520bcb
Commit Graph

59 Commits

Author SHA1 Message Date
Hugues Peccatte
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
Madhura Jayaratne
679015ea52 rfe #1552 CSV import: Allow "Columns escaped with" to be optional 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 12:58:48 +05:30
Madhura Jayaratne
a22bb26d7e Remove extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:42:21 +05:30
Madhura Jayaratne
cdc6a584aa Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:17:09 +05:30
Madhura Jayaratne
598435fdda Spaces around - operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:13:23 +05:30
Madhura Jayaratne
6f9367b165 rfe #1192 ON DUPLICATE KEY UPDATE for loading CSV 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-06 14:54:34 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Hugues Peccatte
fe7b5bb23d Replace uses of string iterators by use of mb_substr. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-30 22:05:50 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
d4bbde9ec5 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:05:00 +02:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
800dc32e23 Remove useless code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:44:27 -04:00
Marc Delisle
7c74053c15 Remove dead assignments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 13:04:57 -04:00
Marc Delisle
208adc20ee Merge commit '5f2adcb' 2014-08-29 12:03:40 -04:00
Ashutosh Dhundhara
5f2adcb9ca Bug #4527: Importing ODS files with column names having trailing spaces fails. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-29 20:39:34 +05:30
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Chanaka Indrajith
cf6a8ce4e1 Fixed documentation issue related to argument type mismatching in ImportCsv.class.php file, raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 18:11:10 +05:30
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
d30b1d314d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 07:33:52 -05:00
Smita Kumari
a8052ee602 adding explanation to parameter names 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 17:19:56 +05:30
Smita Kumari
6f095c8a3c Feature Request #1418, added new function docblock 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 00:12:19 +05:30
Marc Delisle
e08c4449e6 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:38:54 -05:00
Smita Kumari
66952d75b1 Implemented Feature request #1418: using string as Column_Sepearted_With parameter 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:26:47 -05:00
Madhura Jayaratne
74aebe629b Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:06:02 +05:30
Marc Delisle
088b0f7818 Fix coding style 2013-11-21 06:51:52 -05:00
slimtim
2e7c024df6 When importing a CSV file force a trailing new line at EOF to prevent parsing problems. (bug #4133) 2013-11-20 16:43:01 -05:00
Hugues Peccatte
7e1e6e5691 Add initialization of some variables and useless code. 2013-11-11 18:56:46 +01:00
Michal Čihař
dc809d6a8d Properly use global offset variable 2013-07-10 14:53:04 +02:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Madhura Jayaratne
d7db600379 Merge branch 'QA_4_0' 2013-05-20 17:53:15 +05:30
Madhura Jayaratne
b3e6f8cee7 bug #3924 Show warning when CSV file does not contain data for all columns 2013-05-20 17:50:19 +05:30
Marc Delisle
4bdd15fd33 Fix merge conflicts 2013-05-19 08:55:36 -04:00
Marc Delisle
9b61212b48 bug #3946 Missing CSV import option "Do not abort on INSERT error" 2013-05-19 08:44:45 -04:00
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Marc Delisle
13c6e82551 Fix merge conflicts 2013-05-12 08:18:08 -04:00
Marc Delisle
4113d9e98b bug #3915 Import of CSV file (Replace table data with file) with duplicate values 2013-05-12 08:09:02 -04:00
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp 
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
 2013-05-01 00:51:15 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Michal Čihař
69118c1134 Various PHP coding style fixes 2013-04-26 09:54:13 +02:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
 2013-04-25 20:54:51 +05:30
Michal Čihař
49a58c54d3 Consitent parameters naming 
Use same names in preferences and error messages as in export page.
 2013-04-25 14:38:41 +02:00
Kasun Chathuranga
edbe925d8a Minimize code duplication by pushing most of the common code to abstract parent class's setProperties() method 2013-04-19 23:00:22 +05:30
Kasun Chathuranga
175cb7b0ae Fix format specific options that were missing from ImportLdi plugin. Common code pulled out to AbstractImportCsv.class.php. 2013-04-18 22:44:49 +05:30
Kasun Chathuranga
4477494216 Importing CSV was also broken 2013-04-17 23:25:53 +05:30
Dieter Adriaenssens
f14aef2866 remove unused variables 2013-01-24 17:31:06 +01:00
Madhura Jayaratne
c9f37be407 Add @subpackage tags 2012-10-28 18:27:38 +05:30
Michal Čihař
869d7c0e99 Use single quotes when we do not want to evaluate the string 2012-10-16 11:18:16 +02:00