Commit Graph

2498 Commits

Author SHA1 Message Date
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
7c60eba902 Fix HHVM tests.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:19 +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
Dan Ungureanu
eeafcad986 Using the new parser to simulate queries.
Updated sql-parser library to udan11/sql-parser@e58d230.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:17 +03:00
Dan Ungureanu
889b49ee13 Refactored Table.class.php.
Updated sql-parser library to udan11/sql-parser@b3eff80.
Fixed failing test.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:16 +03:00
Dan Ungureanu
684b4bed1a Finished replacing the old parser in DisplayResults.
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:16 +03:00
Dan Ungureanu
2826b6b328 More refactoring.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:16 +03:00
Dan Ungureanu
6c3ccb2d56 Use new parser in routines' execute form.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:13 +03:00
Dan Ungureanu
ffbbf21ef6 Removed dead code.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:13 +03:00
Dan Ungureanu
4728091594 Refactored PMA_RTN_getDataFromName().
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:12 +03:00
Dan Ungureanu
105a1275e5 Fixed failing test.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:12 +03:00
Dan Ungureanu
bf6e14393d Removed PMA_RTN_parseOneParameter().
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:12 +03:00
Dan Ungureanu
1499963632 Removed PMA_RTN_parseAllParameters().
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:11 +03:00
Dan Ungureanu
bb1c380572 Include sql-parser in tests.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:11 +03:00
Madhura Jayaratne
3160799df6 Use phpmyadmin's secondary tabs instead of jQuery tabs
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-10 19:38:20 +05:30
Madhura Jayaratne
156d48890c Separate process list from auto refreshing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-10 13:08:59 +05:30
Madhura Jayaratne
b0ae16fcd6 These are also internal directives. Remove underscore to match with other similar ones
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:15:10 +05:30
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:06:28 +05:30
Marc Delisle
21eb98a9df Terminology: user accounts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-08 13:23:07 -04:00
Madhura Jayaratne
7f15e0dee6 Fix tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-08 18:22:38 +05:30
Madhura Jayaratne
cffbd3cdc3 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-08 14:46:57 +05:30
Marc Delisle
b0994d0507 Merge pull request #1771 from madhuracj/rfe812
#812 store export definitions for reuse
2015-07-07 06:57:14 -04:00
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 21:03:57 +05:30
Nisarg Jhaveri
0c704996fa Fix tests, use proxy settings from env
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-07-02 20:08:03 +05:30
Madhura Jayaratne
22e006fd0d Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 12:04:39 +05:30
Madhura Jayaratne
d9afffb089 Remove configuration storage data related to a user upon deleting the user
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 11:52:13 +05:30
Madhura Jayaratne
9b6561e2e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-30 15:21:36 +05:30
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
Nisarg Jhaveri
f969a76cb2 Add missing docblock in Util_test
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-30 03:00:17 +05:30
Nisarg Jhaveri
5733dd09e3 Add some unit tests
- for Footer class
- for navigation/PMA_Node_Database class
- In Util class for foreign key check

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-30 01:29:36 +05:30
Madhura Jayaratne
cb90efe029 Merge branch 'QA_4_4' 2015-06-26 14:14:34 +05:30
Madhura Jayaratne
2aea2b8902 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-26 14:10:25 +05:30
Madhura Jayaratne
01354d9d95 #1561 Being able to use multiple servers at the same time when using cookie auth
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 17:33:18 +05:30
Madhura Jayaratne
dd7230cc20 Fix tests for PMA_getDefaultPage and new tests for PMA_getLoadingPage
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 18:13:33 +05:30
Madhura Jayaratne
09957ec344 Fix undefined index
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 13:41:15 +05:30
Madhura Jayaratne
86f43b063b New tests for insert/edit form changes based on column privileges
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 13:34:53 +05:30
Madhura Jayaratne
3931d16bca Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 12:08:57 +05:30
Madhura Jayaratne
b9169b02cb Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 12:04:34 +05:30
Nisarg Jhaveri
03acf47662 Make text and password fields in config forms smaller
The size of these field in config forms was a little too big and was
causing some problems with navigation panel settings dialig box

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-23 18:59:38 +05:30
Isaac Bennetch
bb435183a3 Merge pull request #1737 from devenbansod/rfe1060_new
Designer settings saved in a new table in configuration storage
2015-06-22 22:42:52 -04:00
Michal Čihař
13a3fb0635 Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)"
This reverts commit 9403921e4e.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php
2015-06-22 15:14:48 +02:00
Deven Bansod
54a480e8eb Designer settings saved in a new table in configuration storage
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-21 15:44:39 +05:30
Madhura Jayaratne
ab6772f4f7 Pass db name to fix the tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 16:10:50 +05:30
Madhura Jayaratne
761403517e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 16:05:31 +05:30
Madhura Jayaratne
ddc820c5f0 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 16:03:21 +05:30
Marc Delisle
c852dcb228 Merge pull request #1736 from nisargjhaveri/debug_console
[WIP] SQL debugging in console
2015-06-18 06:29:12 -04:00
Nisarg Jhaveri
e524023def SQL debugging in console
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-18 15:52:13 +05:30
Jason
cb771052c8 Finish refactoring tbl_*.lib.php
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-06-17 01:14:27 +08:00