gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

190 Commits

Author SHA1 Message Date
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Chirayu Chiripal
43c289ab56 Combined transformation plugins test to avoid duplication issues 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-13 17:46:22 +05:30
Marc Delisle
56659dfa8c Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-13 07:58:43 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console 
PMA console, history and bookmarks.
 2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Michal Čihař
74e499a3d2 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 09:25:02 +02:00
Chirayu Chiripal
48b0bfd259 no need to disable contructor of SplObjectStorage 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 09:24:19 +02:00
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
Michal Čihař
51d4d514f9 Adjust tests to new encryption 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 14:43:10 +02:00
Michal Čihař
a7bcbbc35f Wrap long line 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:51:29 +02:00
Michal Čihař
20640592f0 Always use phpseclib for cookie encryption 
- it provides fallback in case mcrypt is not found
- we now use AES in both mcrypt and PHP code case
- cleanup the code by removing mcrypt conditials
- rename some methods and cookies so that they don't refer to
  implementation details
- switching encryption implementations no longer invalidates the
  credentials

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:39:52 +02:00
Michal Čihař
0652ca9ccd Merge remote-tracking branch 'origin/QA_4_2' 2014-06-12 10:19:00 +02:00
Michal Čihař
bc60315023 Adjust tests to new IV logic 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 10:18:45 +02:00
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ř
c9dc5611ee Fix type string for longtext 
It has to be checked before "long", otherwise it matches first.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:46:34 +02:00
Michal Čihař
3e4da830ee Correctly set static properties in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 13:01:14 +02:00
Marc Delisle
c8e33b2a96 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:59:55 -04:00
Marc Delisle
84f135d048 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:40:21 -04:00
Marc Delisle
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
Michal Čihař
3eccb9eb26 Improve signon-script example 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
8bc5e560e8 Uset errno before testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:19:59 +02:00
Michal Čihař
2a66d750a4 Use correct mock value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:11:30 +02:00
Michal Čihař
0f39a811ce The DBI->getError is no longer called twice 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:03:00 +02:00
Michal Čihař
9f5d592ff3 Add method for getting transoformations options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 15:35:58 +02:00
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
3e65f88dee Fix AuthenticationCookieTest::testAuth to have proper includes 
Also change testAuthSetUserWithHeaders to have more flexible assertion

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 19:28:17 +00:00
Jeff Chan
719babd2c6 Import dependencies to make tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-14 18:59:18 +00: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
Jeff Chan
013a9a3395 Move slow test in HHVM to group medium 
These tests were failing on HHVM because of the default 3 second timeout.
Yes, HHVM is supposed to be faster, but there's a "warmup" time for scripts
in JIT mode (which is on by default). I suspect that's why they're failing.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-13 20:52:13 +00:00
Jeff Chan
0216a5a4a1 Move slow tests in HHVM to group medium 
These tests were failing on HHVM because of the default 3 second timeout.
Yes, HHVM is supposed to be faster, but there's a "warmup" time for scripts
in JIT mode (which is on by default). I suspect that's why they're failing.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-13 05:20:31 +00:00
Jeff Chan
3f0f634c38 Import config to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 607cb3b0b3

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-12 03:30:36 +00:00
Jeff Chan
607cb3b0b3 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 659efe1a88

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-10 03:26:24 +00:00
Jeff Chan
659efe1a88 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 840f7b1215

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 08:16:24 +00:00
Madhura Jayaratne
2512ffe513 Merge pull request #1034 from jeffchan/fix-export-tests 
Import export.lib.php to make unit tests friendlier to running independently
 2014-03-09 11:41:56 +05:30
Jeff Chan
4f241de077 Import export.lib.php to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 1d58392622

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 05:03:05 +00:00
Jeff Chan
6b0e7d6807 Remove duplicate include_once 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 04:55:55 +00:00
Michal Čihař
3f9c963abe Merge remote-tracking branch 'origin/QA_4_1' 2014-03-03 09:28:55 +01:00
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-03-03 11:49:17 +05:30
minhaz
f1529325ff coding style fix 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-03-01 02:49:56 +05:30
Chirayu Chiripal
dec30ffd6d Feature Request #1460 Redirect to login page after session has expired 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-02-27 17:45:46 +05:30
Michal Čihař
c189d3a410 Merge commit '501d25fe622a83826b0d57541eb4f2551c49f5af' 2014-02-27 10:54:40 +01:00
minhaz
501d25fe62 fixing build test and adding test cases 
Test case added for testBlowfishDecrypt() and modified for testBlowfishEncrypt()
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-02-27 14:46:57 +05:30
minhaz
495eda9df3 testBlowFishDecrypt() testcase added 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-02-27 04:23:43 +05:30
Michal Čihař
7a325cf5ad Fix regexp to match 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-24 12:33:16 +01:00
Michal Čihař
b63ddb6b41 Test encoded binary output 
Otherwise PHP sometimes refuses to match binary content using PCRE.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-24 11:59:41 +01:00
Michal Čihař
b485c6105c Remove blank lines from the end of PHP files (causing extra output) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-24 10:57:21 +01:00
Marc Delisle
e8f14e0ac0 Merge pull request #897 from dhananjay92/bug#4237 
Fix for bug#4237.
 2014-02-07 12:37:33 -05:00
