Commit Graph

31 Commits

Author SHA1 Message Date
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
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Alex Marin
02c37994c1 oop: properties for ImportCsv 2012-07-30 14:25:04 +03:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Alex Marin
ab436a573c oop: fix display import plugins list bug 2012-06-19 14:53:04 +03:00
Alex Marin
f6c7bac2c7 oop: import - remove getters and setters for globals 2012-06-18 19:27:27 +03:00
Alex Marin
f21dfd6646 oop: ImportDocsql 2012-06-18 17:58:45 +03:00
Alex Marin
02e4babdb4 oop: ImportCsv 2012-06-18 17:37:39 +03:00