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

add config options for charset in Import and Export

Browse Source
This commit is contained in:
Crack
2010-07-20 12:42:18 +02:00
parent fab6eb09ea
commit c0ba57f040
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/config.values.php
View File

@@ -73,6 +73,7 @@ $cfg_db['Import']['format'] = array(
'docsql', // DocSQL 'docsql', // DocSQL
'ldi', // CSV using LOAD DATA 'ldi', // CSV using LOAD DATA
'sql'); // SQL 'sql'); // SQL
$cfg_db['Import']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
$cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility'] = array( $cfg_db['Import']['sql_compatibility'] = $cfg_db['Export']['sql_compatibility'] = array(
'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE', 'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323', 'MYSQL40', 'MSSQL', 'ORACLE',
// removed; in MySQL 5.0.33, this produces exports that // removed; in MySQL 5.0.33, this produces exports that

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

@@ -223,6 +223,7 @@ $strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues co
$strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors'); $strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors');
$strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.'); $strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.');
$strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt'); $strConfigImport_allow_interrupt_name = __('Partial import: allow interrupt');
$strConfigImport_charset_name = __('Character set of the file');
$strConfigImport_csv_col_names_name = __('Lines terminated by'); $strConfigImport_csv_col_names_name = __('Lines terminated by');
$strConfigImport_csv_enclosed_name = __('Columns enclosed by'); $strConfigImport_csv_enclosed_name = __('Columns enclosed by');
$strConfigImport_csv_escaped_name = __('Columns escaped by'); $strConfigImport_csv_escaped_name = __('Columns escaped by');

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

@@ -75,8 +75,9 @@ $forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
$forms['Features']['Import_export'] = array( $forms['Features']['Import_export'] = array(
'UploadDir', 'UploadDir',
'SaveDir', 'SaveDir',
'RecodingEngine', 'RecodingEngine' => ':group',
'IconvExtraParams', 'IconvExtraParams',
':group:end',
'ZipDump', 'ZipDump',
'GZipDump', 'GZipDump',
'BZipDump', 'BZipDump',
@@ -191,6 +192,7 @@ $forms['Main_frame']['Tabs'] = array(
'QueryWindowDefTab'); 'QueryWindowDefTab');
$forms['Import']['Import_defaults'] = array('Import' => array( $forms['Import']['Import_defaults'] = array('Import' => array(
'format', 'format',
'charset',
'allow_interrupt', 'allow_interrupt',
'skip_queries')); 'skip_queries'));
$forms['Import']['Sql'] = array('Import' => array( $forms['Import']['Sql'] = array('Import' => array(

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

@@ -103,6 +103,7 @@ $forms['Main_frame']['Tabs'] = array(
'DefaultTabTable'); 'DefaultTabTable');
$forms['Import']['Import_defaults'] = array( $forms['Import']['Import_defaults'] = array(
'Import/format', 'Import/format',
'Import/charset',
'Import/allow_interrupt', 'Import/allow_interrupt',
'Import/skip_queries'); 'Import/skip_queries');
$forms['Import']['Sql'] = array( $forms['Import']['Sql'] = array(
@@ -137,6 +138,7 @@ $forms['Import']['Open_Document'] = array(
$forms['Export']['Export_defaults'] = array( $forms['Export']['Export_defaults'] = array(
'Export/format', 'Export/format',
'Export/compression', 'Export/compression',
'Export/charset',
'Export/asfile', 'Export/asfile',
'Export/remember_file_template', 'Export/remember_file_template',
'Export/file_template_table', 'Export/file_template_table',