Dhananjay
0a18d86059 Fix for bug#4237. 
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
 2014-02-07 11:56:46 +05:30
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
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
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
87bbb24496 Fix tescase for new parameter passed to recaptcha 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:31 +01:00
Michal Čihař
0e5be0dff1 Fix test case expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 12:27:32 +01:00
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
3d72b1cc87 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-24 08:24:14 -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
4f612de31d Remove unneeded transformation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:31:47 -05:00
ptarjan
840f7b1215 Make unit tests friendlier to running independently 2013-11-20 14:43:55 -08:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Marc Delisle
57ef25eed8 The DisableIS directive is being deprecated 2013-11-05 05:10:13 -05:00
Madhura Jayaratne
f311c9c502 Remove trailing white spaces 2013-11-03 19:13:23 +05:30
Madhura Jayaratne
184316d891 Coding style fixes 2013-11-03 19:00:41 +05:30
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton 
Fixes bug #4123 Double config including
 2013-11-03 12:54:20 +01:00
Madhura Jayaratne
5f72019a66 Fix failing tests 2013-10-19 13:02:43 +05:30
Marc Delisle
c7e504b337 This test should use a numeric value 2013-10-11 12:57:46 -04:00
adamgsoc2013
d3a87951de using a smaller test data to make it run more quick 2013-09-14 16:53:38 +08:00
adamgsoc2013
3d6f38223e move mock dbi code to setup function 2013-09-13 22:01:44 +08:00
adamgsoc2013
d9fe181553 add comment for DRIZZLE=false branch 2013-09-13 16:34:48 +08:00
adamgsoc2013
0e10ad4738 add Unit test case for import sharp files 2013-09-12 21:11:17 +08:00
Dieter Adriaenssens
4a2a360f8c fix coding style 2013-09-07 23:08:02 +02:00
Michal Čihař
6b9dd0e096 Whitespace cleanup 2013-08-21 14:06:44 +02:00
Michal Čihař
f2b6a3d8b2 Properly mark test as incomplete 2013-08-21 14:06:44 +02:00
Michal Čihař
9d00e5934c Merge pull request #571 from ayushchd/ut 
Ut
 2013-08-13 06:35:23 -07:00
Michal Čihař
0298467060 Another extra escaping 2013-08-12 18:12:39 +02:00
Michal Čihař
73578413e8 More removed escaping 2013-08-12 18:10:12 +02:00
Michal Čihař
11c986d336 More output fixes 2013-08-12 18:05:26 +02:00
Michal Čihař
d92c5e5590 Fix expected data without html escaping 2013-08-12 18:01:55 +02:00
Michal Čihař
6521ed2283 Missing include and variable 2013-08-12 17:50:46 +02:00
Michal Čihař
15e9c2a538 Correctly set expectation on output 2013-08-12 17:49:00 +02:00
Michal Čihař
28f4263c49 Text all exports as sending file 
It makes no sense to go through htmlspecialchars for binary formats.
 2013-08-12 17:43:41 +02:00
Michal Čihař
65986506bd Whitespace cleanup 2013-08-12 17:35:26 +02:00
Michal Čihař
638f7be48e Add missing include 2013-08-12 17:35:19 +02:00
adamgsoc2013
d467f4441a fix code Static Analysis Warnings 2013-08-09 23:19:13 +08:00
ayushchd
b9a5bffaba Testsuite code-compliance fixes 2013-08-07 22:28:46 +05:30
Michal Čihař
d7c3b58337 Dropped MySQL manual type configuration 
Nothing but default settings is really working now:

- most formats are no longer available on MySQL formats
- for downloadable doc our links are in most cases broken and nobody
  noticed this, so I assume nobody is using this
- anyway most current installations don't have troubles with internet
  access what was main motivation for this configuration directive
 2013-08-07 08:32:01 +02:00
ayushchd
6fa3f66d86 Test for TableProperty class 2013-08-07 00:01:19 +05:30
ayushchd
ff715b1b90 UTs for export libraries 2013-08-07 00:00:51 +05:30
Michal Čihař
e2d154319d Merge pull request #567 from adamgsoc2013/ut_plu_dbi 
add test cases to cover more issues on import and transformations
 2013-08-06 01:11:42 -07:00
adamgsoc2013
09e4190073 using space instead of tab; fixing indention 2013-08-05 22:48:49 +08:00
adamgsoc2013
12a827abc4 add test cases to cover more issues on import and transformations 2013-08-05 22:43:33 +08:00
xmujay
9fb3acebee split the long assertion which failed due to time hard code 2013-08-04 17:49:26 -04:00
ayushchd
7eebe49fd7 Fix test case for date issue 2013-08-04 20:41:02 +05:30
ayushchd
ec411d700b Fix test case 2013-08-03 23:03:48 +05:30
ayushchd
9c6041c816 More tests for export libraries 2013-08-03 22:25:17 +05:30