Commit Graph

431 Commits

Author SHA1 Message Date
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-08-03 00:25:43 +02:00
Michal Čihař
3769b849aa Forgot to reindent some files 2011-08-02 15:53:19 +02:00
Michal Čihař
7e7be00f84 Forgot to reindent this one 2011-08-02 15:50:44 +02:00
Michal Čihař
8cb1f3a1cc Fix indentation 2011-08-02 15:25:27 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
2011-07-21 15:25:52 +02:00
Michal Čihař
dd641ef164 Wrap some long lines 2011-07-21 14:49:25 +02:00
Michal Čihař
7986ea8f35 Free result once we do not need it 2011-07-21 14:36:01 +02:00
Michal Čihař
dafefcd275 More replacement of double quotes 2011-07-21 14:35:43 +02:00
Michal Čihař
008b96aaec Coding style
Wrap ling lines, add missing {} around for and if.
2011-07-21 14:31:50 +02:00
Michal Čihař
c03c7bbc69 Better formatting for code 2011-07-21 14:25:31 +02:00
Michal Čihař
7f629c66ff Remove method used only in single place as a function 2011-07-21 14:22:01 +02:00
Michal Čihař
b349356a83 Avoid storing table data when we don't need it 2011-07-21 14:20:11 +02:00
Michal Čihař
79af2a9374 Minimize need for escaping by using single quotes 2011-07-21 14:19:07 +02:00
Michal Čihař
73bb9302b6 Minimize need for escaping by using single quotes 2011-07-21 14:17:51 +02:00
Michal Čihař
beb73226c4 Minor fixes in coding style 2011-07-21 14:15:35 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_status.php
2011-07-20 18:23:21 +02:00
Michal Čihař
e2dff46f79 There is no result here 2011-07-19 13:50:57 +02:00
Piotr Przybylski
08d4e5a5b8 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/htmlword.php
2011-07-18 22:20:33 +02:00
Michal Čihař
1b5691656e Use PMA_DBI_get_columns instead of own query 2011-07-18 10:27:50 +02:00
Rouslan Placella
7a31e75eb6 Merge branch 'QA_3_4'
Conflicts:
	libraries/export/codegen.php
	libraries/export/xml.php
