Commit Graph

284 Commits

Author SHA1 Message Date
Marc Delisle
05912b5c2c Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-04-10 06:11:24 -04:00
Smita Kumari
b21c43245d bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-04-09 22:07:38 +05:30
Aditya Sastry
fa88c27ad6 Adds the maximum table size to export option (Feature request 1515)
Added a textbox to the custom export options, in the loop where the
Exporting is done, I added a query which checks the current table's size.
If this size is greater than the limit specified we don't export the current
table.

Signed-off-by: Aditya Sastry <ganeshaditya1@gmail.com>
2014-03-22 20:21:19 +05:30
Hugues Peccatte
1b13ecac80 Fix use of a missing variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-02-28 22:07:52 +01:00
Madhura Jayaratne
0aae267d06 Merge branch 'QA_4_1' 2014-02-26 07:26:31 +05:30
Madhura Jayaratne
ff064833ec bug #4291 Unable to export comments in OpenDocument text format
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-26 07:22:04 +05:30
Madhura Jayaratne
b0cd856632 bug #4297 DROP DATABASE tick box in export no longer works
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-26 06:47:41 +05:30
Marc Delisle
cd998a4c62 Merge pull request #892 from Chanaka/rfe-1403
rfe-1403 : Support for export only triggers/stored procedures
2014-02-07 07:57:48 -05:00
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Marc Delisle
003ede0c61 Avoid undefined variable notices
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-05 10:20:40 -05:00
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Madhura Jayaratne
94c3be7f39 Merge branch 'QA_4_1'
Conflicts:
	export.php
2014-02-03 06:11:14 +05:30
Madhura Jayaratne
ceecaa41c1 bug #4263 Japanese character encoding not working properly when exporting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-03 06:06:19 +05:30
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:39:42 -05:00
Marc Delisle
69c24b78bb ChangeLog entry and fix explanation for bug #4209
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-01 06:19:39 -05:00
Jørgen Thomsen
685c1d3495 bug #4209 Missing compression in one case
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-01 06:18:19 -05:00
Marc Delisle
0e71a3b02c Remove misleading comment
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-31 08:36:19 -05:00
Marc Delisle
deb2be02d1 Refactor: new PMA_exportTable()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-31 08:33:38 -05:00
Marc Delisle
b84198ae6d Refactor: new PMA_exportDatabase()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-30 08:49:26 -05:00
Marc Delisle
7e7fe6dabb Unused variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-30 08:14:57 -05:00
Marc Delisle
15e22751fb Clarify function name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-29 08:05:17 -05:00
Marc Delisle
5031e4cad8 Refactor: new PMA_exportServer()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-29 06:31:44 -05:00
Marc Delisle
706e69e353 Refactor: new PMA_getHtmlForDisplayedExportHeader()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 07:59:35 -05:00
Marc Delisle
c9c87fa2f2 Remove unnecessary code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 07:37:33 -05:00
Marc Delisle
4c9a9d3d8a Refactor: new PMA_compressExport()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 07:19:05 -05:00
Marc Delisle
4e8f7d8380 Refactor: new PMA_closeExportFile()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-28 06:51:13 -05:00
Marc Delisle
8b8b2cf302 Missing message after refactoring
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-27 07:37:13 -05:00
Marc Delisle
b78ff4442e Refactor: new PMA_openExportFile()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-27 07:27:48 -05:00
Marc Delisle
77625d0bf3 Unused code, now that JavaScript is mandatory; export can no longer be requested as text if the format does not allow it
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-27 06:11:16 -05:00
Marc Delisle
8021f31e36 bug #4201 Exports are not compressed
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-26 09:08:23 -05:00
Marc Delisle
a3b2370aeb Refactor: new PMA_getExportFilenameAndMimetype()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-26 06:26:51 -05:00
Marc Delisle
d40e238e93 Refactor: new PMA_getMemoryLimitForExport()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-25 19:19:28 -05:00
Marc Delisle
4d913bb009 Refactor: new PMA_getHtmlForDisplayedExportFooter()
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-25 13:23:32 -05:00
Marc Delisle
edde7126ce Move functions to library file
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-25 09:18:29 -05:00
Marc Delisle
daedc76dc6 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-21 07:42:53 -05:00
Marc Delisle
fd943ed1cd Merge branch 'QA_4_1' 2013-12-19 06:29:13 -05:00
Marc Delisle
d3fc017131 Code cleanup
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-19 06:26:18 -05:00
Smita Kumari
675e457f50 bug fix #2760
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2013-12-18 19:17:59 +05:30
Hugues Peccatte
fb8ddb4a99 Fix PHPCS errors/warning from jenkins.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-10 21:57:16 +01:00
Madhura Jayaratne
064944a0b0 Fix indentation 2013-11-10 22:30:58 +05:30
Marc Delisle
04309b2645 Fix coding style 2013-11-10 05:45:36 -05:00
Marc Delisle
971aec3a01 Fix coding style 2013-11-09 06:21:21 -05:00
Michal Čihař
bbedf41180 Wrap long line 2013-10-02 13:56:23 +02:00
Michal Čihař
7090dc46ef Remove commented out code
That's why we have version control...
2013-10-02 13:56:23 +02:00
Michal Čihař
90baeb5c26 Coding style: wrap long lines 2013-10-02 13:56:23 +02:00
Michal Čihař
3d067c50df Simplify condition
Negative value will not match length of a string anyway.
2013-10-02 13:56:23 +02:00
Michal Čihař
c8993b624c Extract memory limit parsing code 2013-10-02 13:56:23 +02:00
Michal Čihař
b02000cee8 Do not try to parse memory limit if empty 2013-10-02 13:56:23 +02:00