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

56 Commits

Author SHA1 Message Date
Hugues Peccatte
a68ea85d4d Remove unused locale variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-10 23:26:57 +01:00
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:22:06 +05:30
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
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +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
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
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ř
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
Marc Delisle
84f135d048 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:40:21 -04: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
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ř
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
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
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
edde7126ce Move functions to library file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-25 09:18:29 -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
Marc Delisle
c7e504b337 This test should use a numeric value 2013-10-11 12:57:46 -04:00
Dieter Adriaenssens
4a2a360f8c fix coding style 2013-09-07 23:08:02 +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
ayushchd
6fa3f66d86 Test for TableProperty class 2013-08-07 00:01:19 +05:30