2011-07-15 16:10:24 +01:00
Rouslan Placella
40d7c3b8ba tabs -> spaces 2011-07-15 16:02:37 +01:00
Piotr Przybylski
2cc22c8aba Fix CodeGen export 2011-07-14 23:48:17 +02:00
Piotr Przybylski
70083ad583 Fix XML export so it actually can export table structure
More escaping fixes
2011-07-14 23:43:56 +02:00
Piotr Przybylski
65d962d397 Better escaping in XML export
Note: it's still incorrect
2011-07-14 23:40:58 +02:00
Piotr Przybylski
6d0f28b425 Improve readability of XML export code 2011-07-14 23:38:09 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
2011-07-14 22:38:20 +02:00
Piotr Przybylski
291e3b6a9f Use PMA_DBI_get_columns in texytext export 2011-07-14 22:32:04 +02:00
Piotr Przybylski
bdbb888713 Use PMA_DBI_get_columns in odt export 2011-07-14 22:27:56 +02:00
Piotr Przybylski
8ff9a1bb78 Whitespace 2011-07-14 21:31:46 +02:00
Piotr Przybylski
ff7116bf7e Fix CodeGen export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
4ec9c3b09c Use PMA_DBI_get_columns in mediawiki export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
f1bcbb500a Use PMA_DBI_get_columns in latex export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
ad87dcf884 Removed useless code 2011-07-14 01:48:13 +02:00
Piotr Przybylski
bce8eaf40a JSON export plugin: fix syntax for empty table, better data escaping 2011-07-14 01:44:41 +02:00
Piotr Przybylski
059ddeb797 Better db and table name escaping in codegen and htmlword export plugins 2011-07-14 01:43:30 +02:00
Piotr Przybylski
f7591dd563 Fix SQL export 2011-07-14 00:57:19 +02:00
Piotr Przybylski
151799f17f Properly escape database name 2011-07-14 00:41:11 +02:00
Piotr Przybylski
59e71a06c0 Quick fixes for XML export 2011-07-14 00:40:15 +02:00
Piotr Przybylski
fb01897f61 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-14 00:30:39 +02:00
Piotr Przybylski
d84d51c775 Fix XML export so it actually can export table structure
More escaping fixes
2011-07-14 00:05:58 +02:00
Piotr Przybylski
667cf67954 Better escaping in XML export
Note: it's still incorrect
2011-07-13 23:50:22 +02:00
Piotr Przybylski
09e74a9415 Improve readability of XML export code 2011-07-13 23:40:58 +02:00
Piotr Przybylski
dd6f936731 Make PMA_DBI_get_triggers aware that Drizzle doesn't have triggers 2011-07-13 20:57:05 +02:00
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Michal Čihař
ae780330e8 Add missing semicolon 2011-07-13 17:05:34 +02:00
Piotr Przybylski
7801d55018 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 14:05:24 +02:00
Piotr Przybylski
e7a4453406 More code formatting changes 2011-07-13 14:02:43 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Piotr Przybylski
2c0d2aca16 Use PMA_MYSQL_STR_VERSION instead of reconstructing it from PMA_MYSQL_INT_VERSION 2011-07-12 18:16:01 +02:00
Piotr Przybylski
ced22c9c22 Remove unused function from most export plugins: PMA_exportComment
It's used only locally in SQL export
2011-07-12 17:50:46 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
12348ee826 Fix escaping on LIKE queries
All these need special variant of PMA_sqlAddSlashes.
2011-06-27 14:50:16 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Piotr Przybylski
c734e1fd14 Workaround for brokwn ROW_FORMAT in SHOW CREATE TABLE (Drizzle) 2011-06-26 21:26:49 +02:00
Piotr Przybylski
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
2011-06-23 14:02:58 +02:00
Michal Čihař
18527251e7 Fix syntax error 2011-06-21 15:03:26 +02:00
Michal Čihař
76d4046858 Use subpackages for export formats 2011-06-21 11:39:21 +02:00
Michal Čihař
40ddb5031e Docblocks and whitespace cleanup in export modules 2011-06-21 11:31:42 +02:00
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
Fix PMA_DBI_get_columns() in Drizzle when $full == false
2011-06-17 00:22:25 +02:00
Michal Čihař
f2fe4db5f1 Remove not used code 2011-06-06 14:12:58 +02:00
Michal Čihař
d14e49f827 Simplify code 2011-06-06 13:47:00 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false.
At least this seems to be the coding standard, so make all files
compliant.
2011-06-06 11:55:09 +02:00
Michal Čihař
754cc88c39 Wrap a bit long lines 2011-06-06 11:31:27 +02:00
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset'].
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
2011-06-03 14:04:29 +02:00
Marc Delisle
ae0af9e5c6 Remove author name 2011-05-28 08:29:38 -04:00
Rouslan Placella
6adfdb3b44 Feature Request #3163355 - Skip dumping data comment if table is empty. 2011-03-28 14:18:10 +02:00
Michal Čihař
03d347c1a6 Correctly set font for PDF footer (bug #3168749). 2011-02-15 19:18:35 +01:00
Marc Delisle
1484ca6c00 Procedures and functions should be exported also when entering Export on a single db 2011-02-13 14:00:14 -05:00
Marc Delisle
708638e1dd Bug #3179715 Procedure and functions are not exported in Server export mode 2011-02-13 08:03:36 -05:00
Madhura Jayaratne
e3870e938e Avoid current page being reset to initial page when an empty table is encountered. 2011-01-25 08:10:54 +05:30
Madhura Jayaratne
dec8229eae bug #3164338 [pdf] Exporting database to PDF incomplete 2011-01-24 08:41:29 +05:30
madhuracj
ca55e59e6b TCPDF upgraded to version 5.9 2011-01-19 17:55:41 +05:30
Michal Čihař
eeea3d6845 [export] Better handling of export to PHP array.
There is no need for own logic here, we can use var_export.
2011-01-13 13:42:24 +01:00
Michal Čihař
bf3da02992 Merge branch 'QA_3_3' 2011-01-13 13:28:07 +01:00
Jacob Middag
df97b1d2c0 Changed yaml export to double quotes for strings 2011-01-13 13:27:21 +01:00
Dieter Adriaenssens
eee76d640b Merge branch 'QA_3_3' 2010-12-22 16:01:02 +01:00
Aamir Khan
1ceccbd50c fix typo 2010-12-22 15:59:44 +01:00
Dieter Adriaenssens
1fe6e59d73 Merge branch 'QA_3_3' 2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae export/copy procedures and routines before tables 2010-09-28 19:37:03 +02:00
Marc Delisle
598d3b898d functions, procedures and events are missing from the export 2010-09-19 08:55:54 -04:00
Michal Čihař
dd2861350f Better description. 2010-09-15 15:07:49 +02:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +02:00
Michal Čihař
3f33397651 No need to translate SQL statements. 2010-08-19 11:31:28 +02:00
Michal Čihař
882892af23 Better translatable messages. 2010-08-19 11:30:44 +02:00
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Michal Čihař
1f248cc254 Simplify code to use native tcpdf functions. 2010-08-18 13:58:52 +02:00
lorilee
90c0e573f7 Fixed formatting 2010-08-10 20:43:57 -07:00