diff --git a/ChangeLog b/ChangeLog index 6275ee68d..d8052f39c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #1778337 [core] Try moving tables by RENAME and fail to CREATE/INSERT if that fails. + rfe #1721189 [core] Force reload js on code change. + rfe #1954161 [interface] Do not display long numbers in server status. ++ rfe #2033616 [edit] Add option to just display insert query. 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 9b64d9c08..a32a2edc2 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 34a670efb..eafa044a0 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index beb0bdea6..279e7230e 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1645,4 +1645,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index d3ffd62a2..529024c91 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 60fad4362..eb2e603b3 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 5fc606f2d..7bcea7927 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 7527b488d..d66d40ad9 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 43a04ce21..fe1eb7d37 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 54ff9690c..ff5cbb9e4 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 01e0df508..6521a732f 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 14f169ca1..9b5365593 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 2cf02e86b..b0373c08c 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1629,4 +1629,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index a3c55e3b0..57b0a172c 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index b1d8b284e..077c930ba 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 833914242..415541f0c 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index cf5dcb0dc..77f20915c 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1179,6 +1179,7 @@ $strShowingBookmark = 'Zobrazuji oblíbený dotaz'; $strShowingPhp = 'Zobrazuji jako PHP kód'; $strShowingRecords = 'Zobrazeny záznamy'; $strShowingSQL = 'Zobrazuji SQL dotaz'; +$strShowInsert = 'Zobrazit dotaz pro vložení'; $strShowKeys = 'Jen zobrazit klíče'; $strShowMasterStatus = 'Zobrazit stav nadřízeného'; $strShowOpenTables = 'Zobrazit otevřené tabulky'; diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index febe0160c..45dab65fa 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 8b9ee18f6..29e81f87f 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index b77a30a36..42c8f1113 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1236,6 +1236,7 @@ $strShowingBookmark = 'Showing bookmark'; $strShowingPhp = 'Showing as PHP code'; $strShowingRecords = 'Showing rows'; $strShowingSQL = 'Showing SQL query'; +$strShowInsert = 'Show insert query'; $strShowKeys = 'Only show keys'; $strShowMasterStatus = 'Show master status'; $strShowOpenTables = 'Show open tables'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index cb17375ab..18c76411d 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index cc6e5be74..d43ba4256 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1619,4 +1619,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index b9d2efec1..3316be69f 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1615,4 +1615,5 @@ $strZip = '"zippé"'; $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index ca131cbac..00cb9e447 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1623,4 +1623,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 5fb842bdf..2f7d99228 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 959510d17..43ace0923 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 73e30b28b..2a3ccbeaa 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1646,4 +1646,5 @@ $strSynchronizeDb = 'Synchronize Databases'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index a4a584a77..0a51a2302 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index a39130ac4..5afbab0fc 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index afa4ff136..321ab59b7 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 45e689f69..3d562a98c 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 7445b1362..d2b628da5 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 88afdd750..a7043c661 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index aaafac149..a4d102383 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index a916bb76d..4c20475b2 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 2aede6dd5..165bb8e89 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strXMLExportViews = 'Export views'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 448ea81c8..01c41d8ab 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 2f25f46e4..3fe8f4337 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1656,4 +1656,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 3ca6ef3d4..f263f9f76 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index eeb4799ce..62fd3c3cb 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1618,4 +1618,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index af7400384..2c4052407 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1645,4 +1645,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 13086aafe..a2168de7f 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1628,4 +1628,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index dc395a871..c8ec857a1 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1646,4 +1646,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 7e0b16374..17d7056e7 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 537ae29a9..83232ddfd 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1621,4 +1621,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index ae71c5841..5b7851458 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index a09399806..b3315153c 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 0db490e41..149efcc81 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 953c1ae9b..2a41037c9 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 701be3759..d6a3d8a22 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index c78ed2670..17caa141d 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 5bf4f9906..f290fcea6 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1632,4 +1632,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 25b7a2737..7af360198 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 81311193f..27940cf25 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index e78f7d9ab..3b58ff4e4 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 04c4f7daf..3ab9a5414 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index 0a5fdd8b1..dd1ef2441 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index da371328b..95a3ecc80 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strRenameView = 'Rename view to'; //to translate $strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate $strJavascriptDisabled = 'Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strShowInsert = 'Show insert query'; //to translate ?> diff --git a/tbl_change.php b/tbl_change.php index bc0d5af93..3bae4bf5d 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -1107,6 +1107,7 @@ if (isset($where_clause)) { ?> + use the WHERE clause $loop_array = (is_array($_REQUEST['where_clause']) ? $_REQUEST['where_clause'] : array($_REQUEST['where_clause'])); $using_key = true; - $is_insert = ($_REQUEST['submit_type'] == 'insert') || ($_REQUEST['submit_type'] == 'insertignore'); + $is_insert = ($_REQUEST['submit_type'] == 'insert') || ($_REQUEST['submit_type'] == 'showinsert') || ($_REQUEST['submit_type'] == 'insertignore'); $is_insertignore = ($_REQUEST['submit_type'] == 'insertignore'); } else { // new row => use indexes @@ -360,6 +360,10 @@ $warning_messages = array(); $error_messages = array(); foreach ($query as $single_query) { + if ($_REQUEST['submit_type'] == 'showinsert') { + $last_messages[] = PMA_Message::notice('strShowingSQL'); + continue; + } if ($GLOBALS['cfg']['IgnoreMultiSubmitErrors']) { $result = PMA_DBI_try_query($single_query); } else {