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

166 Commits

Author SHA1 Message Date
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
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
2dcb1c9b0a Fix #4645 Import of export created with mysqldump 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-21 22:57:25 +01:00
Madhura Jayaratne
077916c82a bug #3794 failure to handle repeating empty columns when importing ODS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:18:28 +05:30
Madhura Jayaratne
b6f0d923b2 More long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 18:01:58 +05:30
Hugues Peccatte
58c629f6fd Merge branch 'master' into b4495_master 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-11-10 13:48:33 +01:00
Hugues Peccatte
ed51a25c8f Allow import SQL without delimiter till EOF. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 22:54:44 +01:00
Hugues Peccatte
fe3941b9bd Fix #4495 Comment lines in multiquery 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 20:02:10 +01:00
Hugues Peccatte
93c86da700 Minor style modifications. 
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 17:34:10 +01:00
Hugues Peccatte
6827afb2bd Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:36:21 +01:00
Hugues Peccatte
aa9700de68 Replace parameters by class attributes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-08 15:25:40 +01:00
Hugues Peccatte
f15e658b56 Fix wrong test in ImportMediawiki. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-03 19:38:04 +01:00
Hugues Peccatte
01ffac5f39 Refactor code in ImportMediawiki.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 15:18:06 +01:00
Hugues Peccatte
5e7fa3b821 Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:52:20 +01:00
Hugues Peccatte
fd7f02f929 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:33:41 +01:00
Hugues Peccatte
c0b0dc2e35 Add PHPDoc comments in ImportSql.class.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 19:54:36 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
3b3017d7ae Manage SQL display. 
Rename attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 22:13:28 +01:00
Hugues Peccatte
3301bc3c8e Display delimiter into SQL trace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 21:48:51 +01:00
Hugues Peccatte
e85b43b8b2 Remove unused variable. 
Rename parameter.
Update PHPDoc.
Fix data parsing.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-28 20:39:56 +01:00
Hugues Peccatte
ba346c2731 Manage data as an attribute. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-26 17:11:40 +01:00
Hugues Peccatte
c8b10dad32 Improve data parsing. 
Fix DELIMITER detection issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-26 14:53:42 +01:00
Hugues Peccatte
1cbfa5612e Refactor some code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 18:39:10 +02:00
Hugues Peccatte
b857bc0c92 Log query while importing SQL. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 16:53:05 +02:00
Hugues Peccatte
4060c08848 Fix import. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 13:09:50 +02:00
Hugues Peccatte
f53f940366 Refactor. 
Remove useless method.
Update comments.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 13:04:07 +02:00
Hugues Peccatte
bbe0cc9c3c Manage errors in import process. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:42:19 +02:00
Hugues Peccatte
dec77b5796 Remove old import process. 
Minor coding stylo modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:38:11 +02:00
Hugues Peccatte
35bbe992d0 Remove var_dump. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:32:13 +02:00
Hugues Peccatte
14bda32169 Fix delimiter reading. 
Rum last SQL query.
Fix SQL reading.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:23:15 +02:00
Hugues Peccatte
3363f10880 Rename ImportSQL method. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 21:06:17 +02:00
Hugues Peccatte
4b9058faa9 Manage escaped quotes. 
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 23:57:54 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 20:31:54 +02:00
Hugues Peccatte
2da2c4caf6 Reduce size of data to read. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:51:02 +02:00
Hugues Peccatte
713a4ef901 Execute query. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:45:43 +02:00
Hugues Peccatte
3f9b63f572 Improve SQL reading. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:36:54 +02:00
Hugues Peccatte
5cfefb8f82 Fix comment read. 
Improve loops.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-10 22:20:33 +02:00
Hugues Peccatte
389763e16e Test to parse SQL in a different way. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 22:15:40 +02:00
Hugues Peccatte
9ca79b379d Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 14:15:42 +02:00
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
73d376d14a Remove old @todo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-20 20:17:44 +02:00
Hugues Peccatte
d510e19e77 Fix 14528: Fix SQL import. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-16 22:23:42 +02:00
Hugues Peccatte
e85eddb01f Fix #4528 Can't import dump via SQL field 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-13 23:10:57 +02:00
Hugues Peccatte
70366f31c1 Move method definition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:09:48 +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