gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-06-10 18:44:23 +02:00
commit a4d35bcc1b
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
- bug #4449 Mediawiki export does not produce table header row; also fix related PHP warnings
- bug #4442 New lines are added to query every time
- bug #4445 Fatal error on SQL Export of join query
- bug #4448 Dump binary columns in hexadecimal notation not working
4.2.3.0 (2014-06-08)
- bug #4423 Moving fields not working

2
export.php
View File

@ -123,7 +123,7 @@ if (!defined('TESTSUITE')) {
'sql_type',
'sql_insert_syntax',
'sql_max_query_size',
'sql_hex_for_blob',
'sql_hex_for_binary',
'sql_utc_time',
'sql_drop_database',
'csv_separator',

4
libraries/config.default.php
View File

@ -1920,9 +1920,9 @@ $cfg['Export']['sql_utc_time'] = true;
/**
*
*
* @global boolean $cfg['Export']['sql_hex_for_blob']
* @global boolean $cfg['Export']['sql_hex_for_binary']
*/
$cfg['Export']['sql_hex_for_blob'] = true;
$cfg['Export']['sql_hex_for_binary'] = true;
/**
* insert/update/replace

2
libraries/config/messages.inc.php
View File

@ -173,7 +173,7 @@ $strConfigExport_sql_create_table_name = sprintf(__('Add %s'), 'CREATE TABLE');
$strConfigExport_sql_create_view_name = sprintf(__('Add %s'), 'CREATE VIEW');
$strConfigExport_sql_create_trigger_name
= sprintf(__('Add %s'), 'CREATE TRIGGER');
$strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
$strConfigExport_sql_hex_for_binary_name = __('Use hexadecimal for BINARY & BLOB');
$strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
$strConfigExport_sql_ignore_name = __('Use ignore inserts');
$strConfigExport_sql_include_comments_name = __('Comments');

2
libraries/config/setup.forms.php
View File

@ -316,7 +316,7 @@ $forms['Export']['Sql'] = array('Export' => array(
'sql_type',
'sql_insert_syntax',
'sql_max_query_size',
'sql_hex_for_blob',
'sql_hex_for_binary',
'sql_utc_time'));
$forms['Export']['CodeGen'] = array('Export' => array(
'codegen_format'));

2
libraries/config/user_preferences.forms.php
View File

@ -216,7 +216,7 @@ $forms['Export']['Sql'] = array(
'Export/sql_type',
'Export/sql_insert_syntax',
'Export/sql_max_query_size',
'Export/sql_hex_for_blob',
'Export/sql_hex_for_binary',
'Export/sql_utc_time');
$forms['Export']['CodeGen'] = array(
'Export/codegen_format');

7
libraries/plugins/export/ExportSql.class.php
View File

@ -426,7 +426,7 @@ class ExportSql extends ExportPlugin
// Dump binary columns in hexadecimal
$leaf = new BoolPropertyItem();
$leaf->setName("hex_for_blob");
$leaf->setName("hex_for_binary");
$leaf->setText(
__(
'Dump binary columns in hexadecimal notation'
@ -1989,9 +1989,8 @@ class ExportSql extends ExportPlugin
// timestamp is numeric on some MySQL 4.1, BLOBs are
// sometimes numeric
$values[] = $row[$j];
} elseif (stristr($field_flags[$j], 'BINARY')
&& $fields_meta[$j]->blob
&& isset($GLOBALS['sql_hex_for_blob'])
} elseif (stristr($field_flags[$j], 'BINARY') !== false
&& isset($GLOBALS['sql_hex_for_binary'])
) {
// a true BLOB
// - mysqldump only generates hex data when the --hex-blob

6
test/classes/plugin/export/PMA_ExportSql_test.php
View File

@ -1876,7 +1876,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
$GLOBALS['sql_ignore'] = true;
$GLOBALS['sql_truncate'] = true;
$GLOBALS['sql_insert_syntax'] = 'both';
$GLOBALS['sql_hex_for_blob'] = true;
$GLOBALS['sql_hex_for_binary'] = true;
ob_start();
$this->object->exportData(
@ -1903,7 +1903,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
);
$this->assertContains(
"(NULL, test, 0x3130, b'110', " . '\'\0\n\r\Z\');',
'(NULL, test, 0x3130, 0x36, 0x000a0d1a);',
$result
);
@ -1991,7 +1991,7 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
$GLOBALS['sql_ignore'] = true;
$GLOBALS['sql_truncate'] = true;
$GLOBALS['sql_insert_syntax'] = 'both';
$GLOBALS['sql_hex_for_blob'] = true;
$GLOBALS['sql_hex_for_binary'] = true;
ob_start();
$this->object->exportData(