Commit Graph

62 Commits

Author SHA1 Message Date
Hugues Peccatte
c0617bcd5f Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-03 15:14:47 +02:00
Madhura Jayaratne
5d2fa0d91b Merge branch 'QA_4_5' 2015-10-03 22:20:06 +10:00
Madhura Jayaratne
b41ab56e3b Fix #11526 Foreign key to other database's tables fails
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-10-03 22:14:49 +10:00
Hugues Peccatte
330c92ddf7 Set namespace on properties classes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-12 22:16:23 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Madhura Jayaratne
256be5b859 Remove tests related to Drizzle specific functionalities
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-10 01:02:32 +10:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-05 00:09:30 +02:00
Hugues Peccatte
b1038cfefa Merge branch 'master' into useNamespaces_master 2015-09-04 22:37:45 +02:00
Madhura Jayaratne
b48c414c0b Fix bugs introduced in 788c96e8c7 while fixing issue #11442
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-09-03 09:53:34 +10:00
Hugues Peccatte
984545832e Fix PMA_Table to Table rename.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:22 +02:00
Hugues Peccatte
7f8f34e89d Remove classes require_once.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:22 +02:00
Hugues Peccatte
58b10807c8 Rename classes files.
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:22 +02:00
Hugues Peccatte
0761fb1801 Rename classes files.
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:30:21 +02:00
Hugues Peccatte
2606c5f72d Attempt to fix unit tests.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:26:03 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes.
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-09-01 21:22:52 +02:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-31 17:10:32 +10:00
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-28 18:52:37 +10:00
Madhura Jayaratne
e29ba1df22 Fix tests. Now there are only 5 as CREATE TABLE options are under 'Add CREATE TABLE statement' option
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 09:02:56 +10:00
Madhura Jayaratne
88132a7fc6 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-21 06:49:47 +05:30
Madhura Jayaratne
5f4e8e0f2b Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-20 10:53:01 +05:30
Madhura Jayaratne
259564b979 Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-20 10:46:35 +05:30
Marc Delisle
c3c196cad8 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-06 14:49:17 -04:00
Madhura Jayaratne
e9dfc964e3 Merge branch 'QA_4_4' 2015-07-31 14:17:46 +05:30
Madhura Jayaratne
199e8d2544 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-31 14:14:33 +05:30
Dan Ungureanu
f539a7398b Fix failing test.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-28 22:49:38 +03:00
Jason
6fd29078b6 Fix test failures
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-07-23 11:46:40 +08:00
Jason
6636153071 Resolve conflicts from upstream
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-07-23 11:29:53 +08:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Madhura Jayaratne
06ee23ed26 Add PMA_VERSION to fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-17 11:28:34 +05:30
Dan Ungureanu
053f7fc2e9 Fixed test. 2015-07-12 00:49:49 +03:00
Dan Ungureanu
5fa3bdf0d1 Restore SQL mode after export with certain configuration has finished.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-11 00:42:16 +03:00
Dan Ungureanu
ecc60f3664 Fixed failing tests. Also, removed deprecated PHPUnit configuration that might cause issues with XDebug.
Fixed a bug where the query delimiter would not be added.
Updated sql-parser to udan11/sql-parser@7c925b6.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:18 +03:00
Dan Ungureanu
ae733edf41 Removed the old parser.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:18 +03:00
Dan Ungureanu
d4cbb51d04 Using the new parser for replacing aliases for export.
Updated sql-parser library to udan11/sql-parser@2833495.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:17 +03:00
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-30 15:16:42 +05:30
Madhura Jayaratne
2b1b872f63 Fix SQL export related tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 16:45:04 +05:30
Madhura Jayaratne
9e26714239 Fix failing test
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-09 21:32:03 +05:30
Madhura Jayaratne
f6b7f98322 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-23 10:43:54 -05:00
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-16 13:32:15 -04:00
Madhura Jayaratne
603b31d023 Revert "The DisableIS directive is being deprecated"
This reverts commit 57ef25eed8.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 18:30:16 +05:30
Marc Delisle
e3fb12e385 Merge commit '3b479f5' 2014-08-28 15:43:36 -04:00
Smita Kumari
3b479f52f9 fix unit test
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-28 22:48:35 +05:30
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Smita Kumari
5681db5084 fix bug #4516
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-14 20:55:02 +05:30
Chirayu Chiripal
a78a7a0c9c export with table/column names changes extended for other export formats
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-18 16:09:57 +05:30
Marc Delisle
a83ca5d73b Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-06-10 12:43:07 -04:00
Chirayu Chiripal
ff688b18fb Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-10 19:00:16 +05:30
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
2014-06-09 22:44:07 +05:30
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-03-20 09:36:48 +01:00
Jeff Chan
581f8e4d94 Define MYSQL_VERSION string constant if not already defined
These tests were failing when run individually since the constant was
not defined. This patch defines the constant if it doesn't exist.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
2014-03-14 18:59:07 +00:00