From d756872e80bc54f2a94247d8a8f8878ecca0cafc Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Tue, 1 Oct 2013 22:21:54 +0200 Subject: [PATCH 1/4] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2611 of 2611) --- po/pt_BR.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 69a22db0db..5028daee3b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.7-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-09-17 10:36-0400\n" -"PO-Revision-Date: 2013-09-29 22:59+0200\n" -"Last-Translator: Helder Santana \n" +"PO-Revision-Date: 2013-10-01 22:21+0200\n" +"Last-Translator: Rodrigo Souza \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -12536,10 +12536,9 @@ msgid "Rename view to" msgstr "Renomear view para" #: view_operations.php:130 -#, fuzzy #| msgid "Delete the table (DROP)" msgid "Delete the view (DROP)" -msgstr "Remover a tabela (DROP)" +msgstr "Remover view (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" From 9f0b3a457b2f1a718c699ee265c6a52b6c5fc56a Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Tue, 1 Oct 2013 22:23:44 +0200 Subject: [PATCH 2/4] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2611 of 2611) --- po/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 5028daee3b..6497c8cfcd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.7-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-09-17 10:36-0400\n" -"PO-Revision-Date: 2013-10-01 22:21+0200\n" +"PO-Revision-Date: 2013-10-01 22:23+0200\n" "Last-Translator: Rodrigo Souza \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -1371,7 +1371,7 @@ msgstr "Do relatório geral" #: js/messages.php:159 msgid "The database name is not known for this query in the server's logs." msgstr "" -"O nome do banco de dados não é conhecido para esta consulta nos registros do " +"O nome do banco de dados não é conhecido para esta consulta nos logs do " "servidor." #: js/messages.php:160 @@ -12538,7 +12538,7 @@ msgstr "Renomear view para" #: view_operations.php:130 #| msgid "Delete the table (DROP)" msgid "Delete the view (DROP)" -msgstr "Remover view (DROP)" +msgstr "Remover a view (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" From 2f763b7a4ae837702a754944a6a0ab88b6a3adec Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 2 Oct 2013 06:59:53 +0530 Subject: [PATCH 3/4] Drizzle does not support `show full tables` queries --- libraries/db_info.inc.php | 87 +++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 8c0eafc6e7..8eb9683ab0 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -51,32 +51,6 @@ if ($GLOBALS['dbi']->isSystemSchema($db)) { */ $tables = array(); -// When used in Nested table group mode, -// only show tables matching the given groupname -$tbl_group_sql = ""; -$whereAdded = false; -if (PMA_isValid($_REQUEST['tbl_group'])) { - $tbl_group_sql .= " WHERE " . PMA_Util::backquote('Tables_in_' . $db) . " LIKE " - . "'" . PMA_Util::escapeMysqlWildcards($_REQUEST['tbl_group']) . "%'"; - $whereAdded = true; -} -if (PMA_isValid($_REQUEST['tbl_type'], array('table', 'view'))) { - $tbl_group_sql .= $whereAdded ? " AND" : " WHERE"; - if ($_REQUEST['tbl_type'] == 'view') { - if (PMA_DRIZZLE) { - $tbl_group_sql .= " `Table_type` != 'BASE'"; - } else { - $tbl_group_sql .= " `Table_type` != 'BASE TABLE'"; - } - } else { - if (PMA_DRIZZLE) { - $tbl_group_sql .= " `Table_type` = 'BASE'"; - } else { - $tbl_group_sql .= " `Table_type` = 'BASE TABLE'"; - } - } -} - $tooltip_truename = array(); $tooltip_aliasname = array(); @@ -97,10 +71,54 @@ if (true === $cfg['SkipLockedTables']) { $GLOBALS['dbi']->freeResult($db_info_result); if (isset($sot_cache)) { - $db_info_result = $GLOBALS['dbi']->query( - 'SHOW FULL TABLES FROM ' . PMA_Util::backquote($db) . $tbl_group_sql, - null, PMA_DatabaseInterface::QUERY_STORE - ); + $db_info_result = false; + if (PMA_DRIZZLE) { + $tblGroupSql = " AND"; + if (PMA_isValid($_REQUEST['tbl_group'])) { + $tblGroupSql .= " `TABLE_NAME` LIKE " . "'" + . PMA_Util::escapeMysqlWildcards($_REQUEST['tbl_group']) + . "%'"; + } + if (PMA_isValid($_REQUEST['tbl_type'], array('table', 'view'))) { + $tblGroupSql .= " AND"; + if ($_REQUEST['tbl_type'] == 'view') { + $tblGroupSql .= " `TABLE_TYPE` != 'BASE'"; + } else { + $tblGroupSql .= " `TABLE_TYPE` = 'BASE'"; + } + } + $db_info_result = $GLOBALS['dbi']->query( + "SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE" + . " `TABLE_SCHEMA` = '" . PMA_Util::sqlAddSlashes($db) . "'" + . $tblGroupSql, + null, PMA_DatabaseInterface::QUERY_STORE + ); + unset($tblGroupSql); + } else { + $tblGroupSql = ""; + $whereAdded = false; + if (PMA_isValid($_REQUEST['tbl_group'])) { + $tblGroupSql .= " WHERE " + . PMA_Util::backquote('Tables_in_' . $db) + . " LIKE '" + . PMA_Util::escapeMysqlWildcards($_REQUEST['tbl_group']) + . "%'"; + $whereAdded = true; + } + if (PMA_isValid($_REQUEST['tbl_type'], array('table', 'view'))) { + $tblGroupSql .= $whereAdded ? " AND" : " WHERE"; + if ($_REQUEST['tbl_type'] == 'view') { + $tblGroupSql .= " `Table_type` != 'BASE TABLE'"; + } else { + $tblGroupSql .= " `Table_type` = 'BASE TABLE'"; + } + } + $db_info_result = $GLOBALS['dbi']->query( + 'SHOW FULL TABLES FROM ' . PMA_Util::backquote($db) . $tblGroupSql, + null, PMA_DatabaseInterface::QUERY_STORE + ); + unset($tblGroupSql, $whereAdded); + } if ($db_info_result && $GLOBALS['dbi']->numRows($db_info_result) > 0) { while ($tmp = $GLOBALS['dbi']->fetchRow($db_info_result)) { if (! isset($sot_cache[$tmp[0]])) { @@ -118,7 +136,12 @@ if (true === $cfg['SkipLockedTables']) { } $tables[$sts_tmp['Name']] = $sts_tmp; } else { // table in use - $tables[$tmp[0]] = array('Name' => $tmp[0]); + $tables[$tmp[0]] = array( + 'TABLE_NAME' => $tmp[0], + 'ENGINE' => '', + 'TABLE_TYPE' => '', + 'TABLE_ROWS' => 0, + ); } } if ($GLOBALS['cfg']['NaturalOrder']) { @@ -217,7 +240,7 @@ if (! isset($total_num_tables)) { /** * cleanup */ -unset($each_table, $tbl_group_sql, $db_info_result); +unset($each_table, $db_info_result); /** * If coming from a Show MySQL link on the home page, From ae3eef1b9fa547365f867221611eb6c650a81394 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 2 Oct 2013 07:11:27 +0530 Subject: [PATCH 4/4] bug #3992 Multi-row edit doesn't clear values when checking NULL --- ChangeLog | 1 + js/tbl_change.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00034d9b34..8a913ff333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug #3996 Drizzle navigation doesn't expand - bug #4074 GIS column editor: point not displayed - bug #4109 Drizzle tables in navigation are shown as views +- bug #3992 Multi-row edit doesn't clear values when checking NULL 4.0.7.0 (2013-09-23) - bug #3993 Sorting in database overview with statistics doesn't work diff --git a/js/tbl_change.js b/js/tbl_change.js index 28f3b29575..1fdf2a50c7 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -223,7 +223,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType) AJAX.registerTeardown('tbl_change.js', function() { $('span.open_gis_editor').die('click'); $("input[name='gis_data[save]']").die('click'); - $('input.checkbox_null').unbind('click'); + $('input.checkbox_null').die('click'); $('select[name="submit_type"]').unbind('change'); $("#insert_rows").die('change'); }); @@ -276,7 +276,7 @@ AJAX.registerOnload('tbl_change.js', function() { * "Continue insertion" are handled in the "Continue insertion" code * */ - $('input.checkbox_null').bind('click', function(e) { + $('input.checkbox_null').live('click', function(e) { nullify( // use hidden fields populated by tbl_change.php $(this).siblings('.nullify_code').val(),