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

180 Commits

Author SHA1 Message Date
Madhura Jayaratne
0e7ac33cb4 Merge branch 'QA_4_4' 2015-05-07 18:03:19 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Madhura Jayaratne
7118974b92 Remove spaces before opening parenthesis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 16:20:48 +05:30
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
Madhura Jayaratne
5e7dca6968 Fix spacing after param name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:50:50 +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
be47fbac53 bug #4829 Create procedure via SQL Editor not more possible 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 20:56:57 +05:30
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:01:51 +05:30
Marc Delisle
3e8ed57470 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 07:52:26 -05:00
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
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
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