From cd6004c31bf385dc3e47e89d31033f1cfe1783cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 13 Nov 2003 15:54:46 +0000 Subject: [PATCH] Support for creating UPDATE and REPLACE statements in export (RFE #838828). --- ChangeLog | 5 ++ config.inc.php3 | 1 + lang/afrikaans-iso-8859-1.inc.php3 | 1 + lang/afrikaans-utf-8.inc.php3 | 1 + lang/albanian-iso-8859-1.inc.php3 | 1 + lang/albanian-utf-8.inc.php3 | 1 + lang/arabic-utf-8.inc.php3 | 1 + lang/arabic-windows-1256.inc.php3 | 1 + lang/azerbaijani-iso-8859-9.inc.php3 | 1 + lang/azerbaijani-utf-8.inc.php3 | 1 + lang/bosnian-utf-8.inc.php3 | 1 + lang/bosnian-windows-1250.inc.php3 | 1 + lang/brazilian_portuguese-iso-8859-1.inc.php3 | 1 + lang/brazilian_portuguese-utf-8.inc.php3 | 1 + lang/bulgarian-koi8-r.inc.php3 | 1 + lang/bulgarian-utf-8.inc.php3 | 1 + lang/bulgarian-windows-1251.inc.php3 | 1 + lang/catalan-iso-8859-1.inc.php3 | 1 + lang/catalan-utf-8.inc.php3 | 1 + lang/chinese_big5-utf-8.inc.php3 | 1 + lang/chinese_big5.inc.php3 | 1 + lang/chinese_gb-utf-8.inc.php3 | 1 + lang/chinese_gb.inc.php3 | 1 + lang/croatian-iso-8859-2.inc.php3 | 1 + lang/croatian-utf-8.inc.php3 | 1 + lang/croatian-windows-1250.inc.php3 | 1 + lang/czech-iso-8859-2.inc.php3 | 1 + lang/czech-utf-8.inc.php3 | 1 + lang/czech-windows-1250.inc.php3 | 1 + lang/danish-iso-8859-1.inc.php3 | 1 + lang/danish-utf-8.inc.php3 | 1 + lang/dutch-iso-8859-1.inc.php3 | 1 + lang/dutch-utf-8.inc.php3 | 1 + lang/english-iso-8859-1.inc.php3 | 1 + lang/english-utf-8.inc.php3 | 1 + lang/estonian-iso-8859-1.inc.php3 | 1 + lang/estonian-utf-8.inc.php3 | 1 + lang/finnish-iso-8859-1.inc.php3 | 1 + lang/finnish-utf-8.inc.php3 | 1 + lang/french-iso-8859-1.inc.php3 | 1 + lang/french-utf-8.inc.php3 | 1 + lang/galician-iso-8859-1.inc.php3 | 1 + lang/galician-utf-8.inc.php3 | 1 + lang/georgian-utf-8.inc.php3 | 1 + lang/german-iso-8859-1.inc.php3 | 1 + lang/german-utf-8.inc.php3 | 1 + lang/greek-iso-8859-7.inc.php3 | 1 + lang/greek-utf-8.inc.php3 | 1 + lang/hebrew-iso-8859-8-i.inc.php3 | 1 + lang/hindi-utf-8.inc.php3 | 1 + lang/hungarian-iso-8859-2.inc.php3 | 1 + lang/hungarian-utf-8.inc.php3 | 1 + lang/indonesian-iso-8859-1.inc.php3 | 1 + lang/indonesian-utf-8.inc.php3 | 1 + lang/italian-iso-8859-1.inc.php3 | 1 + lang/italian-utf-8.inc.php3 | 1 + lang/japanese-euc.inc.php3 | 1 + lang/japanese-sjis.inc.php3 | 1 + lang/japanese-utf-8.inc.php3 | 1 + lang/korean-ks_c_5601-1987.inc.php3 | 1 + lang/latvian-utf-8.inc.php3 | 1 + lang/latvian-windows-1257.inc.php3 | 1 + lang/lithuanian-utf-8.inc.php3 | 1 + lang/lithuanian-windows-1257.inc.php3 | 1 + lang/malay-iso-8859-1.inc.php3 | 1 + lang/malay-utf-8.inc.php3 | 1 + lang/norwegian-iso-8859-1.inc.php3 | 1 + lang/norwegian-utf-8.inc.php3 | 1 + lang/persian-utf-8.inc.php3 | 1 + lang/persian-windows-1256.inc.php3 | 1 + lang/polish-iso-8859-2.inc.php3 | 1 + lang/polish-utf-8.inc.php3 | 1 + lang/portuguese-iso-8859-1.inc.php3 | 1 + lang/portuguese-utf-8.inc.php3 | 1 + lang/romanian-iso-8859-1.inc.php3 | 1 + lang/romanian-utf-8.inc.php3 | 1 + lang/russian-dos-866.inc.php3 | 1 + lang/russian-koi8-r.inc.php3 | 1 + lang/russian-utf-8.inc.php3 | 1 + lang/russian-windows-1251.inc.php3 | 1 + lang/serbian_cyrillic-utf-8.inc.php3 | 1 + lang/serbian_cyrillic-windows-1251.inc.php3 | 1 + lang/serbian_latin-utf-8.inc.php3 | 1 + lang/serbian_latin-windows-1250.inc.php3 | 1 + lang/slovak-iso-8859-2.inc.php3 | 1 + lang/slovak-utf-8.inc.php3 | 1 + lang/slovak-windows-1250.inc.php3 | 1 + lang/slovenian-iso-8859-2.inc.php3 | 1 + lang/slovenian-utf-8.inc.php3 | 1 + lang/slovenian-windows-1250.inc.php3 | 1 + lang/spanish-iso-8859-1.inc.php3 | 1 + lang/spanish-utf-8.inc.php3 | 1 + lang/swedish-iso-8859-1.inc.php3 | 1 + lang/swedish-utf-8.inc.php3 | 1 + lang/thai-tis-620.inc.php3 | 1 + lang/thai-utf-8.inc.php3 | 1 + lang/turkish-iso-8859-9.inc.php3 | 1 + lang/turkish-utf-8.inc.php3 | 1 + lang/ukrainian-utf-8.inc.php3 | 1 + lang/ukrainian-windows-1251.inc.php3 | 1 + libraries/common.lib.php3 | 2 +- libraries/config_import.lib.php3 | 3 + libraries/display_export.lib.php3 | 9 +++ libraries/export/sql.php3 | 73 +++++++++++++------ 104 files changed, 167 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 237933904..9165cc011 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,11 @@ $Source$ * libraries/export/sql.php3, libraries/config_import.lib.php3, libraries/common.lib.php3, libraries/display_export.lib.php3, lang/*, config.inc.php3: Allow delayed inserts (RFE #841298). + * libraries/export/sql.php3, libraries/common.lib.php3, + libraries/config_import.lib.php3, libraries/display_export.lib.php3, + lang/*, config.inc.php3: Support for creating UPDATE and REPLACE + statements in export (RFE #838828). + * lang/remove_message.sh: Checks for parameter count. 2003-11-12 Michal Cihar * libraries/export/latex.php3: Fixed LaTeX output (patch #840082). diff --git a/config.inc.php3 b/config.inc.php3 index c3c0075c2..6d3f578e6 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -332,6 +332,7 @@ $cfg['Export']['sql_dates'] = FALSE; $cfg['Export']['sql_relation'] = FALSE; $cfg['Export']['sql_columns'] = FALSE; $cfg['Export']['sql_delayed'] = FALSE; +$cfg['Export']['sql_type'] = 'insert'; // insert/update/replace $cfg['Export']['sql_extended'] = FALSE; $cfg['Export']['sql_comments'] = FALSE; $cfg['Export']['sql_mime'] = FALSE; diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index 9040376bb..5bcdea019 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -729,4 +729,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index 9b30ccc4b..3619226db 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -730,4 +730,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index b9e205221..6bf26559d 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -722,4 +722,5 @@ $strLatexCaption = 'Table caption'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index 61a78a8bb..59565b5ab 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -723,4 +723,5 @@ $strLatexCaption = 'Table caption'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index 66f51aa30..eafb67236 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -730,4 +730,5 @@ $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index 08c495b58..9480d5ce1 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -729,4 +729,5 @@ $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php3 b/lang/azerbaijani-iso-8859-9.inc.php3 index b85b58365..0e2b1a139 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php3 +++ b/lang/azerbaijani-iso-8859-9.inc.php3 @@ -718,4 +718,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php3 b/lang/azerbaijani-utf-8.inc.php3 index 5501f6e0c..5d90ac6a7 100644 --- a/lang/azerbaijani-utf-8.inc.php3 +++ b/lang/azerbaijani-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php3 b/lang/bosnian-utf-8.inc.php3 index c069bc67f..c1dd262fe 100644 --- a/lang/bosnian-utf-8.inc.php3 +++ b/lang/bosnian-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php3 b/lang/bosnian-windows-1250.inc.php3 index d79d32ff8..1571f157e 100644 --- a/lang/bosnian-windows-1250.inc.php3 +++ b/lang/bosnian-windows-1250.inc.php3 @@ -727,4 +727,5 @@ $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index 943ff9f13..9158218f9 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -743,4 +743,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index 4abb61606..e926e3e7f 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -744,4 +744,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index b663215e2..590dfc3cb 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -724,4 +724,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 40c472de8..e66802900 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -725,4 +725,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 74549a2dd..5ae10aa6a 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -724,4 +724,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index ceff7ccd9..4b0eba0fb 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -715,4 +715,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index cd21bd7f8..ab1dec26a 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index 33b6ef497..4812c7dcc 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index c8de9695a..4b0db90bb 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -726,4 +726,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index a9051cb63..e34665b3f 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 1e1f9943d..f95fc21ce 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -720,4 +720,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index aed401957..6ff891662 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -742,4 +742,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index 948bb1462..ae386f697 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -743,4 +743,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index fd4aae97e..9833f17dc 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -742,4 +742,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 7560a1e7b..e592ea12c 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -547,6 +547,7 @@ $strRunning = 'na %s'; $strRussian = 'Ruątina'; $strSQL = 'SQL'; +$strSQLExportType = 'Typ vytvořených dotazů'; $strSQLOptions = 'Nastavení SQL exportu'; $strSQLParserBugMessage = 'Je moľné, ľe jste naąli chybu v SQL parseru. Prosím prozkoumejte podrobně SQL dotaz, předevąím jestli jsou správně uvozovky a jestli nejsou proházené. Daląí moľnost selhání je pokud nahráváte soubor s binárními daty nezapsanými v uvozovkách. Můľete také vyzkouąet příkazovou řádku MySQL. Níľe uvedený výstup z MySQL serveru (pokud je nějaký) Vám také můľe pomoci při zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, prosím pokuste se zredukovat dotaz na co nejmenąí, ve kterém se problém jeątě vyskytne, a ohlaąte chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou níľe:'; $strSQLParserUserError = 'Pravděpodobně máte v SQL dotazu chybu. Níľe uvedený výstup MySQL serveru (pokud je nějaký) Vám také můľe pomoci při zkoumání problému'; diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index fd2c6d426..e91f7a4fb 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -548,6 +548,7 @@ $strRunning = 'na %s'; $strRussian = 'Ruština'; $strSQL = 'SQL'; +$strSQLExportType = 'Typ vytvoĹ™enĂ˝ch dotazĹŻ'; $strSQLOptions = 'NastavenĂ­ SQL exportu'; $strSQLParserBugMessage = 'Je moĹľnĂ©, Ĺľe jste našli chybu v SQL parseru. ProsĂ­m prozkoumejte podrobnÄ› SQL dotaz, pĹ™edevším jestli jsou správnÄ› uvozovky a jestli nejsou proházenĂ©. Další moĹľnost selhánĂ­ je pokud nahráváte soubor s binárnĂ­mi daty nezapsanĂ˝mi v uvozovkách. MĹŻĹľete takĂ© vyzkoušet příkazovou řádku MySQL. NĂ­Ĺľe uvedenĂ˝ vĂ˝stup z MySQL serveru (pokud je nÄ›jakĂ˝) Vám takĂ© mĹŻĹľe pomoci pĹ™i zkoumánĂ­ problĂ©mu. Pokud stále máte problĂ©my nebo pokud SQL parser ohlásĂ­ chybu u dotazu, kterĂ˝ na příkazovĂ© řádce funguje, prosĂ­m pokuste se zredukovat dotaz na co nejmenší, ve kterĂ©m se problĂ©m ještÄ› vyskytne, a ohlašte chybu na stránkách phpMyAdmina spolu se sekcĂ­ VĂťPIS uvedenou nĂ­Ĺľe:'; $strSQLParserUserError = 'PravdÄ›podobnÄ› máte v SQL dotazu chybu. NĂ­Ĺľe uvedenĂ˝ vĂ˝stup MySQL serveru (pokud je nÄ›jakĂ˝) Vám takĂ© mĹŻĹľe pomoci pĹ™i zkoumánĂ­ problĂ©mu'; diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index cd909a9fc..5232a5427 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -547,6 +547,7 @@ $strRunning = 'na %s'; $strRussian = 'Ruština'; $strSQL = 'SQL'; +$strSQLExportType = 'Typ vytvořených dotazů'; $strSQLOptions = 'Nastavení SQL exportu'; $strSQLParserBugMessage = 'Je možné, že jste našli chybu v SQL parseru. Prosím prozkoumejte podrobně SQL dotaz, především jestli jsou správně uvozovky a jestli nejsou proházené. Další možnost selhání je pokud nahráváte soubor s binárními daty nezapsanými v uvozovkách. Můžete také vyzkoušet příkazovou řádku MySQL. Níže uvedený výstup z MySQL serveru (pokud je nějaký) Vám také může pomoci při zkoumání problému. Pokud stále máte problémy nebo pokud SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém ještě vyskytne, a ohlašte chybu na stránkách phpMyAdmina spolu se sekcí VÝPIS uvedenou níže:'; $strSQLParserUserError = 'Pravděpodobně máte v SQL dotazu chybu. Níže uvedený výstup MySQL serveru (pokud je nějaký) Vám také může pomoci při zkoumání problému'; diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index 187b24bfd..f6b9466bf 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -737,4 +737,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index 517d3bbb6..a17f3cd91 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -738,4 +738,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 9ed9ffdb0..a37715476 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index dd79c062b..38ca38d76 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -723,4 +723,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 0a06d037b..739b42174 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -541,6 +541,7 @@ $strRunning = 'running on %s'; $strRussian = 'Russian'; $strSQL = 'SQL'; +$strSQLExportType = 'Export type'; $strSQLOptions = 'SQL options'; $strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:'; $strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem'; diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 16f41ae5d..d51c57c13 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -542,6 +542,7 @@ $strRunning = 'running on %s'; $strRussian = 'Russian'; $strSQL = 'SQL'; +$strSQLExportType = 'Export type'; $strSQLOptions = 'SQL options'; $strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:'; $strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem'; diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index 822f3c8a0..9572608aa 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -715,4 +715,5 @@ $strZip = '"zipitud"'; // To translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index 080cbb752..3efb2c0e8 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strZip = '"zipitud"'; // To translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index ceb8c9aa4..51637ff94 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -739,4 +739,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index 59bfbae9f..b7ea1f9ba 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -740,4 +740,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 8dda1a4f5..cf09a511d 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index 36aa9dd42..4d16a12ea 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 740f74dfc..3a51c5b95 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 34782d2b4..ef541dc91 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index cce9c142d..da7d1cc7d 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -743,4 +743,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index cbe9a730b..1c287ee4c 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkOptions = 'Optionen zur Speicherung der SQL-Abfrage'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 66109f9e1..05d35f218 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strBookmarkOptions = 'Optionen zur Speicherung der SQL-Abfrage'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index f63f1e7cd..1804782ad 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -723,4 +723,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index f6bf87668..9cca991b5 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index ca83457d6..91a0a58be 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -739,4 +739,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 76e6d3880..f0eb136ce 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -753,4 +753,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index 1ab65cb41..ba5b952f0 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index bfddeaffd..85f7c48c5 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 0d41a5530..6e78cc7bf 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -715,4 +715,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index 777fb32ad..eeb6c2b99 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index d4ac19b51..d5dc40dd2 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -720,4 +720,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index caeb71ab7..2bfbea8f8 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index dcbe3cb60..c16ae19a3 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 108267cac..58daea191 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 050761407..394cffa59 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index f02f4aefa..48ae4e4a9 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -737,4 +737,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index db6390a63..51658258e 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index f9e522a94..4aeda8e97 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -720,4 +720,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index 85088b69b..7ddc2e8ef 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 4b8027e8e..f1232b6d0 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index dc0eb91a1..2eec75934 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -740,4 +740,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index 17216f3ed..34f30ae15 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -741,4 +741,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 1a1328723..146f9840d 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -720,4 +720,5 @@ $strZip = 'Komprimert (zip)'; $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 536fa3679..b0cd21618 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strZip = 'Komprimert (zip)'; $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php3 b/lang/persian-utf-8.inc.php3 index 0082c4017..5cddef0b9 100644 --- a/lang/persian-utf-8.inc.php3 +++ b/lang/persian-utf-8.inc.php3 @@ -745,4 +745,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php3 b/lang/persian-windows-1256.inc.php3 index ec4fa8671..7b55416e2 100644 --- a/lang/persian-windows-1256.inc.php3 +++ b/lang/persian-windows-1256.inc.php3 @@ -744,4 +744,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index 8f08a1fd4..e8dcecdc6 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -715,4 +715,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index 64a48ab1a..207db1f86 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index 86a6a58c8..2fa4b5c40 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -738,4 +738,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index 0a9088963..204cf95f9 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -739,4 +739,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index 0cc1527c3..a49c6875a 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -716,4 +716,5 @@ $strZip = '"arhivat"'; $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index a8bb9cd09..790497dde 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strZip = '"arhivat"'; $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index 96ac1b1d9..badd3f1b6 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index 0d212bd99..b8d6ae18f 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index eb4bc6bd1..2558d434f 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -723,4 +723,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index 767af32e7..2ab3741d9 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php3 b/lang/serbian_cyrillic-utf-8.inc.php3 index 4361db130..b3926769e 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php3 +++ b/lang/serbian_cyrillic-utf-8.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php3 b/lang/serbian_cyrillic-windows-1251.inc.php3 index 8fa04732e..4c848146f 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php3 +++ b/lang/serbian_cyrillic-windows-1251.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php3 b/lang/serbian_latin-utf-8.inc.php3 index 783d2b79f..3e69e9968 100644 --- a/lang/serbian_latin-utf-8.inc.php3 +++ b/lang/serbian_latin-utf-8.inc.php3 @@ -722,4 +722,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php3 b/lang/serbian_latin-windows-1250.inc.php3 index 684ae7b63..8e9dd879d 100644 --- a/lang/serbian_latin-windows-1250.inc.php3 +++ b/lang/serbian_latin-windows-1250.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index cddde4aee..c4fde48a4 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 2cee57425..1fd6aa487 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index 5011b1bd0..da7b65eff 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index 25d34cb8c..fe7538dc2 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -717,4 +717,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index acd0ada51..613e7e59e 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -718,4 +718,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index 4dea2cecd..55f89db06 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -717,4 +717,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index 87a6b5f5c..ec8154e7d 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -714,4 +714,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 85815c80b..025ee8f94 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index 64ce27bda..b9c64fe8a 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -715,4 +715,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index ec76026da..e75dc1a14 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index 626c6a640..440da0478 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index f18b5694e..49e428bf0 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index b4a8b516c..205cfb069 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -727,4 +727,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 2b6c91617..882ed55a4 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index 47f8a750e..d58568f8d 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index b896d7fd3..5b91cad8e 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -719,4 +719,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate $strExcelEdition = 'Excel edition'; //to translate $strDelayedInserts = 'Use delayed inserts'; //to translate +$strSQLExportType = 'Export type'; //to translate ?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 3bf8ff066..ce4d521d7 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -135,7 +135,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} * Includes compatibility code for older config.inc.php3 revisions * if necessary */ - if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 210) { + if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 211) { include('./libraries/config_import.lib.php3'); } diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index a1b3ccae3..6d862f40d 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -1249,6 +1249,9 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['Export']['sql_delayed'])) { $cfg['Export']['sql_delayed'] = FALSE; } + if (!isset($cfg['Export']['sql_type'])) { + $cfg['Export']['sql_type'] = 'insert'; + } if (!isset($cfg['Export']['sql_extended'])) { $cfg['Export']['sql_extended'] = FALSE; } diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3 index 0fa852607..b41def319 100644 --- a/libraries/display_export.lib.php3 +++ b/libraries/display_export.lib.php3 @@ -218,6 +218,15 @@ if ($cfgRelation['mimework']) {
/>
+ + + diff --git a/libraries/export/sql.php3 b/libraries/export/sql.php3 index 43f149f6f..ab0161e3f 100644 --- a/libraries/export/sql.php3 +++ b/libraries/export/sql.php3 @@ -485,21 +485,34 @@ function PMA_getTableContentFast($db, $table, $crlf, $error_url, $sql_query) } } // end for - // delayed inserts? - if (isset($GLOBALS['delayed'])) { - $insert_delayed = ' DELAYED'; + if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'update') { + // update + $schema_insert = 'UPDATE ' . PMA_backquote($table, $use_backquotes) . ' SET '; + $fields_no = count($field_set); } else { - $insert_delayed = ''; - } + // insert or replace + if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'replace') { + $sql_command = 'REPLACE'; + } else { + $sql_command = 'INSERT'; + } - // Sets the scheme - if (isset($GLOBALS['showcolumns'])) { - $fields = implode(', ', $field_set); - $schema_insert = 'INSERT' . $insert_delayed .' INTO ' . PMA_backquote($table, $use_backquotes) - . ' (' . $fields . ') VALUES ('; - } else { - $schema_insert = 'INSERT' . $insert_delayed .' INTO ' . PMA_backquote($table, $use_backquotes) - . ' VALUES ('; + // delayed inserts? + if (isset($GLOBALS['delayed'])) { + $insert_delayed = ' DELAYED'; + } else { + $insert_delayed = ''; + } + + // Sets the scheme + if (isset($GLOBALS['showcolumns'])) { + $fields = implode(', ', $field_set); + $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $use_backquotes) + . ' (' . $fields . ') VALUES ('; + } else { + $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $use_backquotes) + . ' VALUES ('; + } } $search = array("\x00", "\x0a", "\x0d", "\x1a"); //\x08\\x09, not required @@ -527,17 +540,31 @@ function PMA_getTableContentFast($db, $table, $crlf, $error_url, $sql_query) } // end if } // end for - // Extended inserts case - if (isset($GLOBALS['extended_ins'])) { - if ($current_row == 1) { - $insert_line = $schema_insert . implode(', ', $values) . ')'; - } else { - $insert_line = '(' . implode(', ', $values) . ')'; + // should we make update? + if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'update') { + + $insert_line = $schema_insert; + for ($i = 0; $i < $fields_no; $i++) { + if ($i > 0) { + $insert_line .= ', '; + } + $insert_line .= $field_set[$i] . ' = ' . $values[$i]; + } + + } else { + + // Extended inserts case + if (isset($GLOBALS['extended_ins'])) { + if ($current_row == 1) { + $insert_line = $schema_insert . implode(', ', $values) . ')'; + } else { + $insert_line = '(' . implode(', ', $values) . ')'; + } + } + // Other inserts case + else { + $insert_line = $schema_insert . implode(', ', $values) . ')'; } - } - // Other inserts case - else { - $insert_line = $schema_insert . implode(', ', $values) . ')'; } unset($values);