Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Atul Pratap Singh
commit
acc3fbaeb3
39
po/ko.po
39
po/ko.po
@ -4,10 +4,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-01-10 13:45+0100\n"
|
||||
"PO-Revision-Date: 2013-01-03 22:27+0200\n"
|
||||
"Last-Translator: Nabu Marduk <studionabu@gmail.com>\n"
|
||||
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2013-01-11 11:36+0200\n"
|
||||
"Last-Translator: Dong-bum Kim <dongbum@me.com>\n"
|
||||
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/>\n"
|
||||
"Language: ko\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -732,10 +731,9 @@ msgid "More settings"
|
||||
msgstr ""
|
||||
|
||||
#: index.php:227
|
||||
#, fuzzy
|
||||
#| msgid "Databases"
|
||||
msgid "Database server"
|
||||
msgstr "데이터베이스 "
|
||||
msgstr "데이터베이스 서버"
|
||||
|
||||
#: index.php:230 libraries/Menu.class.php:150
|
||||
#: libraries/ServerStatusData.class.php:341 libraries/common.inc.php:653
|
||||
@ -813,10 +811,9 @@ msgid "Get support"
|
||||
msgstr ""
|
||||
|
||||
#: index.php:363
|
||||
#, fuzzy
|
||||
#| msgid "No change"
|
||||
msgid "List of changes"
|
||||
msgstr "변화 없음"
|
||||
msgstr "변경 목록"
|
||||
|
||||
#: index.php:386
|
||||
msgid ""
|
||||
@ -1870,6 +1867,8 @@ msgid ""
|
||||
"This table does not contain a unique column. Features related to the grid "
|
||||
"edit, checkbox, Edit, Copy and Delete links may not work after saving."
|
||||
msgstr ""
|
||||
"이 테이블에는 유일 속성을 가진 컬럼이 없습니다. 저장 시에 격자창 편집, 체크박스, 편집, 복사, 삭제 등의 기능이 정상적으로 동작하지 "
|
||||
"않을 수 있습니다."
|
||||
|
||||
#: js/messages.php:350
|
||||
msgid "You can also edit most values<br />by double-clicking directly on them."
|
||||
@ -2711,7 +2710,7 @@ msgstr "HTML 폼에 지정된 MAX_FILE_SIZE 값보다 더 큰 파일이 업로
|
||||
|
||||
#: libraries/File.class.php:285
|
||||
msgid "The uploaded file was only partially uploaded."
|
||||
msgstr ""
|
||||
msgstr "파일업로드가 완전하지 않게 실행되었습니다."
|
||||
|
||||
#: libraries/File.class.php:288
|
||||
msgid "Missing a temporary folder."
|
||||
@ -3010,11 +3009,11 @@ msgstr "질의 종류"
|
||||
|
||||
#: libraries/ServerStatusData.class.php:186
|
||||
msgid "Threads"
|
||||
msgstr ""
|
||||
msgstr "쓰레드"
|
||||
|
||||
#: libraries/ServerStatusData.class.php:188
|
||||
msgid "Temporary data"
|
||||
msgstr ""
|
||||
msgstr "임시 데이터"
|
||||
|
||||
#: libraries/ServerStatusData.class.php:189
|
||||
#, fuzzy
|
||||
@ -3155,7 +3154,7 @@ msgstr "테이블 %s을(를) %s(으)로 이름을 변경하였습니다."
|
||||
|
||||
#: libraries/Table.class.php:1373
|
||||
msgid "Could not save table UI preferences"
|
||||
msgstr "테이블 UI 환경 설정을 저장할 수 없습니다."
|
||||
msgstr "테이블 UI 설정을 저장할 수 없습니다."
|
||||
|
||||
#: libraries/Table.class.php:1397
|
||||
#, php-format
|
||||
@ -4092,7 +4091,7 @@ msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:33
|
||||
msgid "Minimum size for input field"
|
||||
msgstr ""
|
||||
msgstr "입력 필드의 최소 크기"
|
||||
|
||||
#: libraries/config/messages.inc.php:34
|
||||
msgid ""
|
||||
@ -4102,7 +4101,7 @@ msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:35
|
||||
msgid "Maximum size for input field"
|
||||
msgstr ""
|
||||
msgstr "입력 필드의 최대 크기"
|
||||
|
||||
#: libraries/config/messages.inc.php:36
|
||||
msgid "Number of columns for CHAR/VARCHAR textareas"
|
||||
@ -4122,7 +4121,7 @@ msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:40
|
||||
msgid "Check config file permissions"
|
||||
msgstr ""
|
||||
msgstr "설정 파일에 대한 권한을 확인해주세요."
|
||||
|
||||
#: libraries/config/messages.inc.php:41
|
||||
msgid ""
|
||||
@ -4137,7 +4136,7 @@ msgstr ""
|
||||
#: libraries/config/messages.inc.php:43 setup/frames/config.inc.php:25
|
||||
#: setup/frames/index.inc.php:176
|
||||
msgid "Configuration file"
|
||||
msgstr ""
|
||||
msgstr "설정 파일"
|
||||
|
||||
#: libraries/config/messages.inc.php:44
|
||||
msgid ""
|
||||
@ -4202,7 +4201,7 @@ msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:59
|
||||
msgid "Display servers as a list"
|
||||
msgstr ""
|
||||
msgstr "서버들을 목록으로 표시"
|
||||
|
||||
#: libraries/config/messages.inc.php:60
|
||||
msgid ""
|
||||
@ -4216,7 +4215,7 @@ msgstr "다중테이블 유지보수기능 해제"
|
||||
|
||||
#: libraries/config/messages.inc.php:62
|
||||
msgid "Edit SQL queries in popup window"
|
||||
msgstr ""
|
||||
msgstr "팝업창으로 SQL 쿼리 편집"
|
||||
|
||||
#: libraries/config/messages.inc.php:63
|
||||
msgid "Edit in window"
|
||||
@ -4238,7 +4237,7 @@ msgstr ""
|
||||
|
||||
#: libraries/config/messages.inc.php:67
|
||||
msgid "Maximum execution time"
|
||||
msgstr ""
|
||||
msgstr "최대 실행 시간"
|
||||
|
||||
#: libraries/config/messages.inc.php:68 prefs_manage.php:299
|
||||
msgid "Save as file"
|
||||
@ -10422,7 +10421,7 @@ msgstr "쓰레드 %s 를 죽였습니다."
|
||||
#, php-format
|
||||
msgid ""
|
||||
"phpMyAdmin was unable to kill thread %s. It probably has already been closed."
|
||||
msgstr ""
|
||||
msgstr "phpMyAdmin이 쓰레드 %s를 종료하는데 실패했습니다. 이미 해당 쓰레드가 종료되었을 것입니다."
|
||||
|
||||
#: server_status.php:70
|
||||
#, php-format
|
||||
|
||||
@ -44,7 +44,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['lang'] = 'en';
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['text_dir'] = 'ltr';
|
||||
require_once 'libraries/Response.class.php';
|
||||
include_once 'libraries/Response.class.php';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -78,8 +78,8 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
/**
|
||||
* Test for setting display mode
|
||||
*
|
||||
* @param string $the_disp_mode the synthetic value for display_mode (see a
|
||||
* few lines above for explanations)
|
||||
* @param string $the_disp_mode the synthetic value for display_mode (see
|
||||
* a few lines above for explanations)
|
||||
* @param integer $the_total the total number of rows returned by the SQL
|
||||
* query without any programmatically appended
|
||||
* LIMIT clause
|
||||
@ -554,11 +554,11 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide data for testGetOperationLinksForVerticleTableCase1
|
||||
* Provide data for testGetOperationLinksForVerticleTable
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForTestGetOperationLinksForVerticleTableCase1()
|
||||
public function dataProviderForTestGetOperationLinksForVerticleTable()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
@ -566,146 +566,37 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
'<tr>
|
||||
</tr>
|
||||
'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getOperationLinksForVerticleTable - case 1
|
||||
*
|
||||
* @param string $operation edit/copy/delete
|
||||
* @param string $output output of _getOperationLinksForVerticleTable
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase1
|
||||
*/
|
||||
public function testGetOperationLinksForVerticleTableCase1(
|
||||
$operation, $output
|
||||
) {
|
||||
$vertical_display = array(
|
||||
'row_delete' => array(),
|
||||
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
|
||||
'edit' => array(),
|
||||
'copy' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+3&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+3" /></spa',
|
||||
'<td class="even row_1 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+9&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+9" /></sp'
|
||||
),
|
||||
'delete' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+3&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this,',
|
||||
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
|
||||
)
|
||||
);
|
||||
|
||||
$this->object->__set('vertical_display', $vertical_display);
|
||||
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
$this->_callPrivateFunction(
|
||||
'_getOperationLinksForVerticleTable',
|
||||
array($operation)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide data for testGetOperationLinksForVerticleTableCase2
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForTestGetOperationLinksForVerticleTableCase2()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
'copy',
|
||||
'<tr>
|
||||
<td class="odd row_0 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+3&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+3" /></spa<td class="even row_1 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+9&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+9" /></sp</tr>
|
||||
'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getOperationLinksForVerticleTable - case 2
|
||||
*
|
||||
* @param string $operation edit/copy/delete
|
||||
* @param string $output output of _getOperationLinksForVerticleTable
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase2
|
||||
*/
|
||||
public function testGetOperationLinksForVerticleTableCase2(
|
||||
$operation, $output
|
||||
) {
|
||||
$vertical_display = array(
|
||||
'row_delete' => array(),
|
||||
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
|
||||
'edit' => array(),
|
||||
'copy' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+3&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+3" /></spa',
|
||||
'<td class="even row_1 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+9&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+9" /></sp'
|
||||
"<tr>\nCOPY1COPY2</tr>\n"
|
||||
),
|
||||
'delete' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+3&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this,',
|
||||
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
|
||||
)
|
||||
);
|
||||
|
||||
$this->object->__set('vertical_display', $vertical_display);
|
||||
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
$this->_callPrivateFunction(
|
||||
'_getOperationLinksForVerticleTable',
|
||||
array($operation)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Provide data for testGetOperationLinksForVerticleTableCase3
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForTestGetOperationLinksForVerticleTableCase3()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
'delete',
|
||||
'<tr>
|
||||
<td class="odd row_0 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+3&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this,<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this</tr>
|
||||
'
|
||||
)
|
||||
"<tr>\nDELETE1DELETE2</tr>\n"
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getOperationLinksForVerticleTable - case 3
|
||||
* Test for _getOperationLinksForVerticleTable
|
||||
*
|
||||
* @param string $operation edit/copy/delete
|
||||
* @param string $output output of _getOperationLinksForVerticleTable
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase3
|
||||
* @dataProvider dataProviderForTestGetOperationLinksForVerticleTable
|
||||
*/
|
||||
public function testGetOperationLinksForVerticleTableCase3(
|
||||
public function testGetOperationLinksForVerticleTable(
|
||||
$operation, $output
|
||||
) {
|
||||
$vertical_display = array(
|
||||
'row_delete' => array(),
|
||||
'textbtn' => '<th rowspan="4" class="vmiddle">\n \n </th>\n',
|
||||
'edit' => array(),
|
||||
'copy' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+3&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+3" /></spa',
|
||||
'<td class="even row_1 vpointer vmarker center" ><span class="nowrap">\n<a href="tbl_change.php?db=Data&table=cars&where_clause=%60cars%60.%60id%60+%3D+9&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60cars%60&goto=sql.php&default_action=insert&token=466f137b5f4556e43103245a086fc001" ><span class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>\n<input type="hidden" class="where_clause" value="%60cars%60.%60id%60+%3D+9" /></sp'
|
||||
),
|
||||
'delete' => array(
|
||||
'<td class="odd row_0 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+3&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this,',
|
||||
'<td class="even row_1 vpointer vmarker center" >\n<a href="sql.php?db=Data&table=cars&sql_query=DELETE+FROM+%60Data%60.%60cars%60+WHERE+%60cars%60.%60id%60+%3D+9&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3DData%26table%3Dcars%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560cars%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3D466f137b5f4556e43103245a086fc001&token=466f137b5f4556e43103245a086fc001" onclick="return confirmLink(this'
|
||||
)
|
||||
'copy' => array('COPY1', 'COPY2'),
|
||||
'delete' => array('DELETE1', 'DELETE2'),
|
||||
);
|
||||
|
||||
$this->object->__set('vertical_display', $vertical_display);
|
||||
@ -796,45 +687,14 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testGetSortParamsCase1
|
||||
* Data provider for testGetSortParams
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForGetSortParamsCase1()
|
||||
{
|
||||
return array(
|
||||
array('', array('', '', ''))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getSortParams - case 1
|
||||
*
|
||||
* @param string $order_by_clause the order by clause of the sql query
|
||||
* @param string $output output of _getSortParams
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForGetSortParamsCase1
|
||||
*/
|
||||
public function testGetSortParamsCase1($order_by_clause, $output)
|
||||
{
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
$this->_callPrivateFunction(
|
||||
'_getSortParams', array($order_by_clause)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testGetSortParamsCase2
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForGetSortParamsCase2()
|
||||
public function dataProviderForGetSortParams()
|
||||
{
|
||||
return array(
|
||||
array('', array('', '', '')),
|
||||
array(
|
||||
'`a_sales`.`customer_id` ASC',
|
||||
array(
|
||||
@ -842,21 +702,21 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
'`a_sales`.`customer_id`',
|
||||
'ASC'
|
||||
)
|
||||
)
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getSortParams - case 2
|
||||
* Test for _getSortParams
|
||||
*
|
||||
* @param string $order_by_clause the order by clause of the sql query
|
||||
* @param string $output output of _getSortParams
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForGetSortParamsCase2
|
||||
* @dataProvider dataProviderForGetSortParams
|
||||
*/
|
||||
public function testGetSortParamsCase2($order_by_clause, $output)
|
||||
public function testGetSortParams($order_by_clause, $output)
|
||||
{
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
@ -1086,11 +946,11 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testGetCheckboxAndLinksCase1
|
||||
* Data provider for testGetCheckboxAndLinks
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForGetCheckboxAndLinksCase1()
|
||||
public function dataProviderForGetCheckboxAndLinks()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
@ -1128,63 +988,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
<input type="hidden" class="where_clause" value="%60new%60.%60id%60+%3D+1" /></span></td><td class="center" >
|
||||
<a href="sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8" class="delete_row"><span class="nowrap"><img src="themes/dot.gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>
|
||||
<div class="hide">DELETE FROM `data`.`new` WHERE `new`.`id` = 1</div></td>'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getCheckboxAndLinks - case 1
|
||||
*
|
||||
* @param string $position the position of the checkbox and links
|
||||
* @param string $del_url delete url
|
||||
* @param array $is_display array with explicit indexes for all the
|
||||
* display elements
|
||||
* @param string $row_no row number
|
||||
* @param string $where_clause where clause
|
||||
* @param string $where_clause_html url encoded where clause
|
||||
* @param array $condition_array array of conditions in the where clause
|
||||
* @param string $del_query delete query
|
||||
* @param string $id_suffix suffix for the id
|
||||
* @param string $edit_url edit url
|
||||
* @param string $copy_url copy url
|
||||
* @param string $class css classes for the td elements
|
||||
* @param string $edit_str text for the edit link
|
||||
* @param string $copy_str text for the copy link
|
||||
* @param string $del_str text for the delete link
|
||||
* @param string $js_conf text for the JS confirmation
|
||||
* @param string $output output of _getCheckboxAndLinks
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForGetCheckboxAndLinksCase1
|
||||
*/
|
||||
public function testGetCheckboxAndLinksCase1(
|
||||
$position, $del_url, $is_display, $row_no, $where_clause,
|
||||
$where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url,
|
||||
$copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
|
||||
) {
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
$this->_callPrivateFunction(
|
||||
'_getCheckboxAndLinks',
|
||||
array(
|
||||
$position, $del_url, $is_display, $row_no, $where_clause,
|
||||
$where_clause_html, $condition_array, $del_query,
|
||||
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
|
||||
$copy_str, $del_str, $js_conf
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testGetCheckboxAndLinksCase2
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForGetCheckboxAndLinksCase2()
|
||||
{
|
||||
return array(
|
||||
),
|
||||
array(
|
||||
PMA_DisplayResults::POSITION_RIGHT,
|
||||
'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
@ -1220,63 +1024,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
<input type="hidden" class="where_clause" value="%60new%60.%60id%60+%3D+1" /></span></td><td class="edit_row_anchor center" ><span class="nowrap">
|
||||
<a href="tbl_change.php?db=data&table=new&where_clause=%60new%60.%60id%60+%3D+1&clause_is_unique=1&sql_query=SELECT+%2A+FROM+%60new%60&goto=sql.php&default_action=update&token=ae4c6d18375f446dfa068420c1f6a4e8" ><span class="nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class="icon ic_b_edit" /> Edit</span></a>
|
||||
<input type="hidden" class="where_clause" value ="%60new%60.%60id%60+%3D+1" /></span></td><td class="center"><input type="checkbox" id="id_rows_to_delete0_right" name="rows_to_delete[0]" class="multi_checkbox checkall" value="%60new%60.%60id%60+%3D+1" /><input type="hidden" class="condition_array" value="{"`new`.`id`":"= 1"}" /> </td>'
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getCheckboxAndLinks - case 2
|
||||
*
|
||||
* @param string $position the position of the checkbox and links
|
||||
* @param string $del_url delete url
|
||||
* @param array $is_display array with explicit indexes for all the
|
||||
* display elements
|
||||
* @param string $row_no row number
|
||||
* @param string $where_clause where clause
|
||||
* @param string $where_clause_html url encoded where clause
|
||||
* @param array $condition_array array of conditions in the where clause
|
||||
* @param string $del_query delete query
|
||||
* @param string $id_suffix suffix for the id
|
||||
* @param string $edit_url edit url
|
||||
* @param string $copy_url copy url
|
||||
* @param string $class css classes for the td elements
|
||||
* @param string $edit_str text for the edit link
|
||||
* @param string $copy_str text for the copy link
|
||||
* @param string $del_str text for the delete link
|
||||
* @param string $js_conf text for the JS confirmation
|
||||
* @param string $output output of _getCheckboxAndLinks
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForGetCheckboxAndLinksCase2
|
||||
*/
|
||||
public function testGetCheckboxAndLinksCase2(
|
||||
$position, $del_url, $is_display, $row_no, $where_clause,
|
||||
$where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url,
|
||||
$copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
|
||||
) {
|
||||
$this->assertEquals(
|
||||
$output,
|
||||
$this->_callPrivateFunction(
|
||||
'_getCheckboxAndLinks',
|
||||
array(
|
||||
$position, $del_url, $is_display, $row_no, $where_clause,
|
||||
$where_clause_html, $condition_array, $del_query,
|
||||
$id_suffix, $edit_url, $copy_url, $class, $edit_str,
|
||||
$copy_str, $del_str, $js_conf
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Data provider for testGetCheckboxAndLinksCase3
|
||||
*
|
||||
* @return array parameters and output
|
||||
*/
|
||||
public function dataProviderForGetCheckboxAndLinksCase3()
|
||||
{
|
||||
return array(
|
||||
),
|
||||
array(
|
||||
PMA_DisplayResults::POSITION_NONE,
|
||||
'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8',
|
||||
@ -1306,12 +1054,12 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
'<span class="nowrap"><img src="themes/dot.gif" title="Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span>',
|
||||
'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
|
||||
'<td class="center"><input type="checkbox" id="id_rows_to_delete0_left" name="rows_to_delete[0]" class="multi_checkbox checkall" value="%60new%60.%60id%60+%3D+1" /><input type="hidden" class="condition_array" value="{"`new`.`id`":"= 1"}" /> </td>'
|
||||
)
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for _getCheckboxAndLinks - case 3
|
||||
* Test for _getCheckboxAndLinks
|
||||
*
|
||||
* @param string $position the position of the checkbox and links
|
||||
* @param string $del_url delete url
|
||||
@ -1334,9 +1082,9 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @dataProvider dataProviderForGetCheckboxAndLinksCase3
|
||||
* @dataProvider dataProviderForGetCheckboxAndLinks
|
||||
*/
|
||||
public function testGetCheckboxAndLinksCase3(
|
||||
public function testGetCheckboxAndLinks(
|
||||
$position, $del_url, $is_display, $row_no, $where_clause,
|
||||
$where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url,
|
||||
$copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
