Git November 2011

git@phpmyadmin.net

7 participants
156 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23126-g6e2f6f7

by Madhura Jayaratne

The branch, master has been updated via 6e2f6f71d38966da33ba4a68e76176a88faf2685 (commit) via 8fa909da78fe17fe9e829e2030ef4990ec4b89f9 (commit) via 81f6766f962d6cea3742f3936032d234e6ce9d53 (commit) via b5c45d0d35c203fe1b8e1c720ae8af7e40f4ce6c (commit) via 7d2718801e0c6d7388a57e09a52d58b69e52f350 (commit) from af322da95a8b043e94ca6f51c8b82d0fe117dc6b (commit) - Log ----------------------------------------------------------------- commit 6e2f6f71d38966da33ba4a68e76176a88faf2685 Merge: 8fa909d af322da Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 22:35:04 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 8fa909da78fe17fe9e829e2030ef4990ec4b89f9 Merge: 7d27188 81f6766 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 22:33:02 2011 +0530 Merge branch 'QA_3_4' Conflicts: libraries/server_synchronize.lib.php commit 7d2718801e0c6d7388a57e09a52d58b69e52f350 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 18:30:56 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/server_synchronize.lib.php | 306 ++++++++++++++++++---------------- 2 files changed, 161 insertions(+), 146 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38cfe69..8e75172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ phpMyAdmin - ChangeLog - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 - [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page +- bug #3439292 [core] Fail to synchronize column with name of keyword 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3a07674..ffe0cc0 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -137,10 +137,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; if (sizeof($is_key) == 1) { - $trg_select_query .= $is_key[0]. "='" . $source_result_set[$j] . "'"; + $trg_select_query .= PMA_backquote($is_key[0]). "='" . $source_result_set[$j] . "'"; } elseif (sizeof($is_key) > 1) { for ($k=0; $k < sizeof($is_key); $k++) { - $trg_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; + $trg_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key)-1)) { $trg_select_query .= " AND "; } @@ -155,10 +155,10 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; if (sizeof($is_key) == 1) { - $src_select_query .= $is_key[0] . "='" . $source_result_set[$j] . "'"; + $src_select_query .= PMA_backquote($is_key[0]) . "='" . $source_result_set[$j] . "'"; } elseif (sizeof($is_key) > 1) { for ($k=0; $k< sizeof($is_key); $k++) { - $src_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; + $src_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key) - 1)) { $src_select_query .= " AND "; } @@ -311,10 +311,10 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma $all_keys_match = 1; for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) { if (isset($trg_keys[$matching_table_index][$a])) { - if (! (in_array($trg_keys[$matching_table_index][$a], $src_keys[$matching_table_index]))) { - $all_keys_match = 0; - } - } + if (! (in_array($trg_keys[$matching_table_index][$a], $src_keys[$matching_table_index]))) { + $all_keys_match = 0; + } + } } if (! ($all_keys_match)) { if (isset($target_key_values)) { @@ -323,9 +323,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma } if (isset($trg_keys[$matching_table_index])) { if ((sizeof($trg_keys[$matching_table_index]) == 1) && $all_keys_match) { - $row = 0; - if (isset($target_key_values)) { - for ($i = 0; $i < sizeof($target_key_values); $i++) { + $row = 0; + if (isset($target_key_values)) { + for ($i = 0; $i < sizeof($target_key_values); $i++) { if (! (in_array($target_key_values[$i], $source_key_values))) { $delete_array[$matching_table_index][$row] = $target_key_values[$i]; $row++; @@ -367,27 +367,28 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma * @param string $src_db name of source database * @param mixed $src_link connection established with source server * @param int $index index of a table from $matching_table array - * @param array $row_count number of rows + * @param array &$row_count number of rows + * + * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { - $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); - $rows = PMA_DBI_fetch_result($query, null, null, $src_link); - $row_count[$index] = $rows[0]; + $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); + $rows = PMA_DBI_fetch_result($query, null, null, $src_link); + $row_count[$index] = $rows[0]; } /** * PMA_updateTargetTables() sets the updated field values to target table rows using $update_array[$matching_table_index] * - * - * @param array $table Matching tables' names - * @param array $update_array A three dimensional array containing field + * @param array $table Matching tables' names + * @param array $update_array A three dimensional array containing field * value updates required for each matching table - * @param string $src_db Name of source database - * @param string $trg_db Name of target database - * @param mixed $trg_link Connection established with target server - * @param int $matching_table_index index of matching table in matching_table_array - * @param array $matching_table_keys + * @param string $src_db Name of source database + * @param string $trg_db Name of target database + * @param mixed $trg_link Connection established with target server + * @param int $matching_table_index index of matching table in matching_table_array + * @param array $matching_table_keys * @param boolean $display */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) @@ -398,35 +399,34 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li for ($update_row = 0; $update_row < sizeof($update_array[$matching_table_index]); $update_row++) { if (isset($update_array[$matching_table_index][$update_row])) { - $update_fields_num = sizeof($update_array[$matching_table_index][$update_row])-sizeof($matching_table_keys[$matching_table_index]); - if ($update_fields_num > 0) { + $update_fields_num = sizeof($update_array[$matching_table_index][$update_row])-sizeof($matching_table_keys[$matching_table_index]); + if ($update_fields_num > 0) { $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET "; - for ($update_field = 0; $update_field < $update_fields_num; $update_field = $update_field+2) { - if (isset($update_array[$matching_table_index][$update_row][$update_field]) && isset($update_array[$matching_table_index][$update_row][$update_field+1])) { - $query .= $update_array[$matching_table_index][$update_row][$update_field] . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; - } - if ($update_field < ($update_fields_num - 2)) { - $query .= ", "; - } - } - $query .= " WHERE "; - if (isset($matching_table_keys[$matching_table_index])) { - for ($key = 0; $key < sizeof($matching_table_keys[$matching_table_index]); $key++) - { - if (isset($matching_table_keys[$matching_table_index][$key])) { - $query .= $matching_table_keys[$matching_table_index][$key] . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; + for ($update_field = 0; $update_field < $update_fields_num; $update_field = $update_field+2) { + if (isset($update_array[$matching_table_index][$update_row][$update_field]) && isset($update_array[$matching_table_index][$update_row][$update_field+1])) { + $query .= PMA_backquote($update_array[$matching_table_index][$update_row][$update_field]) . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; } - if ($key < (sizeof($matching_table_keys[$matching_table_index]) - 1)) { - $query .= " AND "; + if ($update_field < ($update_fields_num - 2)) { + $query .= ", "; } } - } - $query .= ';'; - if ($display == true) { - echo "<p>" . $query . "</p>"; - } - PMA_DBI_try_query($query, $trg_link, 0); + $query .= " WHERE "; + if (isset($matching_table_keys[$matching_table_index])) { + for ($key = 0; $key < sizeof($matching_table_keys[$matching_table_index]); $key++) { + if (isset($matching_table_keys[$matching_table_index][$key])) { + $query .= PMA_backquote($matching_table_keys[$matching_table_index][$key]) . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; + } + if ($key < (sizeof($matching_table_keys[$matching_table_index]) - 1)) { + $query .= " AND "; + } + } + } + $query .= ';'; + if ($display == true) { + echo "<p>" . $query . "</p>"; + } + PMA_DBI_try_query($query, $trg_link, 0); } } } @@ -484,12 +484,11 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, } } $select_query .= "; "; - $result = PMA_DBI_fetch_result ($select_query, null, null, $src_link); + $result = PMA_DBI_fetch_result($select_query, null, null, $src_link); $insert_query = "INSERT INTO " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) ." ("; - for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) - { - $insert_query .= $table_fields[$matching_table_index][$field_index]; + for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) { + $insert_query .= PMA_backquote($table_fields[$matching_table_index][$field_index]); $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."' AND TABLE_NAME = '" . $matching_table[$matching_table_index]. "'AND COLUMN_NAME = '" . @@ -497,13 +496,14 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $trg_link); if (sizeof($is_fk_result) > 0) { - for ($j = 0; $j < sizeof($is_fk_result); $j++) - { + for ($j = 0; $j < sizeof($is_fk_result); $j++) { $table_index = array_keys($matching_table, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); if (isset($alter_str_array[$table_index[0]])) { - PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, - $criteria, $matching_tables_keys, $target_tables_keys, $table_index[0], $display); + PMA_alterTargetTableStructure( + $trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, + $criteria, $matching_tables_keys, $target_tables_keys, $table_index[0], $display + ); unset($alter_str_array[$table_index[0]]); } if (isset($uncommon_columns[$table_index[0]])) { @@ -511,37 +511,49 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, unset($uncommon_columns[$table_index[0]]); } if (isset($add_column_array[$table_index[0]])) { - PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $table_index[0], $target_tables_keys, $matching_tables_keys, - $trg_db, $trg_link, $src_db, $src_link); + PMA_findDeleteRowsFromTargetTables( + $delete_array, $matching_tables, $table_index[0], $target_tables_keys, + $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link + ); if (isset($delete_array[$table_index[0]])) { - PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index[0], $target_tables_keys, $delete_array, $display); - unset($delete_array[$table_index[0]]); + PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index[0], $target_tables_keys, $delete_array, $display); + unset($delete_array[$table_index[0]]); } - PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, - $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, $uncommon_tables_fields, - $table_index[0], $uncommon_cols, $display); + PMA_addColumnsInTargetTable( + $src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, + $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, + $uncommon_tables_fields, $table_index[0], $uncommon_cols, $display + ); unset($add_column_array[$table_index[0]]); } - if (isset($add_indexes_array[$table_index[0]]) || isset($remove_indexes_array[$table_index[0]]) - || isset($alter_indexes_array[$table_index[0]])) { - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $table_index[0], $display); + if (isset($add_indexes_array[$table_index[0]]) + || isset($remove_indexes_array[$table_index[0]]) + || isset($alter_indexes_array[$table_index[0]]) + ) { + PMA_applyIndexesDiff( + $trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $remove_indexes_array, $table_index[0], $display + ); unset($add_indexes_array[$table_index[0]]); unset($alter_indexes_array[$table_index[0]]); unset($remove_indexes_array[$table_index[0]]); } if (isset($update_array[$table_index[0]])) { - PMA_updateTargetTables($matching_tables, $update_array, $src_db, $trg_db, $trg_link, $table_index[0], $matching_table_keys, - $display); + PMA_updateTargetTables( + $matching_tables, $update_array, $src_db, $trg_db, $trg_link, + $table_index[0], $matching_table_keys, $display + ); unset($update_array[$table_index[0]]); } if (isset($array_insert[$table_index[0]])) { - PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, $array_insert, - $table_index[0], $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, - $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, - $alter_indexes_array, $delete_array, $update_array, $display); + PMA_insertIntoTargetTable( + $matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, $array_insert, $table_index[0], + $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, + $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $delete_array, $update_array, $display + ); unset($array_insert[$table_index[0]]); } } @@ -613,20 +625,19 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); if (sizeof($is_fk_result) > 0) { - for ($j = 0; $j < sizeof($is_fk_result); $j++) - { + for ($j = 0; $j < sizeof($is_fk_result); $j++) { if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); } } - } - $Create_Table_Query .= ';'; - if ($display == true) { - echo '<p>' . $Create_Table_Query . '</p>'; - } - PMA_DBI_try_query($Create_Table_Query, $trg_link, 0); + } + $Create_Table_Query .= ';'; + if ($display == true) { + echo '<p>' . $Create_Table_Query . '</p>'; + } + PMA_DBI_try_query($Create_Table_Query, $trg_link, 0); } } /** @@ -672,12 +683,12 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom /** * PMA_deleteFromTargetTable() delete rows from target table * - * @param string $trg_db name of target database - * @param mixed $trg_link connection established with target server - * @param array $matching_tables matching table names - * @param int $table_index index of table in matching_table_array - * @param array $target_tables_keys primary key names of the target tables - * @param array $delete_array key values of rows that are to be deleted + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching table names + * @param int $table_index index of table in matching_table_array + * @param array $target_tables_keys primary key names of the target tables + * @param array $delete_array key values of rows that are to be deleted * @param bool $display */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) @@ -686,7 +697,7 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ if (isset($target_tables_keys[$table_index])) { $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE '; for ($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) { - $delete_query .= $target_tables_keys[$table_index][$y] . " = '"; + $delete_query .= PMA_backquote($target_tables_keys[$table_index][$y]) . " = '"; if (sizeof($target_tables_keys[$table_index]) == 1) { $delete_query .= $delete_array[$table_index][$i] . "'"; @@ -705,7 +716,7 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { - $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . $pk_query_result[$b]['COLUMN_NAME'] . " = " . $target_tables_keys[$table_index][$y] . ";"; + $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . " = " . $target_tables_keys[$table_index][$y] . ";"; PMA_DBI_try_query($drop_pk_query, $trg_link, 0); } } @@ -761,7 +772,8 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc if (! (($criteria[$i] == 'Key') && (($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') || ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI') - || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI')))) { + || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI'))) + ) { $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = $source_columns[$matching_table_index][$column_name][$criteria[$i]]; } } @@ -813,7 +825,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma for ($i = 0; $i < sizeof($matching_tables_fields[$table_counter]); $i++) { if (isset($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]])) { $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " . - $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; + PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { $query .= ' Not Null '; @@ -836,7 +848,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma for ($a = 0; ($a < $trg_key_size) && ($check); $a++) { if (! (in_array($target_tables_keys[$table_counter], $uncommon_cols))) { $check = false; - } + } } if (! $check) { $query .= " ,DROP PRIMARY KEY " ; @@ -844,7 +856,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma } $query .= " , ADD PRIMARY KEY ("; for ($t = 0; $t < sizeof($matching_tables_keys[$table_counter]); $t++) { - $query .= $matching_tables_keys[$table_counter][$t]; + $query .= PMA_backquote($matching_tables_keys[$table_counter][$t]); if ($t < (sizeof($matching_tables_keys[$table_counter]) - 1)) { $query .= " , " ; } @@ -875,7 +887,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma unset($uncommon_tables[$table_index[0]]); } $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . - "ADD CONSTRAINT FOREIGN KEY " . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " + "ADD CONSTRAINT FOREIGN KEY " . PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " (" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . ") REFERENCES " . PMA_backquote($trg_db) . '.' . PMA_backquote($is_fk_result[0]['REFERENCED_TABLE_NAME']) . " (" . $is_fk_result[0]['REFERENCED_COLUMN_NAME'] . ");"; @@ -907,8 +919,10 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $reference for ($j = 0; $j < sizeof($is_fk_result); $j++) { if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); - PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables, - $uncommon_tables_fields, $display); + PMA_checkForeignKeys( + $src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], + $uncommon_tables, $uncommon_tables_fields, $display + ); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); } @@ -954,7 +968,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } $pri_query .= " ADD PRIMARY KEY ("; for ($z = 0; $z < sizeof($matching_tables_keys[$matching_table_index]); $z++) { - $pri_query .= $matching_tables_keys[$matching_table_index][$z]; + $pri_query .= PMA_backquote($matching_tables_keys[$matching_table_index][$z]); if ($z < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $pri_query .= " , " ; } @@ -971,10 +985,9 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s for ($t = 0; $t < sizeof($matching_tables_fields[$matching_table_index]); $t++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]])) && (sizeof($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]) > 0)) { $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' . - $matching_tables_fields[$matching_table_index][$t] . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; + PMA_backquote($matching_tables_fields[$matching_table_index][$t]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; $found = false; - for ($i = 0; $i < sizeof($criteria); $i++) - { + for ($i = 0; $i < sizeof($criteria); $i++) { if (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]) && $criteria[$i] != 'Key') { $found = true; if (($criteria[$i] == 'Type') && (! isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i+1]]))) { @@ -1035,7 +1048,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s for ($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key']))) { $check = true; - $query .= ' MODIFY ' . $matching_tables_keys[$matching_table_index][$p] . ' ' + $query .= ' MODIFY ' . PMA_backquote($matching_tables_keys[$matching_table_index][$p]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$p]]['Type'] . ' Not Null '; if ($p < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $query .= ', '; @@ -1054,11 +1067,11 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s /** * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * - * @param string $trg_db name of target database - * @param mixed $trg_link connection established with target server - * @param array $matching_tables names of matching tables - * @param array $uncommon_columns array containing the names of the column which are to be dropped from the target table - * @param int $table_counter index of the matching table as in $matchiing_tables array + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables names of matching tables + * @param array $uncommon_columns array containing the names of the column which are to be dropped from the target table + * @param int $table_counter index of the matching table as in $matchiing_tables array * @param bool $display */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1077,7 +1090,7 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { $drop_pk_query = "ALTER TABLE " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " - DROP FOREIGN KEY " . $pk_query_result[$b]['CONSTRAINT_NAME'] . ", DROP COLUMN " . $pk_query_result[$b]['COLUMN_NAME'] . ";"; + DROP FOREIGN KEY " . PMA_backquote($pk_query_result[$b]['CONSTRAINT_NAME']) . ", DROP COLUMN " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . ";"; PMA_DBI_try_query($drop_pk_query, $trg_link, 0); } } @@ -1088,9 +1101,9 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $result = PMA_DBI_fetch_result($query, null, null, $trg_link); if (sizeof($result) > 0) { - $drop_query .= " DROP FOREIGN KEY " . $result[0]['CONSTRAINT_NAME'] . ","; + $drop_query .= " DROP FOREIGN KEY " . PMA_backquote($result[0]['CONSTRAINT_NAME']) . ","; } - $drop_query .= " DROP COLUMN " . $uncommon_columns[$table_counter][$a]; + $drop_query .= " DROP COLUMN " . PMA_backquote($uncommon_columns[$table_counter][$a]); if ($a < (sizeof($uncommon_columns[$table_counter]) - 1)) { $drop_query .= " , " ; } @@ -1109,17 +1122,17 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * - * @param string $src_db name of source database - * @param string $trg_db name of target database - * @param mixed $src_link connection established with source server - * @param mixed $trg_link connection established with target server - * @param array $matching_tables matching tables name - * @param array &$source_indexes indexes of the source table - * @param array &$target_indexes indexes of the target table - * @param array &$add_indexes_array name of the column on which the index is to be added in the target table - * @param array &$alter_indexes_array key name which needs to be altered - * @param array &$remove_indexes_array key name of the index which is to be removed from the target table - * @param int $table_counter number of the matching table + * @param string $src_db name of source database + * @param string $trg_db name of target database + * @param mixed $src_link connection established with source server + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array &$source_indexes indexes of the source table + * @param array &$target_indexes indexes of the target table + * @param array &$add_indexes_array name of the column on which the index is to be added in the target table + * @param array &$alter_indexes_array key name which needs to be altered + * @param array &$remove_indexes_array key name of the index which is to be removed from the target table + * @param int $table_counter number of the matching table */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) @@ -1134,8 +1147,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /* * @todo compare the length of each sub part */ - while (($z <= sizeof($target_indexes[$table_counter])) && ($found == false)) - { + while (($z <= sizeof($target_indexes[$table_counter])) && ($found == false)) { if (isset($source_indexes[$table_counter][$a]) && isset($target_indexes[$table_counter][$z]) && $source_indexes[$table_counter][$a]['Key_name'] == $target_indexes[$table_counter][$z]['Key_name']) { $found = true; if (($source_indexes[$table_counter][$a]['Column_name'] != $target_indexes[$table_counter][$z]['Column_name']) || ($source_indexes[$table_counter][$a]['Non_unique'] != $target_indexes[$table_counter][$z]['Non_unique'])) { @@ -1157,8 +1169,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi for ($b = 0; $b < sizeof($target_indexes[$table_counter]); $b++) { $found = false; $c = 0; - while (($c <= sizeof($source_indexes[$table_counter])) && ($found == false)) - { + while (($c <= sizeof($source_indexes[$table_counter])) && ($found == false)) { if ($target_indexes[$table_counter][$b]['Column_name'] == $source_indexes[$table_counter][$c]['Column_name']) { $found = true; } @@ -1173,15 +1184,15 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi /** * PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * - * @param string $trg_db name of target database - * @param mixed $trg_link connection established with target server - * @param array $matching_tables matching tables name - * @param array $source_indexes indexes of the source table - * @param array $target_indexes indexes of the target table - * @param array $add_indexes_array column names on which indexes are to be created in target table - * @param array $alter_indexes_array column names for which indexes are to be altered - * @param array $remove_indexes_array key name of the indexes which are to be removed from the target table - * @param int $table_counter number of the matching table + * @param string $trg_db name of target database + * @param mixed $trg_link connection established with target server + * @param array $matching_tables matching tables name + * @param array $source_indexes indexes of the source table + * @param array $target_indexes indexes of the target table + * @param array $add_indexes_array column names on which indexes are to be created in target table + * @param array $alter_indexes_array column names for which indexes are to be altered + * @param array $remove_indexes_array key name of the indexes which are to be removed from the target table + * @param int $table_counter number of the matching table * @param $display */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, @@ -1197,7 +1208,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind if ($source_indexes[$table_counter][$b]['Non_unique'] == '0') { $sql .= " UNIQUE "; } - $sql .= " INDEX " . $source_indexes[$table_counter][$b]['Key_name'] . " (" . $add_indexes_array[$table_counter][$a] . " );"; + $sql .= " INDEX " . PMA_backquote($source_indexes[$table_counter][$b]['Key_name']) . " (" . $add_indexes_array[$table_counter][$a] . " );"; if ($display == true) { echo '<p>' . $sql . '</p>'; } @@ -1243,7 +1254,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $drop_index_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($target_indexes[$table_counter]); $a++) { if (isset($remove_indexes_array[$table_counter][$a])) { - $drop_index_query .= " DROP INDEX " . $remove_indexes_array[$table_counter][$a]; + $drop_index_query .= " DROP INDEX " . PMA_backquote($remove_indexes_array[$table_counter][$a]); } if ($a < (sizeof($remove_indexes_array[$table_counter]) - 1)) { $drop_index_query .= " , " ; @@ -1261,7 +1272,9 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * PMA_displayQuery() displays a query, taking the maximum display size * into account * - * @param string $query the query to display + * @param string $query the query to display + * + * @return nothing */ function PMA_displayQuery($query) { @@ -1274,8 +1287,10 @@ function PMA_displayQuery($query) /** * PMA_syncDisplayHeaderCompare() shows the header for source database * - * @param string $src_db source db name - * @param string $trg_db target db name + * @param string $src_db source db name + * @param string $trg_db target db name + * + * @return nothing */ function PMA_syncDisplayHeaderCompare($src_db, $trg_db) { @@ -1347,20 +1362,19 @@ function PMA_syncDisplayDataCompare($rows) /** * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource - * @return array $field_values + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource + * + * @return array $field_values */ function PMA_get_column_values($database, $table, $column, $link = null) { $query = 'SELECT '; - for ($i=0; $i< sizeof($column); $i++) - { + for ($i=0; $i< sizeof($column); $i++) { $query.= PMA_backquote($column[$i]); - if ($i < (sizeof($column)-1)) - { + if ($i < (sizeof($column)-1)) { $query.= ', '; } } hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-31-g81f6766

by Madhura Jayaratne

The branch, QA_3_4 has been updated via 81f6766f962d6cea3742f3936032d234e6ce9d53 (commit) via b5c45d0d35c203fe1b8e1c720ae8af7e40f4ce6c (commit) from 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit) - Log ----------------------------------------------------------------- commit 81f6766f962d6cea3742f3936032d234e6ce9d53 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 22:18:55 2011 +0530 bug #3439292 [core] Fail to synchronize column with name of keyword commit b5c45d0d35c203fe1b8e1c720ae8af7e40f4ce6c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 20 21:52:22 2011 +0530 White space cleanup ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/server_synchronize.lib.php | 635 +++++++++++++++++----------------- 2 files changed, 319 insertions(+), 317 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9940711..6bbc4e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 - [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the view name in main panel db Structure page +- bug #3439292 [core] Fail to synchronize column with name of keyword 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index c9f1242..c1b9159 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1,27 +1,27 @@ -<?php +<?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** -* PMA_getMatchingTables places matching tables in source +* PMA_getMatchingTables places matching tables in source * and target databases in $matching_tables array whereas * $uncommon_source_tables array gets the tables present in * source database but are absent from target database. * Criterion for matching tables is just comparing their names. -* -* @param $trg_tables array of target database table names, -* @param $src_tables array of source database table names, -* -* @param &$matching_tables empty array passed by reference to save names of matching tables, -* @param &$uncommon_source_tables empty array passed by reference to save names of tables present in +* +* @param $trg_tables array of target database table names, +* @param $src_tables array of source database table names, +* +* @param &$matching_tables empty array passed by reference to save names of matching tables, +* @param &$uncommon_source_tables empty array passed by reference to save names of tables present in * source database but absent from target database */ - + function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { - for($k=0; $k< sizeof($src_tables); $k++) { - $present_in_target = false; - for($l=0; $l < sizeof($trg_tables); $l++) { - if ($src_tables[$k] === $trg_tables[$l]) { + for($k=0; $k< sizeof($src_tables); $k++) { + $present_in_target = false; + for($l=0; $l < sizeof($trg_tables); $l++) { + if ($src_tables[$k] === $trg_tables[$l]) { $present_in_target = true; $matching_tables[] = $src_tables[$k]; } @@ -35,30 +35,30 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un /** * PMA_getNonMatchingTargetTables() places tables present * in target database but are absent from source database -* -* @param $trg_tables array of target database table names, -* -* @param $matching_tables $matching tables array containing names of matching tables, -* @param &$uncommon_target_tables empty array passed by reference to save names of tables presnet in +* +* @param $trg_tables array of target database table names, +* +* @param $matching_tables $matching tables array containing names of matching tables, +* @param &$uncommon_target_tables empty array passed by reference to save names of tables presnet in * target database but absent from source database */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { for($c=0; $c<sizeof($trg_tables) ;$c++) { - $match = false; + $match = false; for($d=0; $d < sizeof($matching_tables); $d++) { if ($trg_tables[$c] === $matching_tables[$d]) { $match=true; - } + } } if ($match === false) { $uncommon_target_tables[] = $trg_tables[$c]; - } + } } } - + /** * PMA_dataDiffInTables() finds the difference in source and target matching tables by * first comparing source table's primary key entries with target table enteries. @@ -67,32 +67,32 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * field values also, in order to check whether update is required or not. * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. - * + * * @uses PMA_DBI_get_fields() * @uses PMA_DBI_get_column_values() * @uses PMA_DBI_fetch_result() - * + * * @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server - * @param $index Index of a table from $matching_table array - * - * @param $update_array A three dimensional array passed by reference to + * @param $index Index of a table from $matching_table array + * + * @param $update_array A three dimensional array passed by reference to * contain updates required for each matching table - * @param $insert_array A three dimensional array passed by reference to + * @param $insert_array A three dimensional array passed by reference to * contain inserts required for each matching table - * @param $fields_num A two dimensional array passed by reference to + * @param $fields_num A two dimensional array passed by reference to * contain number of fields for each matching table * @param $matching_table array containing matching table names - * + * * @param $matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * + * * @param $matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table - */ + */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) -{ +{ if (isset($matching_table[$matching_table_index])) { $fld = array(); $fld_results = PMA_DBI_get_fields($src_db, $matching_table[$matching_table_index], $src_link); @@ -104,80 +104,80 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $is_key[] = $field_name; } $fld[] = $field_name; - } + } } - $matching_tables_fields[$matching_table_index] = $fld; + $matching_tables_fields[$matching_table_index] = $fld; $fields_num[$matching_table_index] = sizeof($fld); $matching_tables_keys[$matching_table_index] = $is_key; - - $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); + + $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); $source_size = sizeof($source_result_set); - + $trg_fld_results = PMA_DBI_get_fields($trg_db, $matching_table[$matching_table_index], $trg_link); $all_keys_match = true; $trg_keys = array(); - + if (isset($trg_fld_results)) { foreach ($trg_fld_results as $each_field) { if ($each_field['Key'] == 'PRI') { - $trg_keys[] = $each_field['Field']; + $trg_keys[] = $each_field['Field']; if (! (in_array($each_field['Field'], $is_key))) { $all_keys_match = false; - } - } - } + } + } + } } $update_row = 0; $insert_row = 0; $update_field = 0; $insert_field = 0; - $starting_index = 0; - - for ($j = 0; $j < $source_size; $j++) { + $starting_index = 0; + + for ($j = 0; $j < $source_size; $j++) { $starting_index = 0; - $update_field = 0; + $update_field = 0; if (isset($source_result_set[$j]) && ($all_keys_match)) { // Query the target server to see which rows already exist - $trg_select_query = "SELECT * FROM " . PMA_backquote($trg_db) . "." + $trg_select_query = "SELECT * FROM " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; - + if (sizeof($is_key) == 1) { - $trg_select_query .= $is_key[0]. "='" . $source_result_set[$j] . "'"; + $trg_select_query .= PMA_backquote($is_key[0]). "='" . $source_result_set[$j] . "'"; } elseif (sizeof($is_key) > 1){ for ($k=0; $k < sizeof($is_key); $k++) { - $trg_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; + $trg_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key)-1)){ - $trg_select_query .= " AND "; + $trg_select_query .= " AND "; } - } + } } - + $target_result_set = PMA_DBI_fetch_result($trg_select_query, null, null, $trg_link); if ($target_result_set) { // Fetch the row from the source server to do a comparison - $src_select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." + $src_select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; - + if (sizeof($is_key) == 1) { - $src_select_query .= $is_key[0] . "='" . $source_result_set[$j] . "'"; + $src_select_query .= PMA_backquote($is_key[0]) . "='" . $source_result_set[$j] . "'"; } else if(sizeof($is_key) > 1){ for ($k=0; $k< sizeof($is_key); $k++) { - $src_select_query .= $is_key[$k] . "='" . $source_result_set[$j][$is_key[$k]] . "'"; + $src_select_query .= PMA_backquote($is_key[$k]) . "='" . $source_result_set[$j][$is_key[$k]] . "'"; if ($k < (sizeof($is_key) - 1)){ - $src_select_query .= " AND "; + $src_select_query .= " AND "; } } - } - + } + $src_result_set = PMA_DBI_fetch_result($src_select_query, null, null, $src_link); - + /** * Comparing each corresponding field of the source and target matching rows. - * Placing the primary key, value of primary key, field to be updated, and the - * new value of field to be updated in each row of the update array. + * Placing the primary key, value of primary key, field to be updated, and the + * new value of field to be updated in each row of the update array. */ for ($m = 0; ($m < $fields_num[$matching_table_index]) && ($starting_index == 0) ; $m++) { if (isset($src_result_set[0][$fld[$m]])) { @@ -187,19 +187,19 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if ($source_result_set[$j]) { $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for ($n=0; $n < sizeof($is_key); $n++) { if (isset($src_result_set[0][$is_key[$n]])) { $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; } } } - + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - + $update_field++; if (isset($src_result_set[0][$fld[$m]])) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } $starting_index = $m; @@ -209,21 +209,21 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if (sizeof($is_key) == 1) { if ($source_result_set[$j]) { $update_array[$matching_table_index][$update_row][$is_key[0]] = $source_result_set[$j]; - + } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for ($n = 0; $n < sizeof($is_key); $n++) { if (isset($src_result_set[0][$is_key[$n]])) { $update_array[$matching_table_index][$update_row][$is_key[$n]] = $src_result_set[0][$is_key[$n]]; } } } - + $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; - + $update_field++; if (isset($src_result_set[0][$fld[$m]])) { - $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; + $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } $starting_index = $m; @@ -232,28 +232,28 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } } for ($m = $starting_index + 1; $m < $fields_num[$matching_table_index] ; $m++) - { + { if (isset($src_result_set[0][$fld[$m]])) { - if (isset($target_result_set[0][$fld[$m]])) { + if (isset($target_result_set[0][$fld[$m]])) { if (($src_result_set[0][$fld[$m]] != $target_result_set[0][$fld[$m]]) && (!(in_array($fld[$m], $is_key)))) { - $update_row--; + $update_row--; $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; if ($src_result_set[0][$fld[$m]]) { $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } - $update_row++; + $update_row++; } } else { - $update_row--; + $update_row--; $update_array[$matching_table_index][$update_row][$update_field] = $fld[$m]; $update_field++; if ($src_result_set[0][$fld[$m]]) { $update_array[$matching_table_index][$update_row][$update_field] = $src_result_set[0][$fld[$m]]; $update_field++; } - $update_row++; + $update_row++; } } } @@ -265,7 +265,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching if (isset($source_result_set[$j])) { $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for($l = 0; $l < sizeof($is_key); $l++) { if (isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]])) { $insert_array[$matching_table_index][$insert_row][$is_key[$l]] = $source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]; @@ -277,13 +277,13 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } else { /** * Placing the primary key, and the value of primary key of the row that is to be inserted in the target table - * This condition is met when there is an additional column in the source table + * This condition is met when there is an additional column in the source table */ if (sizeof($is_key) == 1) { if (isset($source_result_set[$j])) { $insert_array[$matching_table_index][$insert_row][$is_key[0]] = $source_result_set[$j]; } - } elseif (sizeof($is_key) > 1) { + } elseif (sizeof($is_key) > 1) { for ($l = 0; $l < sizeof($is_key); $l++) { if (isset($source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]])) { $insert_array[$matching_table_index][$insert_row][$is_key[$l]] = $source_result_set[$j][$matching_tables_fields[$matching_table_index][$l]]; @@ -293,34 +293,34 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $insert_row++; } } // for loop ends - } -} + } +} /** * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. * @uses sizeof() * @uses PMA_DBI_get_column_values() * @uses in_array() -* -* @param $delete_array array containing rows that are to be deleted +* +* @param $delete_array array containing rows that are to be deleted * @param $matching_table array containing matching table names * @param $matching_table_index index of a table from $matching_table array * @param $trg_keys array of target table keys * @param $src_keys array of source table keys * @param $trg_db name of target database * @param $trg_link connection established with target server -* @param $src_db name of source database +* @param $src_db name of source database * @param $src_link connection established with source server -* +* */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { - $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); - $target_row_size = sizeof($target_key_values); + $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); + $target_row_size = sizeof($target_key_values); } if (isset($src_keys[$matching_table_index])) { - $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); - $source_size = sizeof($source_key_values); + $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); + $source_size = sizeof($source_key_values); } $all_keys_match = 1; for ($a = 0; $a < sizeof($trg_keys[$matching_table_index]); $a++) { @@ -328,7 +328,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma if (! (in_array($trg_keys[$matching_table_index][$a], $src_keys[$matching_table_index]))) { $all_keys_match = 0; } - } + } } if (! ($all_keys_match)) { if (isset($target_key_values)) { @@ -337,17 +337,17 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma } if (isset($trg_keys[$matching_table_index])) { if ((sizeof($trg_keys[$matching_table_index]) == 1) && $all_keys_match) { - $row = 0; + $row = 0; if (isset($target_key_values)) { for ($i = 0; $i < sizeof($target_key_values); $i++) { if (! (in_array($target_key_values[$i], $source_key_values))) { $delete_array[$matching_table_index][$row] = $target_key_values[$i]; - $row++; + $row++; } - } + } } } elseif ((sizeof($trg_keys[$matching_table_index]) > 1) && $all_keys_match) { - $row = 0; + $row = 0; if (isset($target_key_values)) { for ($i = 0; $i < sizeof($target_key_values); $i++) { $is_present = false; @@ -356,7 +356,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma for ($k = 0; $k < sizeof($trg_keys[$matching_table_index]); $k++) { if ($target_key_values[$i][$trg_keys[$matching_table_index][$k]] != $source_key_values[$j][$trg_keys[$matching_table_index][$k]]) { $check = false; - } + } } if ($check) { $is_present = true; @@ -368,16 +368,16 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma } $row++; } - } - } + } + } } - } + } } /** * PMA_dataDiffInUncommonTables() finds the data difference in $source_tables_uncommon * @uses PMA_DBI_fetch_result() -* +* * @param $source_tables_uncommon array of table names; containing table names that are in source db and not in target db * @param $src_db name of source database * @param $src_link connection established with source server @@ -387,9 +387,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { - $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); - $rows = PMA_DBI_fetch_result($query, null, null, $src_link); - $row_count[$index] = $rows[0]; + $query = "SELECT COUNT(*) FROM " . PMA_backquote($src_db) . "." . PMA_backquote($source_tables_uncommon[$index]); + $rows = PMA_DBI_fetch_result($query, null, null, $src_link); + $row_count[$index] = $rows[0]; } /** @@ -397,35 +397,35 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * * @uses PMA_DBI_fetch_result() * @uses PMA_backquote() -* -* @param $table Array containing matching tables' names +* +* @param $table Array containing matching tables' names * @param $update_array A three dimensional array containing field * value updates required for each matching table -* @param $src_db Name of source database +* @param $src_db Name of source database * @param $trg_db Name of target database * @param $trg_link Connection established with target server -* @param $matching_table_index index of matching table in matching_table_array +* @param $matching_table_index index of matching table in matching_table_array * @param $display true/false value -*/ +*/ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) -{ +{ if (isset($update_array[$matching_table_index])) { if (sizeof($update_array[$matching_table_index])) { - + for ($update_row = 0; $update_row < sizeof($update_array[$matching_table_index]); $update_row++) { - - if (isset($update_array[$matching_table_index][$update_row])) { + + if (isset($update_array[$matching_table_index][$update_row])) { $update_fields_num = sizeof($update_array[$matching_table_index][$update_row])-sizeof($matching_table_keys[$matching_table_index]); if ($update_fields_num > 0) { - $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET "; - + $query = "UPDATE " . PMA_backquote($trg_db) . "." .PMA_backquote($table[$matching_table_index]) . " SET "; + for ($update_field = 0; $update_field < $update_fields_num; $update_field = $update_field+2) { if (isset($update_array[$matching_table_index][$update_row][$update_field]) && isset($update_array[$matching_table_index][$update_row][$update_field+1])) { - $query .= $update_array[$matching_table_index][$update_row][$update_field] . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; + $query .= PMA_backquote($update_array[$matching_table_index][$update_row][$update_field]) . "='" . $update_array[$matching_table_index][$update_row][$update_field+1] . "'"; } if ($update_field < ($update_fields_num - 2)) { - $query .= ", "; + $query .= ", "; } } $query .= " WHERE "; @@ -433,8 +433,8 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li for ($key = 0; $key < sizeof($matching_table_keys[$matching_table_index]); $key++) { if (isset($matching_table_keys[$matching_table_index][$key])) { - - $query .= $matching_table_keys[$matching_table_index][$key] . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; + + $query .= PMA_backquote($matching_table_keys[$matching_table_index][$key]) . "='" . $update_array[$matching_table_index][$update_row][$matching_table_keys[$matching_table_index][$key]] . "'"; } if ($key < (sizeof($matching_table_keys[$matching_table_index]) - 1)) { $query .= " AND "; @@ -443,29 +443,29 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li } if ($display == true) { echo "<p>" . $query . "</p>"; - } + } PMA_DBI_try_query($query, $trg_link, 0); } - } + } } } } } /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] -* +* * @uses PMA_DBI_fetch_result() * @uses PMA_backquote() -* -* +* +* * @param $matching_table array containing matching table names * @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server * @param $table_fields array containing field names of a table -* @param $array_insert -* @param $matching_table_index index of matching table in matching_table_array +* @param $array_insert +* @param $matching_table_index index of matching table in matching_table_array * @param $matching_tables_keys array containing field names that are keys in the matching table * @param $source_columns array containing source column information * @param $add_column_array array containing column names that are to be added in target table @@ -474,79 +474,79 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li * @param $uncommon_tables array containing table names that are present in source db but not in targt db * @param $uncommon_tables_fields array containing field names of the uncommon tables * @param $uncommon_cols column names that are present in target table and not in source table -* @param $alter_str_array array containing column names that are to be altered -* @param $source_indexes column names on which indexes are made in source table -* @param $target_indexes column names on which indexes are made in target table +* @param $alter_str_array array containing column names that are to be altered +* @param $source_indexes column names on which indexes are made in source table +* @param $target_indexes column names on which indexes are made in target table * @param $add_indexes_array array containing column names on which index is to be added in target table -* @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed +* @param $alter_indexes_array array containing column names whose indexes are to be altered. Only index name and uniqueness of an index can be changed * @param $delete_array array containing rows that are to be deleted * @param $update_array array containing rows that are to be updated in target * @param $display true/false value * */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, - $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, + $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, &$alter_str_array,&$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$delete_array, &$update_array, $display) -{ +{ if(isset($array_insert[$matching_table_index])) { if (sizeof($array_insert[$matching_table_index])) { for ($insert_row = 0; $insert_row< sizeof($array_insert[$matching_table_index]); $insert_row++) { if (isset($array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][0]])) { - + $select_query = "SELECT * FROM " . PMA_backquote($src_db) . "." . PMA_backquote($matching_table[$matching_table_index]) . " WHERE "; for ($i = 0; $i < sizeof($matching_tables_keys[$matching_table_index]); $i++) { $select_query .= $matching_tables_keys[$matching_table_index][$i] . "='"; $select_query .= $array_insert[$matching_table_index][$insert_row][$matching_tables_keys[$matching_table_index][$i]] . "'" ; - + if ($i < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { - $select_query.= " AND "; + $select_query.= " AND "; } } $select_query .= "; "; $result = PMA_DBI_fetch_result ($select_query, null, null, $src_link); $insert_query = "INSERT INTO " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_table[$matching_table_index]) ." ("; - - for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) + + for ($field_index = 0; $field_index < sizeof($table_fields[$matching_table_index]); $field_index++) { - $insert_query .= $table_fields[$matching_table_index][$field_index]; - - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."' + $insert_query .= PMA_backquote($table_fields[$matching_table_index][$field_index]); + + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db ."' AND TABLE_NAME = '" . $matching_table[$matching_table_index]. "'AND COLUMN_NAME = '" . $table_fields[$matching_table_index][$field_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $trg_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) { $table_index = array_keys($matching_table, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); - + if (isset($alter_str_array[$table_index[0]])) { PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $table_index[0], $display); - unset($alter_str_array[$table_index[0]]); - } + unset($alter_str_array[$table_index[0]]); + } if (isset($uncommon_columns[$table_index[0]])) { PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_index[0], $display); - unset($uncommon_columns[$table_index[0]]); - } + unset($uncommon_columns[$table_index[0]]); + } if (isset($add_column_array[$table_index[0]])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $table_index[0], $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); - + if (isset($delete_array[$table_index[0]])) { PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index[0], $target_tables_keys, $delete_array, $display); - unset($delete_array[$table_index[0]]); - } - PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, + unset($delete_array[$table_index[0]]); + } + PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, $add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables,$uncommon_tables_fields, $table_index[0], $uncommon_cols, $display); unset($add_column_array[$table_index[0]]); } - if (isset($add_indexes_array[$table_index[0]]) || isset($remove_indexes_array[$table_index[0]]) + if (isset($add_indexes_array[$table_index[0]]) || isset($remove_indexes_array[$table_index[0]]) || isset($alter_indexes_array[$table_index[0]])) { - PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, - $remove_indexes_array, $table_index[0], $display); - + PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, + $remove_indexes_array, $table_index[0], $display); + unset($add_indexes_array[$table_index[0]]); unset($alter_indexes_array[$table_index[0]]); unset($remove_indexes_array[$table_index[0]]); @@ -559,16 +559,16 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, if (isset($array_insert[$table_index[0]])) { PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, $array_insert, $table_index[0], $matching_tables_keys, $source_columns, $add_column_array, $criteria, $target_tables_keys, $uncommon_tables, - $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, - $alter_indexes_array, $delete_array, $update_array, $display); + $uncommon_tables_fields, $uncommon_cols, $alter_str_array, $source_indexes, $target_indexes, $add_indexes_array, + $alter_indexes_array, $delete_array, $update_array, $display); unset($array_insert[$table_index[0]]); - } + } } } if ($field_index < sizeof($table_fields[$matching_table_index])-1) { $insert_query .= ", "; } - } + } $insert_query .= ") VALUES("; if (sizeof($table_fields[$matching_table_index]) == 1) { $insert_query .= "'" . PMA_sqlAddslashes($result[0]) . "'"; @@ -581,35 +581,35 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, } if ($field_index < (sizeof($table_fields[$matching_table_index])) - 1) { $insert_query .= " ," ; - } + } } - } + } $insert_query .= ");"; if ($display == true) { PMA_displayQuery($insert_query); } PMA_DBI_try_query($insert_query, $trg_link, 0); - } + } } } } -} +} /** -* PMA_createTargetTables() Create the missing table $uncommon_table in target database -* +* PMA_createTargetTables() Create the missing table $uncommon_table in target database +* * @uses PMA_DBI_get_fields() * @uses PMA_backquote() * @uses PMA_DBI_fetch_result() -* -* @param $src_db name of source database +* +* @param $src_db name of source database * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $src_link connection established with source server * @param $uncommon_table name of table present in source but not in target -* @param $table_index index of table in matching_table_array +* @param $table_index index of table in matching_table_array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value -*/ +*/ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { if (isset($uncommon_tables[$table_index])) { @@ -619,20 +619,20 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $field_name = $each_field['Field']; $fields[] = $field_name; } - $uncommon_tables_fields[$table_index] = $fields; - + $uncommon_tables_fields[$table_index] = $fields; + $Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link); // Replace the src table name with a `dbname`.`tablename` - $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', + $Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/', PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]), $Create_Query, $limit = 1 ); - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $uncommon_tables[$table_index] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;" ; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) @@ -641,14 +641,14 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); - } + } } } if ($display == true) { echo '<p>' . $Create_Table_Query . '</p>'; } PMA_DBI_try_query($Create_Table_Query, $trg_link, 0); - } + } } /** * PMA_populateTargetTables() inserts data into uncommon tables after they have been created @@ -656,24 +656,24 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm * @uses PMA_backquote() * @uses sizeof() * @uses PMA_DBI_try_query() -* +* * @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server -* @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) -* @param $table_index index of table in matching_table_array +* @param $uncommon_tables array containing uncommon table names (table names that are present in source but not in target db) +* @param $table_index index of table in matching_table_array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value * * FIXME: This turns NULL values into '' (empty string) */ -function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) -{ +function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) +{ $display = false; // todo: maybe display some of the queries if they are not too numerous $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { $insert_query .= '('; $key_of_last_value = count($one_row) - 1; @@ -694,53 +694,54 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom } } /** -* PMA_deleteFromTargetTable() delete rows from target table +* PMA_deleteFromTargetTable() delete rows from target table * @uses sizeof() * @uses PMA_backquote() * @uses PMA_DBI_try_query() -* -* +* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing matching table names * @param $table_index index of table in matching_table_array * @param $target_table_keys primary key names of the target tables -* @param $delete array array containing the key values of rows that are to be deleted +* @param $delete array array containing the key values of rows that are to be deleted * @param $display true/false value */ -function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) +function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { for($i = 0; $i < sizeof($delete_array[$table_index]); $i++) { if (isset($target_tables_keys[$table_index])) { - $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE '; + $delete_query = 'DELETE FROM ' . PMA_backquote($trg_db) . '.' .PMA_backquote($matching_tables[$table_index]) . ' WHERE '; for($y = 0; $y < sizeof($target_tables_keys[$table_index]); $y++) { - $delete_query .= $target_tables_keys[$table_index][$y] . " = '"; - + + $delete_query .= PMA_backquote($target_tables_keys[$table_index][$y]) . " = '"; + if (sizeof($target_tables_keys[$table_index]) == 1) { - $delete_query .= $delete_array[$table_index][$i] . "'"; + $delete_query .= $delete_array[$table_index][$i] . "'"; } elseif (sizeof($target_tables_keys[$table_index]) > 1) { $delete_query .= $delete_array[$table_index][$i][$target_tables_keys[$table_index][$y]] . "'"; } if ($y < (sizeof($target_tables_keys[$table_index]) - 1)) { $delete_query .= ' AND '; } - $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' + $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' AND REFERENCED_TABLE_NAME = '" . $matching_tables[$table_index]."' AND REFERENCED_COLUMN_NAME = '" . $target_tables_keys[$table_index][$y] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link); $result_size = sizeof($pk_query_result); - + if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { - $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . $pk_query_result[$b]['COLUMN_NAME'] . " = " . $target_tables_keys[$table_index][$y] . ";"; + $drop_pk_query = "DELETE FROM " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " WHERE " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . " = " . $target_tables_keys[$table_index][$y] . ";"; PMA_DBI_try_query($drop_pk_query, $trg_link, 0); - } - } - } + } + } + } } if ($display == true) { - echo '<p>' . $delete_query . '</p>'; + echo '<p>' . $delete_query . '</p>'; } PMA_DBI_try_query($delete_query, $trg_link, 0); } @@ -753,45 +754,45 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * If column exists in target table but criteria is different then it is palced in $alter_str_array. * If column does not exist in source table but is present in target table then it is placed in $uncommon_columns. * Keys for all the source tables that have a corresponding target table are placed in $matching_tables_keys. -* Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. -* +* Keys for all the target tables that have a corresponding source table are placed in $target_tables_keys. +* * @uses PMA_DBI_get_columns_full() -* @uses sizeof() -* -* @param $src_db name of source database +* @uses sizeof() +* +* @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server * @param $matching_tables array containing names of matching tables * @param $source_columns array containing columns information of the source tables * @param $target_columns array containing columns information of the target tables -* @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target +* @param $alter_str_array three dimensional associative array first index being the matching table index, second index being column name for which target * column have some criteria different and third index containing the criteria which is different. -* @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the +* @param $add_column_array two dimensional associative array, first index of the array contain the matching table number and second index contain the * column name which is to be added in the target table * @param $uncommon_columns array containing the columns that are present in the target table but not in the source table * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table * @param $target_tables_keys array containing the field names which is key in the target table -* @param $matching_table_index integer number of the matching table -* +* @param $matching_table_index integer number of the matching table +* */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, - &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) + &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) { //Gets column information for source and target table $source_columns[$matching_table_index] = PMA_DBI_get_columns_full($src_db, $matching_tables[$matching_table_index], null, $src_link); $target_columns[$matching_table_index] = PMA_DBI_get_columns_full($trg_db, $matching_tables[$matching_table_index], null, $trg_link); foreach ($source_columns[$matching_table_index] as $column_name => $each_column) { if (isset($target_columns[$matching_table_index][$column_name]['Field'])) { - //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column + //If column exists in target table then matches criterias like type, null, collation, key, default, comment of the column for ($i = 0; $i < sizeof($criteria); $i++) { if ($source_columns[$matching_table_index][$column_name][$criteria[$i]] != $target_columns[$matching_table_index][$column_name][$criteria[$i]]) { if (($criteria[$i] == 'Default') && ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == '' )) { - $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = 'None'; + $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = 'None'; } else { if (! (($criteria[$i] == 'Key') && (($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') - || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') - || ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI') + || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'MUL') + || ($source_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI') || ($target_columns[$matching_table_index][$column_name][$criteria[$i]] == 'UNI')))) { $alter_str_array[$matching_table_index][$column_name][$criteria[$i]] = $source_columns[$matching_table_index][$column_name][$criteria[$i]]; } @@ -805,17 +806,17 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc //Finds column names that are present in target table but not in source table foreach ($target_columns[$matching_table_index] as $fld_name => $each_column) { if (! (isset($source_columns[$matching_table_index][$fld_name]['Field']))) { - $fields_uncommon[] = $fld_name; + $fields_uncommon[] = $fld_name; } if ($target_columns[$matching_table_index][$fld_name]['Key'] == 'PRI') { $keys[] = $fld_name; } } if (isset($fields_uncommon)) { - $uncommon_columns[$matching_table_index] = $fields_uncommon; + $uncommon_columns[$matching_table_index] = $fields_uncommon; } if (isset($keys)) { - $target_tables_keys[$matching_table_index] = $keys; + $target_tables_keys[$matching_table_index] = $keys; } } /** @@ -827,8 +828,8 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @uses PMA_createTargetTables() * @uses PMA_DBI_try_query() * @uses PMA_DBI_fetch_result() -* -* @param $src_db name of source database +* +* @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server @@ -836,7 +837,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @param $source_columns array containing columns information of the source tables * @param $add_column_array array containing the names of the column(field) that are to be added in the target * @param $matching_tables_fields -* @param $criteria array containing the criterias +* @param $criteria array containing the criterias * @param $matching_tables_keys array containing the field names which is key in the source table * @param $target_tables_keys array containing the field names which is key in the target table * @param $uncommon_tables array containing the table names that are present in source db and not in target db @@ -851,12 +852,12 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma for ($i = 0; $i < sizeof($matching_tables_fields[$table_counter]); $i++) { if (isset($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]])) { $query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]). " ADD COLUMN " . - $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; - + PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Type']; + if($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'NO') { $query .= ' Not Null '; } elseif ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Null'] == 'YES') { - $query .= ' Null '; + $query .= ' Null '; } if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Collation'] != '') { $query .= ' COLLATE ' . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Collation']; @@ -865,45 +866,45 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma $query .= " DEFAULT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Default']; } if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment'] != '') { - $query .= " COMMENT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment']; - } - if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Key'] == 'PRI' ) { + $query .= " COMMENT " . $source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Comment']; + } + if ($source_columns[$table_counter][$matching_tables_fields[$table_counter][$i]]['Key'] == 'PRI' ) { $trg_key_size = sizeof($target_tables_keys[$table_counter]); if ($trg_key_size) { $check = true; - for ($a = 0; ($a < $trg_key_size) && ($check); $a++) { + for ($a = 0; ($a < $trg_key_size) && ($check); $a++) { if (! (in_array($target_tables_keys[$table_counter], $uncommon_cols))) { $check = false; - } + } } if (! $check) { - $query .= " ,DROP PRIMARY KEY " ; + $query .= " ,DROP PRIMARY KEY " ; } - } + } $query .= " , ADD PRIMARY KEY ("; for ($t = 0; $t < sizeof($matching_tables_keys[$table_counter]); $t++) { - $query .= $matching_tables_keys[$table_counter][$t]; + $query .= PMA_backquote($matching_tables_keys[$table_counter][$t]); if ($t < (sizeof($matching_tables_keys[$table_counter]) - 1)) { $query .= " , " ; } } $query .= ")"; } - + $query .= ";"; if ($display == true) { echo '<p>' . $query . '</p>'; } PMA_DBI_try_query($query, $trg_link, 0); - + //Checks if column to be added is a foreign key or not $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" . $matching_tables[$table_counter] . "' AND COLUMN_NAME ='" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); - - //If column is a foreign key then it is checked that referenced table exist in target db. If referenced table does not exist in target db then + + //If column is a foreign key then it is checked that referenced table exist in target db. If referenced table does not exist in target db then //it is created first. if (isset($is_fk_result)) { if (in_array($is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { @@ -912,12 +913,12 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields); unset($uncommon_tables[$table_index[0]]); } - $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . - "ADD CONSTRAINT FOREIGN KEY " . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . " + $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . + "ADD CONSTRAINT FOREIGN KEY " . PMA_backquote($add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]]) . " (" . $add_column_array[$table_counter][$matching_tables_fields[$table_counter][$i]] . ") REFERENCES " . PMA_backquote($trg_db) . '.' . PMA_backquote($is_fk_result[0]['REFERENCED_TABLE_NAME']) . " (" . $is_fk_result[0]['REFERENCED_COLUMN_NAME'] . ");"; - - PMA_DBI_try_query($fk_query, $trg_link, null); + + PMA_DBI_try_query($fk_query, $trg_link, null); } } } @@ -929,31 +930,31 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * @uses array_keys() * @uses PMA_checkForeignKeys() * uses PMA_createTargetTables() -* +* * @param $src_db name of source database * @param $src_link connection established with source server * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $referenced_table table whose column is a foreign key in another table -* @param $uncommon_tables array containing names that are uncommon +* @param $uncommon_tables array containing names that are uncommon * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { - $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' + $is_fk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $src_db . "' AND TABLE_NAME = '" . $referenced_table . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $is_fk_result = PMA_DBI_fetch_result($is_fk_query, null, null, $src_link); if (sizeof($is_fk_result) > 0) { for ($j = 0; $j < sizeof($is_fk_result); $j++) { if (in_array($is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[$j]['REFERENCED_TABLE_NAME']); - PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables, - $uncommon_tables_fields, $display); + PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[$j]['REFERENCED_TABLE_NAME'], $uncommon_tables, + $uncommon_tables_fields, $display); PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields, $display); unset($uncommon_tables[$table_index[0]]); - } + } } } } @@ -964,14 +965,14 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @uses is_string() * @uses is_numeric() * @uses PMA_DBI_try_query() -* -* +* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing names of matching tables * @param $source_columns array containing columns information of the source table * @param $alter_str_array array containing the column name and criteria which is to be altered for the targert table -* @param $matching_tables_fields array containing the name of the fields for the matching table +* @param $matching_tables_fields array containing the name of the fields for the matching table * @param $criteria array containing the criterias * @param $matching_tables_keys array containing the field names which is key in the source table * @param $target_tables_keys array containing the field names which is key in the target table @@ -979,7 +980,7 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @param $display true/false value */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, - &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) + &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) { $check = true; $sql_query = ''; @@ -1001,29 +1002,29 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } $pri_query .= " ADD PRIMARY KEY ("; for ($z = 0; $z < sizeof($matching_tables_keys[$matching_table_index]); $z++) { - $pri_query .= $matching_tables_keys[$matching_table_index][$z]; + $pri_query .= PMA_backquote($matching_tables_keys[$matching_table_index][$z]); if ($z < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $pri_query .= " , " ; } } $pri_query .= ");"; } - + if (isset($pri_query)) { if ($display == true) { echo '<p>' . $pri_query . '</p>'; } - PMA_DBI_try_query($pri_query, $trg_link, 0); + PMA_DBI_try_query($pri_query, $trg_link, 0); } for ($t = 0; $t < sizeof($matching_tables_fields[$matching_table_index]); $t++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]])) && (sizeof($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]) > 0)) { - $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' . - $matching_tables_fields[$matching_table_index][$t] . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; + $sql_query = 'ALTER TABLE ' . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$matching_table_index]) . ' MODIFY ' . + PMA_backquote($matching_tables_fields[$matching_table_index][$t]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type']; $found = false; for ($i = 0; $i < sizeof($criteria); $i++) { if (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]) && $criteria[$i] != 'Key') { - $found = true; + $found = true; if (($criteria[$i] == 'Type') && (! isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i+1]]))) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i + 1]] == 'NO') { $sql_query .= " Not Null" ; @@ -1049,12 +1050,12 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } elseif($criteria[$i] == 'Default') { if(! (isset($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[2]]))) { $sql_query .= " Not Null " ; - } + } if (is_string($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { if ($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] != 'timestamp') { $sql_query .= " DEFAULT '" . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]] . "'"; } elseif($source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]]['Type'] == 'timestamp') { - $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; + $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; } } elseif (is_numeric($alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]])) { $sql_query .= " DEFAULT " . $alter_str_array[$matching_table_index][$matching_tables_fields[$matching_table_index][$t]][$criteria[$i]]; @@ -1082,7 +1083,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s for($p = 0; $p < sizeof($matching_tables_keys[$matching_table_index]); $p++) { if ((isset($alter_str_array[$matching_table_index][$matching_tables_keys[$matching_table_index][$p]]['Key']))) { $check = true; - $query .= ' MODIFY ' . $matching_tables_keys[$matching_table_index][$p] . ' ' + $query .= ' MODIFY ' . PMA_backquote($matching_tables_keys[$matching_table_index][$p]) . ' ' . $source_columns[$matching_table_index][$matching_tables_fields[$matching_table_index][$p]]['Type'] . ' Not Null '; if ($p < (sizeof($matching_tables_keys[$matching_table_index]) - 1)) { $query .= ', '; @@ -1092,7 +1093,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s if ($check) { if ($display == true) { echo '<p>' . $query . '</p>'; - } + } PMA_DBI_try_query($query, $trg_link, 0); } } @@ -1101,13 +1102,13 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s * PMA_removeColumnsFromTargetTable() removes the columns which are present in target table but not in source table. * @uses sizeof() * @uses PMA_DBI_try_query() -* @uses PMA_DBI_fetch_result() -* +* @uses PMA_DBI_fetch_result() +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing names of matching tables * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table -* @param $table_counter index of the matching table as in $matchiing_tables array +* @param $table_counter index of the matching table as in $matchiing_tables array * @param $display true/false value */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) @@ -1116,67 +1117,67 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $drop_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($uncommon_columns[$table_counter]); $a++) { //Checks if column to be removed is a foreign key in any table - $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' + $pk_query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_SCHEMA = '" . $trg_db . "' AND REFERENCED_TABLE_NAME = '" . $matching_tables[$table_counter]."' AND REFERENCED_COLUMN_NAME = '" . $uncommon_columns[$table_counter][$a] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; - + $pk_query_result = PMA_DBI_fetch_result($pk_query, null, null, $trg_link); $result_size = sizeof($pk_query_result); - + if ($result_size > 0) { for ($b = 0; $b < $result_size; $b++) { $drop_pk_query = "ALTER TABLE " . PMA_backquote($pk_query_result[$b]['TABLE_SCHEMA']) . "." . PMA_backquote($pk_query_result[$b]['TABLE_NAME']) . " - DROP FOREIGN KEY " . $pk_query_result[$b]['CONSTRAINT_NAME'] . ", DROP COLUMN " . $pk_query_result[$b]['COLUMN_NAME'] . ";"; - PMA_DBI_try_query($drop_pk_query, $trg_link, 0); - } - } - $query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" + DROP FOREIGN KEY " . PMA_backquote($pk_query_result[$b]['CONSTRAINT_NAME']) . ", DROP COLUMN " . PMA_backquote($pk_query_result[$b]['COLUMN_NAME']) . ";"; + PMA_DBI_try_query($drop_pk_query, $trg_link, 0); + } + } + $query = "SELECT * FROM information_schema.KEY_COLUMN_USAGE WHERE TABLE_SCHEMA = '" . $trg_db . "' AND TABLE_NAME = '" . $matching_tables[$table_counter]. "' AND COLUMN_NAME = '" . $uncommon_columns[$table_counter][$a] . "' AND TABLE_NAME <> REFERENCED_TABLE_NAME;"; $result = PMA_DBI_fetch_result($query, null, null, $trg_link); if (sizeof($result) > 0) { - $drop_query .= " DROP FOREIGN KEY " . $result[0]['CONSTRAINT_NAME'] . ","; + $drop_query .= " DROP FOREIGN KEY " . PMA_backquote($result[0]['CONSTRAINT_NAME']) . ","; } - $drop_query .= " DROP COLUMN " . $uncommon_columns[$table_counter][$a]; + $drop_query .= " DROP COLUMN " . PMA_backquote($uncommon_columns[$table_counter][$a]); if ($a < (sizeof($uncommon_columns[$table_counter]) - 1)) { $drop_query .= " , " ; - } + } } $drop_query .= ";" ; - + if ($display == true) { echo '<p>' . $drop_query . '</p>'; } - PMA_DBI_try_query($drop_query, $trg_link, 0); - } -} + PMA_DBI_try_query($drop_query, $trg_link, 0); + } +} /** * PMA_indexesDiffInTables() compares the source table indexes with target table indexes and keep the indexes to be added in target table in $add_indexes_array * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * @uses sizeof() * @uses PMA_DBI_get_table_indexes() -* -* @param $src_db name of source database +* +* @param $src_db name of source database * @param $trg_db name of target database * @param $src_link connection established with source server * @param $trg_link connection established with target server * @param $matching_tables array containing the matching tables name -* @param $source_indexes array containing the indexes of the source table +* @param $source_indexes array containing the indexes of the source table * @param $target_indexes array containing the indexes of the target table * @param $add_indexes_array array containing the name of the column on which the index is to be added in the target table * @param $alter_indexes_array array containing the key name which needs to be altered * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table -* @param $table_counter number of the matching table +* @param $table_counter number of the matching table */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) { //Gets indexes information for source and target table $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); - $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); + $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { $found = false; $z = 0; @@ -1194,15 +1195,15 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi } } } - $z++; + $z++; } if ($found === false) { if(! ($source_indexes[$table_counter][$a]['Key_name'] == 'PRIMARY')) { - $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; + $add_indexes_array [$table_counter][] = $source_indexes[$table_counter][$a]['Column_name']; } } } - + //Finds indexes that exist on target table but not on source table for ($b = 0; $b < sizeof($target_indexes[$table_counter]); $b++) { $found = false; @@ -1212,31 +1213,31 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi if ($target_indexes[$table_counter][$b]['Column_name'] == $source_indexes[$table_counter][$c]['Column_name']) { $found = true; } - $c++; + $c++; } if ($found === false) { - $remove_indexes_array[$table_counter][] = $target_indexes[$table_counter][$b]['Key_name']; + $remove_indexes_array[$table_counter][] = $target_indexes[$table_counter][$b]['Key_name']; } } } /** -* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. +* PMA_applyIndexesDiff() create indexes, alters indexes and remove indexes. * @uses sizeof() * @uses PMA_DBI_try_query() -* +* * @param $trg_db name of target database * @param $trg_link connection established with target server * @param $matching_tables array containing the matching tables name -* @param $source_indexes array containing the indexes of the source table +* @param $source_indexes array containing the indexes of the source table * @param $target_indexes array containing the indexes of the target table * @param $add_indexes_array array containing the column names on which indexes are to be created in target table * @param $alter_indexes_array array containing the column names for which indexes are to be altered * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table -* @param $table_counter number of the matching table +* @param $table_counter number of the matching table * @param $display true/false value */ -function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, +function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) { //Adds indexes on target table @@ -1244,12 +1245,12 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $sql = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]) . " ADD" ; for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { if (isset($add_indexes_array[$table_counter][$a])) { - for ($b = 0; $b < sizeof($source_indexes[$table_counter]); $b++) { + for ($b = 0; $b < sizeof($source_indexes[$table_counter]); $b++) { if ($source_indexes[$table_counter][$b]['Column_name'] == $add_indexes_array[$table_counter][$a]) { if ($source_indexes[$table_counter][$b]['Non_unique'] == '0') { $sql .= " UNIQUE "; } - $sql .= " INDEX " . $source_indexes[$table_counter][$b]['Key_name'] . " (" . $add_indexes_array[$table_counter][$a] . " );"; + $sql .= " INDEX " . PMA_backquote($source_indexes[$table_counter][$b]['Key_name']) . " (" . $add_indexes_array[$table_counter][$a] . " );"; if ($display == true) { echo '<p>' . $sql . '</p>'; } @@ -1265,9 +1266,9 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($alter_indexes_array[$table_counter]); $a++) { if (isset($alter_indexes_array[$table_counter][$a])) { - $query .= ' DROP INDEX ' . PMA_backquote($alter_indexes_array[$table_counter][$a]) . " , ADD "; + $query .= ' DROP INDEX ' . PMA_backquote($alter_indexes_array[$table_counter][$a]) . " , ADD "; $got_first_index_column = false; - for ($z = 0; $z < sizeof($source_indexes[$table_counter]); $z++) { + for ($z = 0; $z < sizeof($source_indexes[$table_counter]); $z++) { if ($source_indexes[$table_counter][$z]['Key_name'] == $alter_indexes_array[$table_counter][$a]) { if (! $got_first_index_column) { if ($source_indexes[$table_counter][$z]['Non_unique'] == '0') { @@ -1294,26 +1295,26 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $drop_index_query = "ALTER TABLE " . PMA_backquote($trg_db) . "." . PMA_backquote($matching_tables[$table_counter]); for ($a = 0; $a < sizeof($target_indexes[$table_counter]); $a++) { if (isset($remove_indexes_array[$table_counter][$a])) { - $drop_index_query .= " DROP INDEX " . $remove_indexes_array[$table_counter][$a]; + $drop_index_query .= " DROP INDEX " . PMA_backquote($remove_indexes_array[$table_counter][$a]); } if ($a < (sizeof($remove_indexes_array[$table_counter]) - 1)) { $drop_index_query .= " , " ; } } - $drop_index_query .= " ; " ; + $drop_index_query .= " ; " ; if ($display == true) { echo '<p>' . $drop_index_query . '</p>'; } - PMA_DBI_try_query($drop_index_query, $trg_link, 0); + PMA_DBI_try_query($drop_index_query, $trg_link, 0); } } /** * PMA_displayQuery() displays a query, taking the maximum display size - * into account - * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] - * - * @param $query the query to display + * into account + * @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] + * + * @param $query the query to display */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1323,11 +1324,11 @@ function PMA_displayQuery($query) { } /** - * PMA_syncDisplayHeaderSource() shows the header for source database - * @uses $_SESSION['src_type'] - * @uses $_SESSION['src_server']['host'] + * PMA_syncDisplayHeaderSource() shows the header for source database + * @uses $_SESSION['src_type'] + * @uses $_SESSION['src_server']['host'] * - * @param string $src_db source db name + * @param string $src_db source db name */ function PMA_syncDisplayHeaderSource($src_db) { echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0px; margin-bottom: 1em "> '; @@ -1347,12 +1348,12 @@ function PMA_syncDisplayHeaderSource($src_db) { /** * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables - * @uses $_SESSION['trg_type'] - * @uses $_SESSION['trg_server']['host'] - * - * @param string $trg_db target db name + * @uses $_SESSION['trg_type'] + * @uses $_SESSION['trg_server']['host'] + * + * @param string $trg_db target db name * @param array $matching_tables - * @return boolean $odd_row current value of this toggle + * @return boolean $odd_row current value of this toggle */ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) { echo '<table id="serverstatusconnections" class="data" width="43%">'; @@ -1375,10 +1376,10 @@ function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) } /** - * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors - * - * @param boolean $odd_row current status of the toggle - * @return boolean $odd_row final status of the toggle + * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors + * + * @param boolean $odd_row current status of the toggle + * @return boolean $odd_row final status of the toggle */ function PMA_syncDisplayBeginTableRow($odd_row) { $odd_row = ! $odd_row; hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23121-gaf322da

by Rouslan Placella

The branch, master has been updated via af322da95a8b043e94ca6f51c8b82d0fe117dc6b (commit) from 008ef66027f4a55d962bda74dd3c3094498ac628 (commit) - Log ----------------------------------------------------------------- commit af322da95a8b043e94ca6f51c8b82d0fe117dc6b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Nov 20 15:04:09 2011 +0000 Fixed IE bug in the new index editor ----------------------------------------------------------------------- Summary of changes: tbl_indexes.php | 47 +++++++++++++++++------------- themes/pmahomme/css/theme_right.css.php | 11 ++++++- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/tbl_indexes.php b/tbl_indexes.php index 3a1a863..b576e10 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -179,26 +179,33 @@ if ($GLOBALS['is_ajax_request'] != true) { <?php } ?> -<div> -<table class='index_info'> -<tr><td> -<strong> -<label for="input_index_name"><?php echo __('Index name:'); ?></label> -</strong> -<?php echo PMA_showhint(PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?> -</td><td> -<input type="text" name="index[Key_name]" id="input_index_name" size="25" - value="<?php echo htmlspecialchars($index->getName()); ?>" onfocus="this.select()" /> -</td></tr><tr><td> -<strong> -<label for="select_index_type"><?php echo __('Index type:'); ?></label> -</strong> -<?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> -</td><td> -<select name="index[Index_type]" id="select_index_type" > - <?php echo $index->generateIndexSelector(); ?> -</select> -</td></tr></table> +<div class='index_info'> + <div> + <div class="label"> + <strong> + <label for="input_index_name"> + <?php echo __('Index name:'); ?> + <?php echo PMA_showhint(PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?> + </label> + </strong> + </div> + <input type="text" name="index[Key_name]" id="input_index_name" size="25" + value="<?php echo htmlspecialchars($index->getName()); ?>" onfocus="this.select()" /> + </div> + <div> + <div class="label"> + <strong> + <label for="select_index_type"> + <?php echo __('Index type:'); ?> + <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> + </label> + </strong> + </div> + <select name="index[Index_type]" id="select_index_type" > + <?php echo $index->generateIndexSelector(); ?> + </select> + </div> + <div class="clearfloat"></div> </div> <table id="index_columns"> diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index db300f3..5d4c3f3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2132,13 +2132,22 @@ td.more_opts { */ #index_frm .index_info input, #index_frm .index_info select { - width: 100%; + width: 14em; box-sizing: border-box; -ms-box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; } +#index_frm .index_info div { + padding: 0.2em 0; +} + +#index_frm .index_info .label { + float: left; + min-width: 12em; +} + #index_frm .slider { width: 10em; margin: 0.6em; hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23119-ge93cacc

by Michal Čihař

The branch, master has been updated via e93caccd94c9fc75223ba0c49b9199bb08d5d407 (commit) via a6da7976116d830013d7e085a67cfe38a700fc68 (commit) via 9b626ae944d8ac499b87cf62a59ef6bdcf397bbb (commit) via a89a12388f8ec927edfcd2a220eb4032c00d62be (commit) via f275a234738cd078dc9610733202da2f195544cd (commit) via 5098fb85680ee2ffddf470cb5213bfc3a1bb4671 (commit) via 143f63144807775b1cf2413ebfb4cf07fa4aa5b2 (commit) via d7328d54e90651eb0bd92df2c36c02ae24518e20 (commit) via 7e27b76886b9cf0f79325ad7ebf69482001464fc (commit) via 6d897efabc1088d0d09e5b73b03bdb784484aae2 (commit) via eb257764de5f8d92c785c3d464ae595a182b756d (commit) via 9759eeaaede6ae5d8c1c480ac6db862bde9b5ed3 (commit) via 611e3bc69987bd1f37fc01c8a1b9370fb3763538 (commit) via ce93d271ccd8acb8186e79cfa57e4c2fda69f56a (commit) via 1dc8f0212d73d8373fa7dcd75a9fd74dcb76cfa5 (commit) via 7c4c8ecf66e039c3a5d23d88ca083a90c817773f (commit) via ebeac742afa99047cb7f053a71edb2f7a52e8de5 (commit) via 5e64e746a16781ba4189d1ea6c728aae7a2e03ac (commit) via de8dfa1706668c8f6b38571a6939caf43a6c2177 (commit) via ca3d7a15bc84b6e0180d6f58ff45a12df053d276 (commit) via 358c85b6079eb9719e3bc4b3d210a7ff2b467dae (commit) via b1b906efeb57fe0d9a98bcfd0df04d25c71c391e (commit) via 39d95758f78ae78e06e28c4fcf31ac271fcc005d (commit) via 9129c4b52f48e54d7329e6fa41dedf04d66ef20e (commit) via 6d7e921819dd122a923434e63b4a34399103e467 (commit) via 07d99dffce9dfea266911739c294ae4a57750275 (commit) via 1cff93eefb8b8e82f017e0869e392a9c1a7b15ce (commit) via 455a8d5d76a4695ef73c6f7d154c2e7f6c65f51b (commit) via 4181326dbc872f59613bc86d6870bd796c36f0ae (commit) via d43e9167ff911ddef1f50993175d4390f0194310 (commit) via 797e216713abee0e18448929c865b2a9f09a6b0b (commit) via ce58af9c81fc9a9a336451e76d9b4bf4811b1a5a (commit) via 67cebd3dac9932ebefad70d2cef84e9d9f3ef8f6 (commit) via fd89e050951a1c04ea45db42d8b4be840000dd37 (commit) via b4f3369f4809ad5835c0adb429dd6fe0c985fa73 (commit) via 65e18e43c24771fd29adcf72b9c4eb2f66bb93ef (commit) via 788f5ad277e207f9ddedb5fb2d094abb17566d5a (commit) via 0700694ba839876b7669b4af2fdcf72e6b84cb6f (commit) via 6517aa01081723305a6c4962ef0af53eab51dbff (commit) via f9dfafb0a8c4663d837937ecc5d6cd3567d2f21b (commit) via 1a8ac23aab91916b756f059c181fe751a2eac9fe (commit) via f06435c3833066a4f23850b4a8c07842ceb80016 (commit) via cddfee44d2919187bdde2634deab785fdeae4ac4 (commit) via 90e978d094fd514ad3262253c3983a3a398a1b4c (commit) via 82a600718fe14098df259698948878ffa74cdc44 (commit) via 71553403148ec3596bce0ef0c69dd69c34ffe486 (commit) via 8748039c626d8b02eed1cb98c9f603c55d8cb391 (commit) via 57b6a3723a1363217464ad4a7cde9791f30d0209 (commit) via d029e6b6de452ddbbe00c6997b104bf127f43697 (commit) via 5d96ff03a61aac42418708180e453b0b7fddff42 (commit) via 0f5ef47fd43f8596175c88be02c06674b87c2825 (commit) via a37d41f6be9bd747e0ae27c70d9f7dc223354ea1 (commit) via 3526e2ad517154076ac06d6c08c33757be519c2e (commit) via b9f8f8d17a680f252765e7c0b6e30665d1259c7b (commit) via ecfa6413cb18bc0234bb82dafac3567131ee2a24 (commit) via 59703a4617b03e62d3b325e2b5d518ab4af2d623 (commit) via 3398dda8296dcea75e3178820dfd845a2e4e1eb4 (commit) via d80f06bf1b949cf4ddda5827de4aa703d8c54b1c (commit) via df95142a60d1242afe8279ed7d09138918ce6943 (commit) via 793d1255601645e5d969135f9908215adb815d7e (commit) via 08bf2d1adcf6d8249faebe01a2741dd40f8cab8d (commit) via e94abd010c167c5b25441225333c7ba51144af7a (commit) via fc7b17cf03f1c61c83807a751d3046d9838398db (commit) via 7b0dc1b5af1a5461bb7b496f12e1995956e1d750 (commit) via c06d35e7278e4d49d8f99fe0458653fc3be38b2f (commit) via 6e8c9526e5a88f978498e6a38835b31827468e3a (commit) via 8ceedfe0726d4dbc0e7cf9208abf8e51fbbd7fdd (commit) via cb51e42b17825890b69730f33982d09e3a837d5d (commit) via 5f62396cc0275463dc283687b027bd4c09293c35 (commit) via d014d262521f0db0f3cf8947d4a2033bb8977e8d (commit) via 202c8fd1ab154719253cbb18b70e02a1ca918c34 (commit) via 66ad79162bee8f2bee90d28591f097403ef5f440 (commit) via 79ac018f718f49d883695ec21dfbdfd42a4d38b0 (commit) via d0d3e95f92377ff263f0876fc6549291b25a374f (commit) via 063cded26d61cbe862e4b02693f7544265721782 (commit) via 6869854f99bf0e5587e8a6963d1f3a5f057c07e1 (commit) via a9c087d7ccf415f16f8c08155b664ef656ef6328 (commit) via 7685b5136d923c599ada6b7ce17d519ff7091992 (commit) via ef9d7dd6720f15ff18cce1db03d676a2dcccb2ca (commit) via ea5e709be91fa42d99337f2966ca7d7827c5bd5b (commit) via 2c514415c204ebbf353623973f224171b6384963 (commit) via 6b925e52cd422a4175556613b0246e9c51760832 (commit) via 2247774de480ad34429da0bd62c1aa7bae2eb650 (commit) via b672f43dc3ec0ee58e3e30beac81259d259e9de5 (commit) via e2ca5b67257e18f0d1bac6cd5883fc051cd6aa3d (commit) via c9ac7aa2428fcd2218115ec688a1d0294baab0af (commit) via d9a029810f8a5928b1ab28b4c52b43fb01c58a8a (commit) via d454ef905deabbeb1531c3bf94677e30b06093ff (commit) via dc418cf7c5285837d228fe3766a0f50836c05157 (commit) via 193df329ea9ec38f91e25af7025d9dd3e53a9016 (commit) via f095925c06e82307143aad7ac01d18c1b168694c (commit) via f5e4e895e61bed82edc33051011f4cc2f854d3c9 (commit) via 3804d3ec38da5e7ccef0c5d3652ac2ac08ee86ea (commit) via cce81e02c31ebbae40b6e17668c855908d38bc48 (commit) via e98610f17a9d992b23ebdfcbc9aa81a74ccac28d (commit) via 4e01be8335bb10007386bf16e2af8c59456e1ee3 (commit) via bc8f341be0e7e72fecc2ada43bfcbb7a3250fa66 (commit) via 9b3b9ceb81b3c7723df1fd0d90b6c4ea694d2682 (commit) via 85cdffd52e2c1ba416880ab471e38b91310240a2 (commit) via 1530cf9c587593b36ca673df345ca327d4875d10 (commit) via 1b5b4281e0671c52b9c24b253dbdda1a2aa1cb14 (commit) via cb1e129de9aa12a828870b2c977d97eddf6be776 (commit) via 986feded2cc1b739478bbbc5962bbcc05e26a61e (commit) via e4edf40d8b79bd240375900aec267e988e6ecdfc (commit) via 40bace4e82e09c63941c4c00c257ca70afbb27ba (commit) via 9470c39e67d740a443408e186e40e4068674b6b5 (commit) via f3eed2d8dc9ae42a4860068c454ac1fc98aeec95 (commit) via f0cf45d2af76a4724b9ed2c92cc6e05d76f9c12b (commit) via c2f0958b7b4ec0d595532e67f5e9cedbe8a82b38 (commit) via fb7622e5d81a0601fc3ea4cf864e723bbfdec46d (commit) via 7f0654d5954a3d69dbad30edc653b3c8e4580029 (commit) via 1cfeba3c1d56d13d9cdb3b8ba84f490c3985752d (commit) via 12cc2266a0648c80d1f24ef0a253920054d6a49a (commit) via d0f7666318289b232bca0b9e506ed9decae6d38a (commit) via 0af8cab0e9b9f47bc9af1f80ab5c296f02d3a0f0 (commit) via 0198ea9709b0d7faf8c8d39bf8fcb2c047e38ef0 (commit) via 0eeccf92b70d76d9cec44bd850105bd518d5cc2a (commit) via c6d5e25506f86d34051665d04cda0329718bd67b (commit) via c075f2cae5fc3ca9daa313309bb4f809114ee047 (commit) via 3544fe682b6a6a54e080059dda1e73ec2dcf8630 (commit) via 997a203ab63f25141c5d8fdb904818291403cfea (commit) via b73f2ec973e527e2e7b3128e2a35abeffe454739 (commit) via ee5b75d28915ba6f1345e77c7cfab080771668c0 (commit) via b2f5b21b189bbd6e53570cc98aac0d0e5645b5b4 (commit) via def2db1d6363747e578d60d28499956403862df5 (commit) via d598bbbcfaaa0d4574c5ef4232881f5c75d7b97c (commit) via 47cee6041d3bfb85c79eb66e745a32f0a6f09bdd (commit) via 71785d418f0eb32eeb3e5b8ef25710ab0dea951a (commit) via 3be76acc981d0f17e7113fcfb423705b6f0321bf (commit) via 41faaf1e3db476281e71249b2cadb7b1115a2bfd (commit) via 2dfbf644d59520ea7f51695e2832b569304bcbf1 (commit) via 1fa8b5e5b14f402a9c8ad952e40fae8ce101216d (commit) via 8c6dc3569152fab0dd1610c9c5e22382a4f561eb (commit) via 6c5e585d53bee427a7da564a6ffa789db4a07626 (commit) via 21e6d84d8ad21b92c8b7b7ca1d41e08204bcc33c (commit) via d640662110732684a026b7f20b20bf877a5d2aed (commit) via f44233129e2b642f2fec676f5f7b99abab44ff51 (commit) from 4f77ea7e577f663adc6649eaf1de089b17fc12de (commit) - Log ----------------------------------------------------------------- commit e93caccd94c9fc75223ba0c49b9199bb08d5d407 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Nov 20 15:12:15 2011 +0100 Mark fuzzy translations missing format string commit a6da7976116d830013d7e085a67cfe38a700fc68 Merge: 4f77ea7 9b626ae Author: Michal Čihař <michal(a)cihar.com> Date: Sun Nov 20 15:10:52 2011 +0100 Merge remote-tracking branch 'pootle/master' Conflicts: po/fr.po po/it.po po/ja.po po/ko.po po/ru.po po/sl.po po/sv.po po/th.po po/tr.po commit 9b626ae944d8ac499b87cf62a59ef6bdcf397bbb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:46:02 2011 +0200 Translation update done using Pootle. commit a89a12388f8ec927edfcd2a220eb4032c00d62be Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:44:16 2011 +0200 Translation update done using Pootle. commit f275a234738cd078dc9610733202da2f195544cd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:43:47 2011 +0200 Translation update done using Pootle. commit 5098fb85680ee2ffddf470cb5213bfc3a1bb4671 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:40:25 2011 +0200 Translation update done using Pootle. commit 143f63144807775b1cf2413ebfb4cf07fa4aa5b2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:39:08 2011 +0200 Translation update done using Pootle. commit d7328d54e90651eb0bd92df2c36c02ae24518e20 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:38:55 2011 +0200 Translation update done using Pootle. commit 7e27b76886b9cf0f79325ad7ebf69482001464fc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:37:49 2011 +0200 Translation update done using Pootle. commit 6d897efabc1088d0d09e5b73b03bdb784484aae2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:37:18 2011 +0200 Translation update done using Pootle. commit eb257764de5f8d92c785c3d464ae595a182b756d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:35:54 2011 +0200 Translation update done using Pootle. commit 9759eeaaede6ae5d8c1c480ac6db862bde9b5ed3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:31:32 2011 +0200 Translation update done using Pootle. commit 611e3bc69987bd1f37fc01c8a1b9370fb3763538 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:30:46 2011 +0200 Translation update done using Pootle. commit ce93d271ccd8acb8186e79cfa57e4c2fda69f56a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:29:02 2011 +0200 Translation update done using Pootle. commit 1dc8f0212d73d8373fa7dcd75a9fd74dcb76cfa5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:22:22 2011 +0200 Translation update done using Pootle. commit 7c4c8ecf66e039c3a5d23d88ca083a90c817773f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:21:36 2011 +0200 Translation update done using Pootle. commit ebeac742afa99047cb7f053a71edb2f7a52e8de5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:17:55 2011 +0200 Translation update done using Pootle. commit 5e64e746a16781ba4189d1ea6c728aae7a2e03ac Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:17:14 2011 +0200 Translation update done using Pootle. commit de8dfa1706668c8f6b38571a6939caf43a6c2177 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:14:44 2011 +0200 Translation update done using Pootle. commit ca3d7a15bc84b6e0180d6f58ff45a12df053d276 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:14:07 2011 +0200 Translation update done using Pootle. commit 358c85b6079eb9719e3bc4b3d210a7ff2b467dae Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:11:39 2011 +0200 Translation update done using Pootle. commit b1b906efeb57fe0d9a98bcfd0df04d25c71c391e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:07:27 2011 +0200 Translation update done using Pootle. commit 39d95758f78ae78e06e28c4fcf31ac271fcc005d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:06:18 2011 +0200 Translation update done using Pootle. commit 9129c4b52f48e54d7329e6fa41dedf04d66ef20e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun Nov 20 09:02:32 2011 +0200 Translation update done using Pootle. commit 6d7e921819dd122a923434e63b4a34399103e467 Merge: 07d99df b131ec7 Author: Pootle server <pootle(a)cihar.com> Date: Sat Nov 19 22:40:15 2011 +0100 Merge remote-tracking branch 'origin/master' commit 07d99dffce9dfea266911739c294ae4a57750275 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Nov 19 23:36:08 2011 +0200 Translation update done using Pootle. commit 1cff93eefb8b8e82f017e0869e392a9c1a7b15ce Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:25:48 2011 +0200 Translation update done using Pootle. commit 455a8d5d76a4695ef73c6f7d154c2e7f6c65f51b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:25:23 2011 +0200 Translation update done using Pootle. commit 4181326dbc872f59613bc86d6870bd796c36f0ae Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:24:55 2011 +0200 Translation update done using Pootle. commit d43e9167ff911ddef1f50993175d4390f0194310 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:23:51 2011 +0200 Translation update done using Pootle. commit 797e216713abee0e18448929c865b2a9f09a6b0b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:22:26 2011 +0200 Translation update done using Pootle. commit ce58af9c81fc9a9a336451e76d9b4bf4811b1a5a Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:21:42 2011 +0200 Translation update done using Pootle. commit 67cebd3dac9932ebefad70d2cef84e9d9f3ef8f6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:21:34 2011 +0200 Translation update done using Pootle. commit fd89e050951a1c04ea45db42d8b4be840000dd37 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:21:06 2011 +0200 Translation update done using Pootle. commit b4f3369f4809ad5835c0adb429dd6fe0c985fa73 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:20:56 2011 +0200 Translation update done using Pootle. commit 65e18e43c24771fd29adcf72b9c4eb2f66bb93ef Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:19:02 2011 +0200 Translation update done using Pootle. commit 788f5ad277e207f9ddedb5fb2d094abb17566d5a Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:17:30 2011 +0200 Translation update done using Pootle. commit 0700694ba839876b7669b4af2fdcf72e6b84cb6f Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:17:10 2011 +0200 Translation update done using Pootle. commit 6517aa01081723305a6c4962ef0af53eab51dbff Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:16:59 2011 +0200 Translation update done using Pootle. commit f9dfafb0a8c4663d837937ecc5d6cd3567d2f21b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:16:41 2011 +0200 Translation update done using Pootle. commit 1a8ac23aab91916b756f059c181fe751a2eac9fe Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:16:04 2011 +0200 Translation update done using Pootle. commit f06435c3833066a4f23850b4a8c07842ceb80016 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:15:34 2011 +0200 Translation update done using Pootle. commit cddfee44d2919187bdde2634deab785fdeae4ac4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:14:53 2011 +0200 Translation update done using Pootle. commit 90e978d094fd514ad3262253c3983a3a398a1b4c Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:14:05 2011 +0200 Translation update done using Pootle. commit 82a600718fe14098df259698948878ffa74cdc44 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:13:37 2011 +0200 Translation update done using Pootle. commit 71553403148ec3596bce0ef0c69dd69c34ffe486 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:11:55 2011 +0200 Translation update done using Pootle. commit 8748039c626d8b02eed1cb98c9f603c55d8cb391 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:11:33 2011 +0200 Translation update done using Pootle. commit 57b6a3723a1363217464ad4a7cde9791f30d0209 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:11:20 2011 +0200 Translation update done using Pootle. commit d029e6b6de452ddbbe00c6997b104bf127f43697 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:11:01 2011 +0200 Translation update done using Pootle. commit 5d96ff03a61aac42418708180e453b0b7fddff42 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:10:43 2011 +0200 Translation update done using Pootle. commit 0f5ef47fd43f8596175c88be02c06674b87c2825 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:10:33 2011 +0200 Translation update done using Pootle. commit a37d41f6be9bd747e0ae27c70d9f7dc223354ea1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:10:24 2011 +0200 Translation update done using Pootle. commit 3526e2ad517154076ac06d6c08c33757be519c2e Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:09:53 2011 +0200 Translation update done using Pootle. commit b9f8f8d17a680f252765e7c0b6e30665d1259c7b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:09:44 2011 +0200 Translation update done using Pootle. commit ecfa6413cb18bc0234bb82dafac3567131ee2a24 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:09:18 2011 +0200 Translation update done using Pootle. commit 59703a4617b03e62d3b325e2b5d518ab4af2d623 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:08:57 2011 +0200 Translation update done using Pootle. commit 3398dda8296dcea75e3178820dfd845a2e4e1eb4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:08:51 2011 +0200 Translation update done using Pootle. commit d80f06bf1b949cf4ddda5827de4aa703d8c54b1c Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:08:28 2011 +0200 Translation update done using Pootle. commit df95142a60d1242afe8279ed7d09138918ce6943 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:08:19 2011 +0200 Translation update done using Pootle. commit 793d1255601645e5d969135f9908215adb815d7e Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:06:11 2011 +0200 Translation update done using Pootle. commit 08bf2d1adcf6d8249faebe01a2741dd40f8cab8d Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:04:44 2011 +0200 Translation update done using Pootle. commit e94abd010c167c5b25441225333c7ba51144af7a Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:02:24 2011 +0200 Translation update done using Pootle. commit fc7b17cf03f1c61c83807a751d3046d9838398db Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:02:08 2011 +0200 Translation update done using Pootle. commit 7b0dc1b5af1a5461bb7b496f12e1995956e1d750 Author: any anonymous user <> Date: Sat Nov 19 23:00:54 2011 +0200 Translation update done using Pootle. commit c06d35e7278e4d49d8f99fe0458653fc3be38b2f Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:54 2011 +0200 Translation update done using Pootle. commit 6e8c9526e5a88f978498e6a38835b31827468e3a Author: any anonymous user <> Date: Sat Nov 19 23:00:44 2011 +0200 Translation update done using Pootle. commit 8ceedfe0726d4dbc0e7cf9208abf8e51fbbd7fdd Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:43 2011 +0200 Translation update done using Pootle. commit cb51e42b17825890b69730f33982d09e3a837d5d Author: any anonymous user <> Date: Sat Nov 19 23:00:38 2011 +0200 Translation update done using Pootle. commit 5f62396cc0275463dc283687b027bd4c09293c35 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:38 2011 +0200 Translation update done using Pootle. commit d014d262521f0db0f3cf8947d4a2033bb8977e8d Author: any anonymous user <> Date: Sat Nov 19 23:00:32 2011 +0200 Translation update done using Pootle. commit 202c8fd1ab154719253cbb18b70e02a1ca918c34 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:31 2011 +0200 Translation update done using Pootle. commit 66ad79162bee8f2bee90d28591f097403ef5f440 Author: any anonymous user <> Date: Sat Nov 19 23:00:26 2011 +0200 Translation update done using Pootle. commit 79ac018f718f49d883695ec21dfbdfd42a4d38b0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:26 2011 +0200 Translation update done using Pootle. commit d0d3e95f92377ff263f0876fc6549291b25a374f Author: any anonymous user <> Date: Sat Nov 19 23:00:18 2011 +0200 Translation update done using Pootle. commit 063cded26d61cbe862e4b02693f7544265721782 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:17 2011 +0200 Translation update done using Pootle. commit 6869854f99bf0e5587e8a6963d1f3a5f057c07e1 Author: any anonymous user <> Date: Sat Nov 19 23:00:11 2011 +0200 Translation update done using Pootle. commit a9c087d7ccf415f16f8c08155b664ef656ef6328 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:11 2011 +0200 Translation update done using Pootle. commit 7685b5136d923c599ada6b7ce17d519ff7091992 Author: any anonymous user <> Date: Sat Nov 19 23:00:03 2011 +0200 Translation update done using Pootle. commit ef9d7dd6720f15ff18cce1db03d676a2dcccb2ca Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 23:00:03 2011 +0200 Translation update done using Pootle. commit ea5e709be91fa42d99337f2966ca7d7827c5bd5b Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:59:55 2011 +0200 Translation update done using Pootle. commit 2c514415c204ebbf353623973f224171b6384963 Author: any anonymous user <> Date: Sat Nov 19 22:59:34 2011 +0200 Translation update done using Pootle. commit 6b925e52cd422a4175556613b0246e9c51760832 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:59:34 2011 +0200 Translation update done using Pootle. commit 2247774de480ad34429da0bd62c1aa7bae2eb650 Author: any anonymous user <> Date: Sat Nov 19 22:59:24 2011 +0200 Translation update done using Pootle. commit b672f43dc3ec0ee58e3e30beac81259d259e9de5 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:59:24 2011 +0200 Translation update done using Pootle. commit e2ca5b67257e18f0d1bac6cd5883fc051cd6aa3d Author: any anonymous user <> Date: Sat Nov 19 22:58:57 2011 +0200 Translation update done using Pootle. commit c9ac7aa2428fcd2218115ec688a1d0294baab0af Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:58:57 2011 +0200 Translation update done using Pootle. commit d9a029810f8a5928b1ab28b4c52b43fb01c58a8a Author: any anonymous user <> Date: Sat Nov 19 22:58:47 2011 +0200 Translation update done using Pootle. commit d454ef905deabbeb1531c3bf94677e30b06093ff Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:58:47 2011 +0200 Translation update done using Pootle. commit dc418cf7c5285837d228fe3766a0f50836c05157 Author: any anonymous user <> Date: Sat Nov 19 22:58:31 2011 +0200 Translation update done using Pootle. commit 193df329ea9ec38f91e25af7025d9dd3e53a9016 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:58:30 2011 +0200 Translation update done using Pootle. commit f095925c06e82307143aad7ac01d18c1b168694c Author: any anonymous user <> Date: Sat Nov 19 22:58:18 2011 +0200 Translation update done using Pootle. commit f5e4e895e61bed82edc33051011f4cc2f854d3c9 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:58:17 2011 +0200 Translation update done using Pootle. commit 3804d3ec38da5e7ccef0c5d3652ac2ac08ee86ea Author: any anonymous user <> Date: Sat Nov 19 22:57:53 2011 +0200 Translation update done using Pootle. commit cce81e02c31ebbae40b6e17668c855908d38bc48 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Nov 19 22:57:52 2011 +0200 Translation update done using Pootle. commit e98610f17a9d992b23ebdfcbc9aa81a74ccac28d Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 22:18:39 2011 +0200 Translation update done using Pootle. commit 4e01be8335bb10007386bf16e2af8c59456e1ee3 Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 22:18:22 2011 +0200 Translation update done using Pootle. commit bc8f341be0e7e72fecc2ada43bfcbb7a3250fa66 Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 22:17:55 2011 +0200 Translation update done using Pootle. commit 9b3b9ceb81b3c7723df1fd0d90b6c4ea694d2682 Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 22:17:39 2011 +0200 Translation update done using Pootle. commit 85cdffd52e2c1ba416880ab471e38b91310240a2 Merge: 1530cf9 c2a8246 Author: Pootle server <pootle(a)cihar.com> Date: Sat Nov 19 14:40:15 2011 +0100 Merge remote-tracking branch 'origin/master' commit 1530cf9c587593b36ca673df345ca327d4875d10 Merge: 1b5b428 6723a5b Author: Pootle server <pootle(a)cihar.com> Date: Sat Nov 19 12:40:19 2011 +0100 Merge remote-tracking branch 'origin/master' commit 1b5b4281e0671c52b9c24b253dbdda1a2aa1cb14 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 12:45:38 2011 +0200 Translation update done using Pootle. commit cb1e129de9aa12a828870b2c977d97eddf6be776 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 12:43:39 2011 +0200 Translation update done using Pootle. commit 986feded2cc1b739478bbbc5962bbcc05e26a61e Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 12:43:34 2011 +0200 Translation update done using Pootle. commit e4edf40d8b79bd240375900aec267e988e6ecdfc Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 12:42:08 2011 +0200 Translation update done using Pootle. commit 40bace4e82e09c63941c4c00c257ca70afbb27ba Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 12:40:24 2011 +0200 Translation update done using Pootle. commit 9470c39e67d740a443408e186e40e4068674b6b5 Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 12:38:18 2011 +0200 Translation update done using Pootle. commit f3eed2d8dc9ae42a4860068c454ac1fc98aeec95 Author: Domen <dbc334(a)gmail.com> Date: Sat Nov 19 12:37:52 2011 +0200 Translation update done using Pootle. commit f0cf45d2af76a4724b9ed2c92cc6e05d76f9c12b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 09:17:03 2011 +0200 Translation update done using Pootle. commit c2f0958b7b4ec0d595532e67f5e9cedbe8a82b38 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 09:16:48 2011 +0200 Translation update done using Pootle. commit fb7622e5d81a0601fc3ea4cf864e723bbfdec46d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 09:07:50 2011 +0200 Translation update done using Pootle. commit 7f0654d5954a3d69dbad30edc653b3c8e4580029 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:46:02 2011 +0200 Translation update done using Pootle. commit 1cfeba3c1d56d13d9cdb3b8ba84f490c3985752d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:44:02 2011 +0200 Translation update done using Pootle. commit 12cc2266a0648c80d1f24ef0a253920054d6a49a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:40:48 2011 +0200 Translation update done using Pootle. commit d0f7666318289b232bca0b9e506ed9decae6d38a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:25:51 2011 +0200 Translation update done using Pootle. commit 0af8cab0e9b9f47bc9af1f80ab5c296f02d3a0f0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:24:28 2011 +0200 Translation update done using Pootle. commit 0198ea9709b0d7faf8c8d39bf8fcb2c047e38ef0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:22:16 2011 +0200 Translation update done using Pootle. commit 0eeccf92b70d76d9cec44bd850105bd518d5cc2a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:19:34 2011 +0200 Translation update done using Pootle. commit c6d5e25506f86d34051665d04cda0329718bd67b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:19:25 2011 +0200 Translation update done using Pootle. commit c075f2cae5fc3ca9daa313309bb4f809114ee047 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:19:11 2011 +0200 Translation update done using Pootle. commit 3544fe682b6a6a54e080059dda1e73ec2dcf8630 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:06:58 2011 +0200 Translation update done using Pootle. commit 997a203ab63f25141c5d8fdb904818291403cfea Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sat Nov 19 08:06:44 2011 +0200 Translation update done using Pootle. commit b73f2ec973e527e2e7b3128e2a35abeffe454739 Merge: ee5b75d baf4310 Author: Pootle server <pootle(a)cihar.com> Date: Fri Nov 18 14:40:12 2011 +0100 Merge remote-tracking branch 'origin/master' commit ee5b75d28915ba6f1345e77c7cfab080771668c0 Author: manyfun <manyfun7(a)gmail.com> Date: Fri Nov 18 08:36:21 2011 +0200 Translation update done using Pootle. commit b2f5b21b189bbd6e53570cc98aac0d0e5645b5b4 Author: Gihun Ham <progh2(a)gmail.com> Date: Fri Nov 18 08:35:42 2011 +0200 Translation update done using Pootle. commit def2db1d6363747e578d60d28499956403862df5 Author: Domen <dbc334(a)gmail.com> Date: Fri Nov 18 02:14:19 2011 +0200 Translation update done using Pootle. commit d598bbbcfaaa0d4574c5ef4232881f5c75d7b97c Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Nov 17 20:57:18 2011 +0200 Translation update done using Pootle. commit 47cee6041d3bfb85c79eb66e745a32f0a6f09bdd Merge: 71785d4 c72d079 Author: Pootle server <pootle(a)cihar.com> Date: Thu Nov 17 14:40:07 2011 +0100 Merge remote-tracking branch 'origin/master' commit 71785d418f0eb32eeb3e5b8ef25710ab0dea951a Author: Pootle server <noreply(a)l10n.cihar.com> Date: Thu Nov 17 10:38:56 2011 +0200 Translation update done using Pootle. commit 3be76acc981d0f17e7113fcfb423705b6f0321bf Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Thu Nov 17 07:53:07 2011 +0200 Translation update done using Pootle. commit 41faaf1e3db476281e71249b2cadb7b1115a2bfd Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Thu Nov 17 07:51:53 2011 +0200 Translation update done using Pootle. commit 2dfbf644d59520ea7f51695e2832b569304bcbf1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Nov 17 00:27:37 2011 +0200 Translation update done using Pootle. commit 1fa8b5e5b14f402a9c8ad952e40fae8ce101216d Merge: 8c6dc35 16875ec Author: Pootle server <pootle(a)cihar.com> Date: Wed Nov 16 22:40:10 2011 +0100 Merge remote-tracking branch 'origin/master' commit 8c6dc3569152fab0dd1610c9c5e22382a4f561eb Author: ProUser <stefan(a)inkopsforum.se> Date: Wed Nov 16 21:46:24 2011 +0200 Translation update done using Pootle. commit 6c5e585d53bee427a7da564a6ffa789db4a07626 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Nov 16 18:20:02 2011 +0200 Translation update done using Pootle. commit 21e6d84d8ad21b92c8b7b7ca1d41e08204bcc33c Author: Domen <dbc334(a)gmail.com> Date: Wed Nov 16 18:09:49 2011 +0200 Translation update done using Pootle. commit d640662110732684a026b7f20b20bf877a5d2aed Merge: f442331 f697160 Author: Pootle server <pootle(a)cihar.com> Date: Wed Nov 16 14:40:11 2011 +0100 Merge remote-tracking branch 'origin/master' commit f44233129e2b642f2fec676f5f7b99abab44ff51 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Nov 16 14:38:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 2 +- po/fr.po | 15 +++++-- po/it.po | 125 +++++++++++++++++++++++++++++++------------------------------- po/ja.po | 92 ++++++++++++++++++++++------------------------ po/ko.po | 8 ++-- po/ru.po | 2 +- po/sl.po | 9 +--- po/sv.po | 7 +-- po/th.po | 8 +-- po/tr.po | 28 ++++--------- 10 files changed, 141 insertions(+), 155 deletions(-) diff --git a/po/es.po b/po/es.po index 49d9101..4a3b34b 100644 --- a/po/es.po +++ b/po/es.po @@ -5514,7 +5514,7 @@ msgstr "El servidor no está respondiendo." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Revisa los permisos del directorio que contiene la base de datos." #: libraries/database_interface.lib.php:1780 msgid "Details..." diff --git a/po/fr.po b/po/fr.po index 6a9172c..e6ef8cb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-14 22:27+0200\n" +"PO-Revision-Date: 2011-11-19 12:43+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -5467,6 +5467,7 @@ msgstr "Le serveur ne répond pas." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." msgstr "" +"Veuillez vérifier les privilèges du répertoire contenant la base de données." #: libraries/database_interface.lib.php:1780 msgid "Details..." @@ -9367,14 +9368,14 @@ msgstr "... supprimer l'ancien utilisateur." msgid "" "... revoke all active privileges from the old one and delete it afterwards." msgstr "" -" ... effacer tous les privilèges de l'ancien utilisateur, puis l'effacer." +"... effacer tous les privilèges de l'ancien utilisateur, puis l'effacer." #: server_privileges.php:2188 msgid "" "... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -" ... supprimer l'ancien utilisateur, puis recharger les privilèges au " +"... supprimer l'ancien utilisateur, puis recharger les privilèges au " "serveur." #: server_privileges.php:2211 @@ -11958,7 +11959,9 @@ msgstr "Le temps de disponibilité est inférieur à un jour" #: po/advisory_rules.php:12 msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "Les informations de réglage peuvent être inexactes." +msgstr "" +"Le système est en marche depuis moins d'un jour, les conseils de performance " +"peuvent être inexacts." #: po/advisory_rules.php:15 msgid "" @@ -12809,7 +12812,9 @@ msgstr "Pourcentage du nombre de fichiers ouverts" msgid "" "The number of open files is approaching the max number of open files. You " "may get a \\\"Too many open files\\\" error." -msgstr "Le nombre de fichiers ouverts s'approche du maximum." +msgstr "" +"Le nombre de fichiers ouverts s'approche du maximum. Vous pouvez obtenir " +"l'erreur \\«Trop de fichiers sont ouverts\\»." #: po/advisory_rules.php:555 po/advisory_rules.php:570 msgid "" diff --git a/po/it.po b/po/it.po index 2dcdb35..3d55613 100644 --- a/po/it.po +++ b/po/it.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-02 20:32+0200\n" -"Last-Translator: any anonymous user <>\n" +"PO-Revision-Date: 2011-11-19 23:25+0200\n" +"Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -413,10 +413,10 @@ msgid "You have to choose at least one column to display" msgstr "Devi scegliere almeno un campo da mostrare" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "creazione query assistita" +msgstr "Passa a %svisual builder%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:995 @@ -814,16 +814,15 @@ msgid "Values for a new column" msgstr "Valori per un nuovo campo" #: enum_editor.php:30 js/messages.php:246 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Values for column %s" -msgstr "Valori per il campo \"%s\"" +msgstr "Valori per il campo %s" #: enum_editor.php:34 js/messages.php:248 -#, fuzzy #| msgid "Enter each value in a separate field." msgid "Enter each value in a separate field" -msgstr "Inserisci ogni valore in un campo separato." +msgstr "Inserisci ogni valore in un campo separato" #: enum_editor.php:121 #, fuzzy @@ -1339,13 +1338,13 @@ msgstr "Memoria totale" #, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "Memoria" +msgstr "Memoria cached" #: js/messages.php:110 #, fuzzy #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "Buffer Pool" +msgstr "Memoria Buffer" #: js/messages.php:111 #, fuzzy @@ -1367,7 +1366,7 @@ msgstr "Swap totale" #: js/messages.php:115 msgid "Cached Swap" -msgstr "" +msgstr "Swap in cache" #: js/messages.php:116 msgid "Used Swap" @@ -1377,7 +1376,7 @@ msgstr "Swap utilizzata" #, fuzzy #| msgid "Free pages" msgid "Free Swap" -msgstr "Pagine libere" +msgstr "Swap libera" #: js/messages.php:119 msgid "Bytes sent" @@ -1620,7 +1619,7 @@ msgstr "Filtra query per parola/regexp:" #: js/messages.php:178 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "" +msgstr "Raggruppa query ignorando dati variabili nelle condizioni del WHERE" #: js/messages.php:179 #, fuzzy @@ -1646,12 +1645,14 @@ msgid "" "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." msgstr "" +"Richiedendo nuovi dati per i grafici il server ha dato una risposta " +"invalida. Potrebbe essere accaduto a causa del termine della validità della " +"tua sessione. Prova a ricaricare la pagina reinserendo i tuoi dati di login." #: js/messages.php:185 -#, fuzzy #| msgid "Reload" msgid "Reload page" -msgstr "Ricarica" +msgstr "Ricarica la pagina" #: js/messages.php:187 msgid "Affected rows:" @@ -1660,12 +1661,16 @@ msgstr "Righe coinvolte:" #: js/messages.php:189 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" +"La lettura del file di configurazione é fallita. Non sembra essere codice " +"JSON valido" #: js/messages.php:190 msgid "" "Failed building chart grid with imported config. Resetting to default " "config..." msgstr "" +"Impossibile creare la tabella dei grafici con la configurazione importata. " +"Ripristino alle impostazioni predefinite in corso..." #: js/messages.php:191 libraries/config/messages.inc.php:172 #: libraries/db_links.inc.php:82 libraries/display_import.lib.php:126 @@ -1675,10 +1680,9 @@ msgid "Import" msgstr "Importa" #: js/messages.php:193 -#, fuzzy #| msgid "Update Query" msgid "Analyse Query" -msgstr "Aggiorna Query" +msgstr "Analizza la Query" #: js/messages.php:197 #, fuzzy @@ -1688,37 +1692,34 @@ msgstr "Applica un divisore" #: js/messages.php:198 msgid "Possible performance issues" -msgstr "" +msgstr "Possibili problemi di prestazioni" #: js/messages.php:199 msgid "Issue" -msgstr "" +msgstr "Problema" #: js/messages.php:200 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Documentazione" +msgstr "Avviso" #: js/messages.php:201 -#, fuzzy #| msgid "Details" msgid "Rule details" -msgstr "Dettagli" +msgstr "Dettagli della regola" #: js/messages.php:202 -#, fuzzy #| msgid "Authentication" msgid "Justification" -msgstr "Autenticazione" +msgstr "Giustificazione" #: js/messages.php:203 msgid "Used variable / formula" -msgstr "" +msgstr "Variabile / formula utilizzata" #: js/messages.php:204 msgid "Test" -msgstr "" +msgstr "Prova" #: js/messages.php:209 pmd_general.php:382 pmd_general.php:419 #: pmd_general.php:539 pmd_general.php:587 pmd_general.php:663 @@ -1754,7 +1755,7 @@ msgstr "OK" #: js/messages.php:218 msgid "Click to dismiss this notification" -msgstr "" +msgstr "Clicca per chiudere questa notifica" #: js/messages.php:221 msgid "Renaming Databases" @@ -1815,10 +1816,10 @@ msgstr "" "RETURN!" #: js/messages.php:249 -#, fuzzy, php-format +#, php-format #| msgid "+ Add a value" msgid "Add %d value(s)" -msgstr "+ Aggiungi un valore" +msgstr "Aggiungi %d valore/i" #: js/messages.php:252 msgid "" @@ -1846,10 +1847,9 @@ msgid "Change" msgstr "Modifica" #: js/messages.php:260 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Massimo tempo di esecuzione" +msgstr "Tempo di esecuzione della query" #: js/messages.php:263 libraries/config/FormDisplay.tpl.php:355 #: libraries/schema/User_Schema.class.php:352 @@ -1868,14 +1868,13 @@ msgid "Show search criteria" msgstr "Mostra criteri di ricerca" #: js/messages.php:270 libraries/tbl_select.lib.php:110 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Cerca" +msgstr "Ricerca Zoom" #: js/messages.php:272 msgid "Each point represents a data row." -msgstr "" +msgstr "Ogni punto rappresenta una riga dei dati." #: js/messages.php:274 msgid "Hovering over a point will show its label." @@ -1883,37 +1882,40 @@ msgstr "" #: js/messages.php:276 msgid "Use mousewheel to zoom in or out of the plot." -msgstr "" +msgstr "Utilizza la rotellina del mouse per ingrandire o ridurre il piano." #: js/messages.php:278 msgid "Click and drag the mouse to navigate the plot." -msgstr "" +msgstr "Fai clic e trascina il mouse per navigare il piano." #: js/messages.php:280 msgid "Click reset zoom link to come back to original state." -msgstr "" +msgstr "Fai clic su \"Ripristina zoom\" per tornare allo stato originale." #: js/messages.php:282 msgid "Click a data point to view and possibly edit the data row." msgstr "" +"Clicca su un punto nel piano per visualizzare ed eventualmente modificare la " +"riga di dati." #: js/messages.php:284 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" +"Il piano può essere ridimensionato trascinandolo dall'angolo in basso a " +"destra." #: js/messages.php:286 msgid "Strings are converted into integer for plotting" msgstr "" #: js/messages.php:288 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Aggiungi/Cancella colonne" +msgstr "Seleziona due campi" #: js/messages.php:289 msgid "Select two different columns" -msgstr "" +msgstr "Seleziona due campi diversi" #: js/messages.php:290 #, fuzzy @@ -1937,10 +1939,9 @@ msgid "Copy" msgstr "Copia" #: js/messages.php:310 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Aggiungi campo" +msgstr "Aggiungi campi" #: js/messages.php:313 msgid "Select referenced key" @@ -1972,13 +1973,15 @@ msgstr "Aggiungi un'opzione al campo " #: js/messages.php:323 msgid "Press escape to cancel editing" -msgstr "" +msgstr "Premi Esc per annullare la modifica" #: js/messages.php:324 msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" +"Hai modificato dei dati e non hai salvato. Sei sicuro di voler navigare via " +"da questa pagina senza salvare i dati?" #: js/messages.php:325 msgid "Drag to reorder" @@ -2007,12 +2010,13 @@ msgstr "" msgid "" "You can also edit most columns<br />by clicking directly on their content." msgstr "" +"È possibile modificare la maggior parte dei campi<br /> cliccando " +"direttamente sul loro contenuto." #: js/messages.php:332 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Vai alla visualizzazione" +msgstr "Vai al link" #: js/messages.php:335 msgid "Generate password" @@ -2061,7 +2065,6 @@ msgid "Prev" msgstr "Precedente" #: js/messages.php:374 -#, fuzzy #| msgid "Next" msgctxt "Next month" msgid "Next" @@ -2311,7 +2314,7 @@ msgstr "" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" -msgstr "" +msgstr "Rimuovi la nfig\" directory before using phpMyAdmin!"ndo "ent."r"29.30.123]�"k�*r�k�*� �m��m�u*k�*�Jk�*E6k�*�82l�*�m��PTl�*�m��m�k@k�*6 ��!�!� �m��m�x�1l�*�m��"k�*�@k�*� �m�`"k�*� �m��l�*u*k�*��l�*��l�*��l�*�Jk�*x�1l�*�m��m�k@k�*�!�!� �m��m�H�l�*��m��"k�*�@k�*� �m�`"k�*� �m�� m�� m�8K6k�*�p��m�u*k�*�Jk�*��m��m�k@k�*GHIJKMNOP� �m��m�Hu�k�*��m��"k�*�@k�*� �m�0�l�*u*k�*2l�*��k�*��l�*��l�*��l�*�Jk�*Hu�k�*��m��m�k@k�*8u�k�*��m��m�k@k�*(u�k�*��m� �m�k@k�*u�k�*��m�P�m�k@k�* ��l�*u*k�*��l�*��m��k�*e)k�*��l�*��m�y��k�*e)k�*��l�* �m�Z��k�*e)k�*ؤ�k�*2l�*��k�*��l�*�2l�*��l�*��l�*�Jk�*8K6k�*m�k�*�m�p;�k�*��m��m�k@k�*5678:<=>?@BD� �m��m��m�k�*�m�u*k�*E6k�*P�m�m�k�*e)k�*E6k�*�_@f�S Q��l��]k�*�m��m�k�*��m��m�k@k�*u]�� 4Q��U^Qʉ��u��*ēv� �m��m�H�Zk�*�k�*P�m��l�*��l�*�V�k�*� �m��m�� m�0�m�2l�*u*k�*�2l�*� �m��l�*`�m��m��l�*�m�cartella \"./config\" prima di utilizzare phpMyAdmin!" #: libraries/Config.class.php:727 #, php-format @@ -3464,7 +3467,7 @@ msgstr "Tabulazione da visualizzare dopo l'ingresso nella tabella" #: libraries/config/messages.inc.php:55 msgid "Default table tab" -msgstr "Tabulazione predefinita per le tabbelle" +msgstr "Tabulazione predefinita per le tabelle" #: libraries/config/messages.inc.php:56 msgid "Show binary contents as HEX by default" @@ -3616,7 +3619,7 @@ msgstr "Modello per nomi dei server" #: libraries/config/messages.inc.php:89 msgid "Table name template" -msgstr "Modello per nomi delle tabbelle" +msgstr "Modello per nomi delle tabelle" #: libraries/config/messages.inc.php:93 libraries/config/messages.inc.php:106 #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:139 @@ -4192,7 +4195,7 @@ msgstr "Visalizza la selezione dei server" #: libraries/config/messages.inc.php:274 msgid "Minimum number of tables to display the table filter box" -msgstr "Numero minimo di tabbelle per visualizzare il riquadro di filtraggio" +msgstr "Numero minimo di tabelle per visualizzare il riquadro di filtraggio" #: libraries/config/messages.inc.php:275 msgid "String that separates databases into different tree levels" @@ -4495,7 +4498,7 @@ msgstr "" #: libraries/config/messages.inc.php:334 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "Mancano le tabbelle di configurazione di phpMyAdmin" +msgstr "Mancano le tabelle di configurazione di phpMyAdmin" #: libraries/config/messages.inc.php:336 msgid "Iconic table operations" @@ -5579,10 +5582,9 @@ msgid "" msgstr "(o il socket del server locale MySQL non è correttamente configurato)" #: libraries/database_interface.lib.php:1768 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." -msgstr "Il server non risponde" +msgstr "Il server non risponde." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." @@ -5884,7 +5886,7 @@ msgstr "Importazione nel database \"%s\"" #: libraries/display_import.lib.php:133 #, php-format msgid "Importing into the table \"%s\"" -msgstr "Importazione nella tabbella \"%s\"" +msgstr "Importazione nella tabella \"%s\"" #: libraries/display_import.lib.php:139 msgid "File to Import:" @@ -7942,7 +7944,7 @@ msgstr "Schema del database %s - Pagina %s" #: libraries/schema/Export_Relation_Schema.class.php:200 msgid "This page does not contain any tables!" -msgstr "Questa pagina non contiene alcuna tabbella!" +msgstr "Questa pagina non contiene alcuna tabella!" #: libraries/schema/Export_Relation_Schema.class.php:228 msgid "SCHEMA ERROR: " @@ -11685,7 +11687,7 @@ msgstr "Svuota la tabella (TRUNCATE)" #: tbl_operations.php:716 msgid "Delete the table (DROP)" -msgstr "Elimina la tabbella (DROP)" +msgstr "Elimina la tabella (DROP)" #: tbl_operations.php:738 msgid "Partition maintenance" @@ -11998,7 +12000,7 @@ msgstr "Dump SQL" #: tbl_tracking.php:551 msgid "This option will replace your table and contained data." -msgstr "Questa opzione sostituerá la tua tabbella e i dati contenuti." +msgstr "Questa opzione sostituirà la tua tabella e i dati contenuti." #: tbl_tracking.php:551 msgid "SQL execution" @@ -12366,10 +12368,9 @@ msgid "Query cache disabled" msgstr "Cache delle query" #: po/advisory_rules.php:207 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "Il server non risponde" +msgstr "La cache delle query non è abilitata." #: po/advisory_rules.php:210 msgid "" @@ -13025,10 +13026,10 @@ msgid "" msgstr "" #: po/advisory_rules.php:665 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "slow_launch_time is set to %s" -msgstr "long_query_time é impostato a %d secondi." +msgstr "slow_launch_time é impostato a %s" #: po/advisory_rules.php:669 #, fuzzy diff --git a/po/ja.po b/po/ja.po index a1d6f41..b5b415f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-11 11:23+0200\n" +"PO-Revision-Date: 2011-11-20 09:44+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "MIME-Version: 1.0\n" @@ -7366,12 +7366,12 @@ msgstr "完全な INSERT 文を作成する" #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:933 #: libraries/rte/rte_triggers.lib.php:360 msgid "Definer" -msgstr "DEFINER" +msgstr "定義者" #: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:997 #: libraries/rte/rte_triggers.lib.php:398 msgid "The definer must be in the \"username@hostname\" format" -msgstr "" +msgstr "定義者の指定は「ユーザ名@ホスト名」の形式でなければなりません。" #: libraries/rte/rte_events.lib.php:525 msgid "You must provide an event name" @@ -12523,16 +12523,18 @@ msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"お使いの MyISAM インデックスのサイズに合わせた {key_buffer_size} を設定してください。最初の設定としては、64M " +"からがいいでしょう。" #: po/advisory_rules.php:485 msgid "key_buffer_size is 0" msgstr "key_buffer_size は 0 です。" #: po/advisory_rules.php:489 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "ソートバッファのサイズ" +msgstr "常用される MyISAM キーバッファの最大比率" #: po/advisory_rules.php:492 po/advisory_rules.php:507 #, php-format @@ -12545,38 +12547,40 @@ msgid "" "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." msgstr "" +"{key_buffer_size} の必要とするサイズが減少しているようです。ご使用のテーブルでインデックスが削除されていないかよく確認してください。ま" +"た、クエリあるいはインデックスの使用が想定されるものがないか確認してみてください。" #: po/advisory_rules.php:500 -#, php-format +#, php-format, fuzzy msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" -msgstr "" +msgstr "常用される MyISAM キーバッファの最大比率: この値は、95%% 以上がいいと言われています。" #: po/advisory_rules.php:504 msgid "Percentage of MyISAM key buffer used" -msgstr "MyISAM キーバッファの比率" +msgstr "MyISAM キーバッファの使用比率" #: po/advisory_rules.php:515 -#, php-format +#, php-format, fuzzy msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" -msgstr "" +msgstr "MyISAM キーバッファの使用比率: この値は、95%% 以上がいいと言われています。" #: po/advisory_rules.php:519 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "メモリから読み込まれるインデックスの比率" #: po/advisory_rules.php:522 #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." -msgstr "" +msgstr "MyISAM キーバッファを使用するインデックスの比率が低いです。" #: po/advisory_rules.php:525 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "{key_buffer_size} を増やす必要があるかもしれません。" #: po/advisory_rules.php:530 -#, php-format +#, php-format, fuzzy msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "" +msgstr "メモリから読み込まれるインデックスの比率: この値は、95%% 以上がいいと言われています。" #: po/advisory_rules.php:534 msgid "Rate of table open" @@ -12602,16 +12606,15 @@ msgstr "" "す。" #: po/advisory_rules.php:549 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of used open files limit" -msgstr "インポートするファイルの形式" +msgstr "開いているファイルの上限に対する比率" #: po/advisory_rules.php:552 msgid "" "The number of open files is approaching the max number of open files. You " "may get a \\\"Too many open files\\\" error." -msgstr "" +msgstr "開いているファイルの数が最大になりつつあります。エラー「開いているファイルが多すぎます」になるかもしれません。" #: po/advisory_rules.php:555 po/advisory_rules.php:570 msgid "" @@ -12625,21 +12628,20 @@ msgstr "" #, php-format msgid "" "The number of opened files is at %s%% of the limit. It should be below 85%%" -msgstr "" +msgstr "開いているファイルの数は上限に対して %s%% です。この値は、85%% 未満がいいと言われています。" #: po/advisory_rules.php:564 msgid "Rate of open files" -msgstr "ファイルを開く割合" +msgstr "開いているファイルの割合" #: po/advisory_rules.php:567 msgid "The rate of opening files is high." -msgstr "ファイルを開く割合が高いです。" +msgstr "開いているファイルの割合が高いです。" #: po/advisory_rules.php:575 #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" -"ファイルを開く割合：%s。この値は、1 時間当たり 5 未満がいいと言われています。" +msgstr "開いているファイルの割合：%s。この値は、1 時間当たり 5 未満がいいと言われています。" #: po/advisory_rules.php:579 #, php-format @@ -12682,36 +12684,35 @@ msgstr "スレッドキャッシュ" msgid "" "Thread cache is disabled, resulting in more overhead from new connections to " "MySQL." -msgstr "" +msgstr "スレッドキャッシュが無効になっているため、MySQL への新たな接続に対してのオーバヘッドが大きくなります。" #: po/advisory_rules.php:615 msgid "Enable the thread cache by setting {thread_cache_size} > 0." -msgstr "" +msgstr "{thread_cache_size} に 0 より大きな値を設定して、スレッドキャッシュを有効にしてください。" #: po/advisory_rules.php:620 msgid "The thread cache is set to 0" msgstr "スレッドキャッシュは 0 に設定されています。" #: po/advisory_rules.php:624 -#, fuzzy, php-format +#, php-format #| msgid "Tracking is not active." msgid "Thread cache hit rate %%" -msgstr "SQL コマンドの追跡は非アクティブです。" +msgstr "スレッドキャッシュのヒット率" #: po/advisory_rules.php:627 -#, fuzzy #| msgid "Tracking is not active." msgid "Thread cache is not efficient." -msgstr "SQL コマンドの追跡は非アクティブです。" +msgstr "スレッドキャッシュが効果的に機能していません。" #: po/advisory_rules.php:630 msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "{thread_cache_size} を増やしてください。" #: po/advisory_rules.php:635 -#, php-format +#, php-format, fuzzy msgid "Thread cache hitrate: %s%%, this value should be above 80%%" -msgstr "" +msgstr "スレッドキャッシュのヒット率: この値は、80%% 以上がいいと言われています。" #: po/advisory_rules.php:639 msgid "Threads that are slow to launch" @@ -12749,10 +12750,10 @@ msgid "" msgstr "" #: po/advisory_rules.php:665 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "slow_launch_time is set to %s" -msgstr "long_query_time は %d 秒に設定されています。" +msgstr "slow_launch_time は %s に設定されています。" #: po/advisory_rules.php:669 #, fuzzy @@ -12857,27 +12858,24 @@ msgstr "" #: po/advisory_rules.php:744 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "InnoDB が無効？" #: po/advisory_rules.php:747 -#, fuzzy #| msgid "Could not save recent table" msgid "You do not have InnoDB enabled." -msgstr "最近使用したテーブルが保存できません" +msgstr "InnoDB を有効にできていません。" #: po/advisory_rules.php:750 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "一般的に、InnoDB はテーブル用のエンジンとして適切な選択となりえます。" #: po/advisory_rules.php:755 msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "have_innodb は 'value' に設定されています。" #: po/advisory_rules.php:759 -#, fuzzy -#| msgid "Buffer pool size" msgid "InnoDB log size" -msgstr "バッファプールの大きさ" +msgstr "InnoDB のログサイズ" #: po/advisory_rules.php:762 #, fuzzy @@ -12911,7 +12909,7 @@ msgstr "" #: po/advisory_rules.php:774 msgid "Max InnoDB log size" -msgstr "" +msgstr "InnoDB の最大ログサイズ" #: po/advisory_rules.php:777 msgid "The InnoDB log file size is inadequately large." @@ -12937,14 +12935,12 @@ msgid "Your absolute InnoDB log size is %s MiB" msgstr "" #: po/advisory_rules.php:789 -#, fuzzy -#| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "バッファプールの大きさ" +msgstr "InnoDB のバッファプールの大きさ" #: po/advisory_rules.php:792 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "ご使用の InnoDB のバッファプールはかなり小さいです。" #: po/advisory_rules.php:795 #, php-format @@ -12989,7 +12985,7 @@ msgstr "" #: po/advisory_rules.php:815 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert は 0 に設定されています。" #~ msgid "Click to unselect" #~ msgstr "クリックで選択解除" diff --git a/po/ko.po b/po/ko.po index 380f352..1226590 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-14 17:14+0200\n" -"Last-Translator: Gihun Ham <progh2(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-18 08:35+0200\n" +"Last-Translator: manyfun <manyfun7(a)gmail.com>\n" "Language-Team: korean <ko(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3028,11 +3028,11 @@ msgstr "업로드 디렉토리에 접근할 수 없습니다" #: libraries/common.lib.php:3323 msgid "There are no files to upload" -msgstr "" +msgstr "업로드할 파일이 없습니다." #: libraries/common.lib.php:3351 libraries/common.lib.php:3352 msgid "Execute" -msgstr "" +msgstr "실행하기" #: libraries/common.lib.php:3827 msgid "Print" diff --git a/po/ru.po b/po/ru.po index 608cb99..50addc0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5481,7 +5481,7 @@ msgstr "Сервер не отвечает." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Пожалуйста, проверьте привилегии каталога содержащего базу данных." #: libraries/database_interface.lib.php:1780 msgid "Details..." diff --git a/po/sl.po b/po/sl.po index bba582c..8610acd 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-10 19:01+0200\n" +"PO-Revision-Date: 2011-11-19 22:18+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "MIME-Version: 1.0\n" @@ -4608,7 +4608,6 @@ msgid "Control user" msgstr "Krmilni uporabnik" #: libraries/config/messages.inc.php:385 -#, fuzzy msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host" @@ -5430,14 +5429,13 @@ msgstr "" "konfigurirana)." #: libraries/database_interface.lib.php:1768 -#, fuzzy #| msgid "The server is not responding" msgid "The server is not responding." msgstr "Strežnik se ne odziva." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Prosimo, preverite pravice mape, v kateri se nahaja zbirka podatkov." #: libraries/database_interface.lib.php:1780 msgid "Details..." @@ -8530,7 +8528,7 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" -"Vaša PHP-knjižica MySQL različice %s se razlikuje od vašega strežnika MySQL " +"Vaša PHP-knjižnica MySQL različice %s se razlikuje od vašega strežnika MySQL " "različice %s. To lahko povzroči nepredvidljivo vedenje." #: main.php:345 @@ -9225,7 +9223,6 @@ msgid "Any" msgstr "Kateri koli" #: server_privileges.php:1561 -#, fuzzy #| msgid "User overview" msgid "Users overview" msgstr "Pregled uporabnikov" diff --git a/po/sv.po b/po/sv.po index 77e15df..bced642 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-14 00:55+0200\n" +"PO-Revision-Date: 2011-11-16 21:47+0200\n" "Last-Translator: ProUser <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" "MIME-Version: 1.0\n" @@ -5415,7 +5415,7 @@ msgstr "Servern svarar inte." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Kontrollera privilegierna för katalogen som innehåller databasen." #: libraries/database_interface.lib.php:1780 msgid "Details..." @@ -7853,10 +7853,9 @@ msgid "Current Server" msgstr "Nuvarande Server" #: libraries/server_links.inc.php:60 -#, fuzzy #| msgid "User" msgid "Users" -msgstr "Användare" +msgstr "Användarna" #: libraries/server_links.inc.php:79 server_synchronize.php:1154 #: server_synchronize.php:1162 diff --git a/po/th.po b/po/th.po index ec25bc7..c7f9068 100644 --- a/po/th.po +++ b/po/th.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-10 09:30+0200\n" +"PO-Revision-Date: 2011-11-17 07:53+0200\n" "Last-Translator: jaideejung007 <jaideejung007(a)gmail.com>\n" "Language-Team: thai <th(a)li.org>\n" "MIME-Version: 1.0\n" @@ -2482,7 +2482,6 @@ msgstr "ผิดพลาด" msgid "%1$d row affected." msgid_plural "%1$d rows affected." msgstr[0] "" -msgstr[1] "" #: libraries/Message.class.php:257 #, fuzzy, php-format @@ -7630,7 +7629,6 @@ msgstr "" msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" msgstr[0] "" -msgstr[1] "" #: libraries/rte/rte_routines.lib.php:1225 #, php-format @@ -12870,11 +12868,11 @@ msgstr "" #: po/advisory_rules.php:789 msgid "InnoDB buffer pool size" -msgstr "" +msgstr "ขนาดบัฟเฟอร์ของ InnoDB" #: po/advisory_rules.php:792 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "ขนาดบัฟเฟอร์ InnoDB ของคุณมีขนาดเล็ก" #: po/advisory_rules.php:795 #, php-format diff --git a/po/tr.po b/po/tr.po index 53c784d..252a2aa 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-20 06:57-0500\n" -"PO-Revision-Date: 2011-11-09 19:30+0200\n" +"PO-Revision-Date: 2011-11-17 15:57+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -5450,7 +5450,7 @@ msgstr "Sunucu yanıt vermiyor." #: libraries/database_interface.lib.php:1772 msgid "Please check privileges of directory containing database." -msgstr "" +msgstr "Lütfen veritabanını içeren dizinin yetkilerini kontrol edin." #: libraries/database_interface.lib.php:1780 msgid "Details..." @@ -13022,17 +13022,7 @@ msgid "The InnoDB log file size is inadequately large." msgstr "InnoDB günlük dosyası boyutu yetersiz şekilde büyük." #: po/advisory_rules.php:780 -#, fuzzy, php-format -#| msgid "" -#| "It is usually sufficient to set innodb_log_file_size to 25%% of the size " -#| "of {innodb_buffer_pool_size}. A very innodb_log_file_size slows down the " -#| "recovery time after a database crash considerably. See also <a href=\\" -#| "\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-" -#| "innodb_log_file_size/\\\">this Article</a>. You need to shutdown the " -#| "server, remove the InnoDB log files, set the new value in my.cnf, start " -#| "the server, then check the error logs if everything went fine. See also " -#| "<a href=\\\"http://mysqldatabaseadministration.blogspot.com/2007/01/" -#| "increase-innodblogfilesize-proper-way.html\\\">this blog entry</a>" +#, php-format msgid "" "It is usually sufficient to set innodb_log_file_size to 25%% of the size of " "{innodb_buffer_pool_size}. A very big innodb_log_file_size slows down the " @@ -13045,15 +13035,15 @@ msgid "" "innodblogfilesize-proper-way.html\\\">this blog entry</a>" msgstr "" "Genellikle innodb_log_file_size değerini {innodb_buffer_pool_size} boyutunun " -"%%25'ine ayarlamak yeterlidir. Çok innodb_log_file_size, veritabanı " -"çökmesinden sonra kurtarma zamanı oldukça yavaşlar. Aynı zamanda <a href=\\" -"\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-" +"%%25'ine ayarlamak yeterlidir. Çok büyük innodb_log_file_size, veritabanı " +"çökmesinden sonra kurtarma zamanını oldukça yavaşlatır. Aynı zamanda <a " +"href=\\\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-" "innodb_log_file_size/\\\">bu Makaleye</a> bakın. Sunucuyu kapatmanız, InnoDB " "günlük dosyalarını kaldırmanız, my.cnf içindeki yeni değeri ayarlamanız, " "sunucuyu başlatmanız gerekir, sonrada herşeyin iyi gittiğini anlamak için " -"hata günlüklerini kontrol etmelisiniz. Aynı zamanda <a href=\\\"http://" -"mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-" -"proper-way.html\\\">bu blog girişine</a> bakın" +"hata günlüklerini kontrol etmelisiniz. Aynı zamanda <a " +"href=\\\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" +"innodblogfilesize-proper-way.html\\\">bu blog girişine</a> bakın" #: po/advisory_rules.php:785 #, php-format hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22981-gb640417

by Marc Delisle

The branch, master has been updated via b6404177966fa38bc432b6898cf19e5aefd01078 (commit) from 7aa52c9fa965f9f5cca9c851915fc470e76c8e9d (commit) - Log ----------------------------------------------------------------- commit b6404177966fa38bc432b6898cf19e5aefd01078 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 20 06:56:17 2011 -0500 Unused messages ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 8a64f1c..2534567 100644 --- a/js/messages.php +++ b/js/messages.php @@ -24,8 +24,6 @@ session_write_close(); // But this one is needed for PMA_escapeJsString() require_once './libraries/js_escape.lib.php'; -$js_messages['strClickToSelect'] = __('Click to select'); -$js_messages['strClickToUnselect'] = __('Click to unselect'); $js_messages['strNoDropDatabases'] = $cfg['AllowUserDropDatabase'] ? '' : __('"DROP DATABASE" statements are disabled.'); /* For confirmations */ hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22980-g7aa52c9

by Marc Delisle

The branch, master has been updated via 7aa52c9fa965f9f5cca9c851915fc470e76c8e9d (commit) from b131ec75ba6db8f33bf0f6af1190f03525e5f8a0 (commit) - Log ----------------------------------------------------------------- commit 7aa52c9fa965f9f5cca9c851915fc470e76c8e9d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 20 06:44:29 2011 -0500 Make these messages translatable ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 ++ js/tbl_zoom_plot.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 5a75ece..8a64f1c 100644 --- a/js/messages.php +++ b/js/messages.php @@ -289,6 +289,8 @@ $js_messages['strDisplayHelp'] = '<ul><li>' . '</li></ul>'; $js_messages['strInputNull'] = '<strong>' . __('Select two columns') . '</strong>'; $js_messages['strSameInputs'] = '<strong>' . __('Select two different columns') . '</strong>'; +$js_messages['strQueryResults'] = __('Query results'); +$js_messages['strDataPointContent'] = __('Data point content'); /* For tbl_change.js */ $js_messages['strIgnore'] = __('Ignore'); diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 4fad9c8..dac2650 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -456,7 +456,7 @@ $(document).ready(function() { }; $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: PMA_messages['strDataPointContent'], modal: true, buttons: buttonOptions, width: $('#dataDisplay').width() + 24, @@ -572,7 +572,7 @@ $(document).ready(function() { return this.point.name; } }, - title: { text: 'Query Results' }, + title: { text: PMA_messages['strQueryResults'] }, xAxis: { title: { text: $('#tableid_0').val() }, events: { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22979-gb131ec7

by Rouslan Placella

The branch, master has been updated via b131ec75ba6db8f33bf0f6af1190f03525e5f8a0 (commit) from 0ded8da4858a92bcda776e7db4b973eaa815adaf (commit) - Log ----------------------------------------------------------------- commit b131ec75ba6db8f33bf0f6af1190f03525e5f8a0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Nov 16 14:29:14 2011 +0000 Improved layout for the data editor from the zoom search feature ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 49 ++++++++++++++++++++----------- tbl_zoom_select.php | 12 ++------ themes/original/css/theme_right.css.php | 8 +++++ themes/pmahomme/css/theme_right.css.php | 8 +++++ 4 files changed, 51 insertions(+), 26 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index ce3de9d..4fad9c8 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -248,23 +248,11 @@ $(document).ready(function() { /** ** Set dialog properties for the data display form **/ - $("#dataDisplay").dialog({ - autoOpen: false, - title: 'Data point content', - modal: false, //false otherwise other dialogues like timepicker may not function properly - height: $('#dataDisplay').height() + 80, - width: $('#dataDisplay').width() + 80 - }); - + var buttonOptions = {}; /* - * Handle submit of zoom_display_form + * Handle saving of a row in the editor */ - - $("#submitForm").click(function(event) { - - //Prevent default submission of form - event.preventDefault(); - + buttonOptions[PMA_messages['strSave']] = function () { //Find changed values by comparing form values with selectedRow Object var newValues = new Object();//Stores the values changed from original var sqlTypes = new Object(); @@ -461,8 +449,35 @@ $(document).ready(function() { } }); //End $.post }//End database update - $("#dataDisplay").dialog("close"); - });//End submit handler + $("#dataDisplay").dialog('close'); + }; + buttonOptions[PMA_messages['strCancel']] = function () { + $(this).dialog('close'); + }; + $("#dataDisplay").dialog({ + autoOpen: false, + title: 'Data point content', + modal: true, + buttons: buttonOptions, + width: $('#dataDisplay').width() + 24, + open: function () { + $(this).find('input[type=checkbox]').css('margin', '0.5em'); + } + }); + /** + * Attach Ajax event handlers for input fields + * in the dialog. Used to submit the Ajax + * request when the ENTER key is pressed. + */ + $("#dataDisplay").find(':input').live('keydown', function (e) { + if (e.which === 13) { // 13 is the ENTER key + e.preventDefault(); + if (typeof buttonOptions[PMA_messages['strSave']] === 'function') { + buttonOptions[PMA_messages['strSave']].call(); + } + } + }); + /* * Generate plot using Highcharts diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 739a509..52293b1 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -426,9 +426,8 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' } ?> </center> - <fieldset id='dataDisplay' style="display:none"> - <fieldset> - <table class="data"> + <div id='dataDisplay' style="display:none"> + <table> <thead> <tr> <th> <?php echo __('Column'); ?> </th> @@ -464,12 +463,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' ?> </tbody> </table> - </fieldset> - <fieldset class="tblFooters"> - <input type="submit" id="submitForm" name="edit_point" value="<?php echo __('Submit'); ?>" /> - </fieldset> - </fieldset> - </fieldset> + </div> <input type="hidden" id="queryID" name="sql_query" /> </form> <?php diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index eab4ec1..1284ae1 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -810,6 +810,14 @@ a.error { <?php } ?> /* end topmenu */ +/* zoom search */ +div#dataDisplay input, div#dataDisplay select { + margin: 0; + margin-<?php echo $right; ?>: 0.5em; +} +div#dataDisplay th { + line-height: 2em; +} /* Calendar */ table.calendar { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index aa0f27b..db300f3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1020,6 +1020,14 @@ a.error { <?php } ?> /* end topmenu */ +/* zoom search */ +div#dataDisplay input, div#dataDisplay select { + margin: 0; + margin-<?php echo $right; ?>: 0.5em; +} +div#dataDisplay th { + line-height: 2em; +} /* Calendar */ table.calendar { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22978-g0ded8da

by Rouslan Placella

The branch, master has been updated via 0ded8da4858a92bcda776e7db4b973eaa815adaf (commit) via 1d322a8ada55b4c9233109f4189fa59066f660cd (commit) via fc22faa6e1850e386b10d7cbc08188fed2c1aadd (commit) via 0ac1b5f7c2fbc007abed7ecc015f42e42d2dbc78 (commit) via f607d8a93cc2391e34000173b8eef13e1af8de61 (commit) via 93ab45ced3678ee30256dd7634192d5f63cbd597 (commit) via a97eeae7adff3a6a058ed3dd8cae994e0dd8d859 (commit) via 5cb7a002f3c64a4e618687ce189c8828ff751940 (commit) via 46fbe36b6b0f6589054939419005895c5c4b51de (commit) via f8e6631dfdcf9363399e49c248bf439f3001b1e6 (commit) via 863819cbdd759614d4097710b995858d9b4fac0f (commit) from c2a8246bc882bd6194e02aea61ff12878136c83a (commit) - Log ----------------------------------------------------------------- commit 0ded8da4858a92bcda776e7db4b973eaa815adaf Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Nov 15 18:26:06 2011 +0000 Ajax error messages should not automatically disappear commit 1d322a8ada55b4c9233109f4189fa59066f660cd Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Nov 14 21:57:38 2011 +0000 Changelog entry for "Improved index editor" commit fc22faa6e1850e386b10d7cbc08188fed2c1aadd Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Nov 14 20:45:26 2011 +0000 Improved index editor commit 0ac1b5f7c2fbc007abed7ecc015f42e42d2dbc78 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Nov 14 20:39:54 2011 +0000 We can't specify a height for an element that might grow or shrink commit f607d8a93cc2391e34000173b8eef13e1af8de61 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Oct 31 13:37:43 2011 +0000 table structure: Do not send #topmenucontainer in ajax requests commit 93ab45ced3678ee30256dd7634192d5f63cbd597 Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Oct 31 13:36:05 2011 +0000 table structure: ajax error messages should not timeout commit a97eeae7adff3a6a058ed3dd8cae994e0dd8d859 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 28 21:26:12 2011 +0100 Ajaxified "Create index" dialog commit 5cb7a002f3c64a4e618687ce189c8828ff751940 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 28 17:49:08 2011 +0100 tbl_structure: Improved handling of "Drop Index" functionality with JavaScript enabled commit 46fbe36b6b0f6589054939419005895c5c4b51de Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 28 17:48:14 2011 +0100 Wrapped the "Indexes" and "Information" sections from tbl_structure.php in fieldsets commit f8e6631dfdcf9363399e49c248bf439f3001b1e6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 28 17:16:52 2011 +0100 "No index" or "duplicate indexes" on a column are not errors commit 863819cbdd759614d4097710b995858d9b4fac0f Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Oct 28 17:13:31 2011 +0100 tbl_structure.php ignored $cfg['InitialSlidersState'] for the Indexes ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- js/messages.php | 3 + js/tbl_structure.js | 267 +++++++++++++++---------------- libraries/Index.class.php | 29 ++-- tbl_alter.php | 4 +- tbl_indexes.php | 69 +++++--- tbl_structure.php | 31 ++-- themes/original/css/theme_right.css.php | 42 +++++ themes/pmahomme/css/theme_right.css.php | 42 +++++ 10 files changed, 298 insertions(+), 192 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39086e6..38cfe69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog + rfe #3406797 [navi] Stick table tools to top of page on scroll + rfe #1632106 [interface] Improved error handling + patch #3432835 [interface] Add useful intermediate pages to pageselector ++ [interface] Improved index editor 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/js/functions.js b/js/functions.js index 4377a1d..d96f15e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3079,7 +3079,7 @@ function PMA_init_slider() } $this.addClass('slider_init_done'); - var $wrapper = $('<div>', {'class': 'slide-wrapper'}).css('height', $this.outerHeight(true)); + var $wrapper = $('<div>', {'class': 'slide-wrapper'}); $wrapper.toggle($this.is(':visible')); $('<a>', {href: '#'+this.id}) .text(this.title) diff --git a/js/messages.php b/js/messages.php index 5b6257b..5a75ece 100644 --- a/js/messages.php +++ b/js/messages.php @@ -45,6 +45,9 @@ $js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure yo /* For indexes */ $js_messages['strFormEmpty'] = __('Missing value in the form!'); $js_messages['strNotNumber'] = __('This is not a number!'); +$js_messages['strAddIndex'] = __('Add Index'); +$js_messages['strEditIndex'] = __('Edit Index'); +$js_messages['strAddToIndex'] = __('Add %d column(s) to index'); /* Charts */ /* l10n: Default description for the y-Axis of Charts */ diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 8bbd8bb..f02572f 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -18,7 +18,6 @@ * */ $(document).ready(function() { - /** * Attach Event Handler for 'Drop Column' * @@ -56,7 +55,7 @@ $(document).ready(function() { $(curr_row).hide("medium").remove(); } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } }) // end $.get() }); // end $.PMA_confirm() @@ -98,7 +97,7 @@ $(document).ready(function() { } } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } }) // end $.get() }) // end $.PMA_confirm() @@ -137,17 +136,30 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); - $rows_to_hide.hide("medium").remove(); + var $table_ref = $rows_to_hide.closest('table'); + if ($rows_to_hide.length == $table_ref.find('tbody > tr').length) { + // We are about to remove all rows from the table + $table_ref.hide('medium', function() { + $('.no_indexes_defined').show('medium'); + $rows_to_hide.remove(); + }); + $table_ref.siblings('div.notice').hide('medium'); + } else { + // We are removing some of the rows only + $rows_to_hide.hide("medium", function () { + $(this).remove(); + }); + } } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } }) // end $.get() }) // end $.PMA_confirm() }) //end Drop Primary Key/Index /** - *Ajax event handler for muti column change + *Ajax event handler for multi column change **/ $("#fieldsForm.ajax .mult_submit[value=change]").live('click', function(event){ event.preventDefault(); @@ -184,13 +196,29 @@ $(document).ready(function() { /** *Ajax event handler for index edit **/ - $("#table_index tbody tr td.edit_index.ajax").live('click', function(event){ + $("#table_index tbody tr td.edit_index.ajax, #indexes .add_index.ajax").live('click', function(event){ event.preventDefault(); - var url = $(this).find("a").attr("href"); - if (url.substring(0, 16) == "tbl_indexes.php?") { - url = url.substring(16, url.length ); + if ($(this).find("a").length == 0) { + // Add index + var valid = checkFormElementInRange( + $(this).closest('form')[0], + 'added_fields', + 'Column count has to be larger than zero.' + ); + if (! valid) { + return; + } + var url = $(this).closest('form').serialize(); + var title = PMA_messages['strAddIndex']; + } else { + // Edit index + var url = $(this).find("a").attr("href"); + if (url.substring(0, 16) == "tbl_indexes.php?") { + url = url.substring(16, url.length ); + } + var title = PMA_messages['strEditIndex']; } - url = url + "&ajax_request=true"; + url += "&ajax_request=true"; /*Remove the hidden dialogs if there are*/ if ($('#edit_index_dialog').length != 0) { @@ -199,142 +227,111 @@ $(document).ready(function() { var $div = $('<div id="edit_index_dialog"></div>'); /** - * @var button_options Object that stores the options passed to jQueryUI - * dialog + * @var button_options Object that stores the options + * passed to jQueryUI dialog */ var button_options = {}; - // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} - - var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + button_options[PMA_messages['strGo']] = function() { + /** + * @var the_form object referring to the export form + */ + var $form = $("#index_frm"); + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=1", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#floating_menubar"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend(data.message); + + /*Reload the field form*/ + $("#table_index").remove(); + var $temp_div = $("<div id='temp_div'><div>").append(data.index_table); + $temp_div.find("#table_index").insertAfter("#index_header"); + if ($("#edit_index_dialog").length > 0) { + $("#edit_index_dialog").dialog("close"); + } + } else if (data.error != undefined) { + var $temp_div = $("<div id='temp_div'><div>").append(data.error); + if ($temp_div.find(".error code").length != 0) { + var $error = $temp_div.find(".error code").addClass("error"); + } else { + var $error = $temp_div; + } + PMA_ajaxShowMessage($error, false); + } + }) // end $.post() + } + button_options[PMA_messages['strCancel']] = function() { + $(this).dialog('close'); + } var $msgbox = PMA_ajaxShowMessage(); - - $.get( "tbl_indexes.php" , url , function(data) { - //in the case of an error, show the error message returned. - if (data.success != undefined && data.success == false) { - $div - .append(data.error) - .dialog({ - title: PMA_messages['strEdit'], - height: 230, - width: 900, - open: PMA_verifyColumnsProperties, - modal: true, - buttons : button_options_error - })// end dialog options + $.get("tbl_indexes.php", url, function(data) { + if (data.error) { + //in the case of an error, show the error message returned. + PMA_ajaxShowMessage(data.error, false); } else { + PMA_ajaxRemoveMessage($msgbox); + // Show dialog if the request was successful $div .append(data) .dialog({ - title: PMA_messages['strEdit'], - height: 600, - width: 900, + title: title, + width: 450, open: PMA_verifyColumnsProperties, modal: true, - buttons : button_options - }) - //Remove the top menu container from the dialog - .find("#topmenucontainer").hide() - ; // end dialog options + buttons: button_options, + close: function () { + $(this).remove(); + } + }); checkIndexType(); checkIndexName("index_frm"); + PMA_convertFootnotesToTooltips($div); + // Add a slider for selecting how many columns to add to the index + $div.find('.slider').slider({ + animate: true, + value: 1, + min: 1, + max: 16, + slide: function( event, ui ) { + $(this).closest('fieldset').find('input[type=submit]').val( + PMA_messages['strAddToIndex'].replace(/%d/, ui.value) + ); + } + }); + // Focus the slider, otherwise it looks nearly transparent + $('.ui-slider-handle').addClass('ui-state-focus'); } - PMA_ajaxRemoveMessage($msgbox); }) // end $.get() }); /** - *Ajax action for submiting the index form - **/ - $("#index_frm.ajax input[name=do_save_data]").live('click', function(event) { - event.preventDefault(); - /** - * @var the_form object referring to the export form - */ - var $form = $("#index_frm"); - - PMA_prepareForAjaxRequest($form); - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { - if ($("#sqlqueryresults").length != 0) { - $("#sqlqueryresults").remove(); - } - if (data.success == true) { - PMA_ajaxShowMessage(data.message); - $("<div id='sqlqueryresults'></div>").insertAfter("#floating_menubar"); - $("#sqlqueryresults").html(data.sql_query); - $("#result_query .notice").remove(); - $("#result_query").prepend((data.message)); - - /*Reload the field form*/ - $("#table_index").remove(); - var $temp_div = $("<div id='temp_div'><div>").append(data.index_table); - $temp_div.find("#table_index").insertAfter("#index_header"); - if ($("#edit_index_dialog").length > 0) { - $("#edit_index_dialog").dialog("close").remove(); - } - - } else { - if(data.error != undefined) { - var $temp_div = $("<div id='temp_div'><div>").append(data.error); - if ($temp_div.find(".error code").length != 0) { - var $error = $temp_div.find(".error code").addClass("error"); - } else { - var $error = $temp_div; - } - } - PMA_ajaxShowMessage($error); - } - - }) // end $.post() - }) // end insert table button "do_save_data" - - /** - *Ajax action for submiting the index form for add more columns - **/ - $("#index_frm.ajax input[name=add_fields]").live('click', function(event) { + * Handler for adding more columns to an index in the editor + */ + $('#index_frm input[type=submit]').live('click', function(event) { event.preventDefault(); - /** - * @var the_form object referring to the export form - */ - var $form = $("#index_frm"); - - PMA_prepareForAjaxRequest($form); - //User wants to submit the form - $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) { - $("#index_columns").remove(); - var $temp_div = $("<div id='temp_div'><div>").append(data); - $temp_div.find("#index_columns").appendTo("#index_edit_fields"); - }) // end $.post() - }) // end insert table button "Go" - - /**Add the show/hide index table option if the index is available*/ - if ($("#index_div.ajax").find("#table_index").length != 0) { - /** - *Prepare a div containing a link for toggle the index table - */ - $('<div id="toggletableindexdiv"><a id="toggletableindexlink"></a></div>') - .insertAfter('#index_div') - /** don't show it until we have index table on-screen */ - .show(); - - /** Changing the displayed text according to the hide/show criteria in table index*/ - - $('#toggletableindexlink') - .html(PMA_messages['strHideIndexes']) - .bind('click', function() { - var $link = $(this); - $('#index_div').slideToggle(); - if ($link.text() == PMA_messages['strHideIndexes']) { - $link.text(PMA_messages['strShowIndexes']); - } else { - $link.text(PMA_messages['strHideIndexes']); - } - /** avoid default click action */ - return false; - }); - } //end show/hide table index + var rows_to_add = $(this) + .closest('fieldset') + .find('.slider') + .slider('value'); + while (rows_to_add--) { + var $newrow = $('#index_columns') + .find('tbody > tr:first') + .clone() + .appendTo( + $('#index_columns').find('tbody') + ); + $newrow.find(':input').each(function() { + $(this).val(''); + }); + } + }); /** *Ajax event handler for Add column(s) @@ -385,10 +382,7 @@ $(document).ready(function() { open: PMA_verifyColumnsProperties, modal: true, buttons : button_options - }) - //Remove the top menu container from the dialog - .find("#topmenucontainer").hide() - ; // end dialog options + }); // end dialog options $div = $("#add_columns"); /*changed the z-index of the enum editor to allow the edit*/ @@ -454,10 +448,7 @@ function changeColumns(action,url) modal: true, open: PMA_verifyColumnsProperties, buttons : button_options - }) - //Remove the top menu container from the dialog - .find("#topmenucontainer").hide() - ; // end dialog options + }); // end dialog options $("#append_fields_form input[name=do_save_data]").addClass("ajax"); /*changed the z-index of the enum editor to allow the edit*/ $("#enum_editor").css("z-index", "1100"); diff --git a/libraries/Index.class.php b/libraries/Index.class.php index d790df9..6c6f8ba 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -414,15 +414,23 @@ class PMA_Index { $indexes = PMA_Index::getFromTable($table, $schema); - if (count($indexes) < 1) { - return PMA_Message::error(__('No index defined!'))->getDisplay(); - } - - $r = ''; + $no_indexes_class = count($indexes) > 0 ? ' hide' : ''; + $no_indexes = "<div class='no_indexes_defined$no_indexes_class'>"; + $no_indexes .= PMA_Message::notice(__('No index defined!'))->getDisplay(); + $no_indexes .= '</div>'; - $r .= '<h2 id="index_header">' . __('Indexes') . ': '; + $r = '<fieldset>'; + $r .= '<legend id="index_header">' . __('Indexes'); $r .= PMA_showMySQLDocu('optimization', 'optimizing-database-structure'); - $r .= '</h2>'; + $r .= '</legend>'; + $r .= $no_indexes; + if (count($indexes) < 1) { + $r .= '</fieldset>'; + return $r; + } + if (! $print_mode) { + $r .= PMA_Index::findDuplicates($table, $schema); + } $r .= '<table id="table_index">'; $r .= '<thead>'; $r .= '<tr>'; @@ -512,10 +520,7 @@ class PMA_Index } // end while $r .= '</tbody>'; $r .= '</table>'; - - if (! $print_mode) { - $r .= PMA_Index::findDuplicates($table, $schema); - } + $r .= '</fieldset>'; return $r; } @@ -565,7 +570,7 @@ class PMA_Index // did not find any difference // so it makes no sense to have this two equal indexes - $message = PMA_Message::error(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')); + $message = PMA_Message::notice(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')); $message->addParam($each_index->getName()); $message->addParam($while_index->getName()); $output .= $message->getDisplay(); diff --git a/tbl_alter.php b/tbl_alter.php index aace316..8efee90 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -156,7 +156,9 @@ if (isset($_REQUEST['do_save_data'])) { * $selected comes from multi_submits.inc.php */ if ($abort == false) { - include_once './libraries/tbl_links.inc.php'; + if ($_REQUEST['ajax_request'] != true) { + include_once './libraries/tbl_links.inc.php'; + } if (! isset($selected)) { PMA_checkParameters(array('field')); diff --git a/tbl_indexes.php b/tbl_indexes.php index f06a751..3a1a863 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -123,9 +123,10 @@ if (isset($_REQUEST['do_save_data'])) { // Displays headers (if needed) $GLOBALS['js_include'][] = 'indexes.js'; - require_once './libraries/tbl_info.inc.php'; -require_once './libraries/tbl_links.inc.php'; +if ($GLOBALS['is_ajax_request'] != true) { + require_once './libraries/tbl_links.inc.php'; +} if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { // coming already from form @@ -163,34 +164,43 @@ if (isset($_REQUEST['create_index'])) { echo PMA_generate_common_hidden_inputs($form_params); ?> <fieldset id="index_edit_fields"> +<?php +if ($GLOBALS['is_ajax_request'] != true) { +?> <legend> <?php -if (isset($_REQUEST['create_index'])) { - echo __('Create an index'); -} else { - echo __('Modify an index'); -} + if (isset($_REQUEST['create_index'])) { + echo __('Add index'); + } else { + echo __('Edit index'); + } ?> </legend> <?php -PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display(); +} ?> -<div class="formelement"> +<div> +<table class='index_info'> +<tr><td> +<strong> <label for="input_index_name"><?php echo __('Index name:'); ?></label> +</strong> +<?php echo PMA_showhint(PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?> +</td><td> <input type="text" name="index[Key_name]" id="input_index_name" size="25" value="<?php echo htmlspecialchars($index->getName()); ?>" onfocus="this.select()" /> -</div> - -<div class="formelement"> +</td></tr><tr><td> +<strong> <label for="select_index_type"><?php echo __('Index type:'); ?></label> +</strong> +<?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> +</td><td> <select name="index[Index_type]" id="select_index_type" > <?php echo $index->generateIndexSelector(); ?> </select> -<?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> +</td></tr></table> </div> -<br class="clearfloat" /><br /> - <table id="index_columns"> <thead> <tr><th><?php echo __('Column'); ?></th> @@ -206,7 +216,7 @@ $spatial_types = array( ); foreach ($index->getColumns() as $column) { ?> -<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick"> <td><select name="index[columns][names][]"> <option value="">-- <?php echo __('Ignore'); ?> --</option> <?php @@ -233,7 +243,7 @@ foreach ($index->getColumns() as $column) { } // end foreach $edited_index_info['Sequences'] for ($i = 0; $i < $add_fields; $i++) { ?> -<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>"> +<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick"> <td><select name="index[columns][names][]"> <option value="">-- <?php echo __('Ignore'); ?> --</option> <?php @@ -256,21 +266,30 @@ for ($i = 0; $i < $add_fields; $i++) { </tbody> </table> </fieldset> - <fieldset class="tblFooters"> +<?php + if ($GLOBALS['is_ajax_request'] != true) { +?> <input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>" /> <span id="addMoreColumns"> <?php echo __('Or') . ' '; -echo sprintf(__('Add to index  %s column(s)'), - '<input type="text" name="added_fields" size="2" value="1"' - .' onfocus="this.select()" />') . "\n"; -echo '<input type="submit" name="add_fields" value="' . __('Go') . '"' - .' onclick="return checkFormElementInRange(this.form,' - ." 'added_fields', '" . PMA_jsFormat(__('Column count has to be larger than zero.')) . "', 1" - .')" />' . "\n"; +printf( + __('Add to index  %s column(s)') . "\n", + '<input type="text" name="added_fields" size="2" value="1" />' +); +echo '<input type="submit" name="add_fields" value="' . __('Go') . '" />' . "\n"; ?> </span> +<?php + } else { + $btn_value = sprintf(__('Add %d column(s) to index'), 1); + echo '<div class="slider"></div>'; + echo '<div class="add_fields">'; + echo '<input type="submit" value="' . $btn_value . '" />'; + echo '</div>'; + } +?> </fieldset> </form> <?php diff --git a/tbl_structure.php b/tbl_structure.php index 754dea1..9de9d5a 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -689,26 +689,25 @@ if (count($fields) > 20) { */ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { + PMA_generate_slider_effect('indexes', __('Indexes')); /** * Display indexes */ echo PMA_Index::getView($table, $db); ?> + <fieldset class="tblFooters" style="text-align: left;"> + <form action="./tbl_indexes.php" method="post"> + <?php + echo PMA_generate_common_hidden_inputs($db, $table); + echo sprintf(__('Create an index on  %s columns'), + '<input type="text" size="2" name="added_fields" value="1" />'); + ?> + <input type="hidden" name="create_index" value="1" /> + <input class="add_index<?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' ajax' : '');?>" type="submit" value="<?php echo __('Go'); ?>" /> + </form> + </fieldset> + </div> </div> -<form action="./tbl_indexes.php" method="post" - onsubmit="return checkFormElementInRange(this, 'added_fields', - '<?php echo str_replace('\'', '\\\'', __('Column count has to be larger than zero.')); ?>', - 1)"> -<fieldset> - <?php - echo PMA_generate_common_hidden_inputs($db, $table); - echo sprintf(__('Create an index on  %s columns'), - '<input type="text" size="2" name="added_fields" value="1" />'); - ?> - <input type="submit" name="create_index" value="<?php echo __('Go'); ?>" /> -</fieldset> -</form> -<br /> <?php } @@ -756,6 +755,8 @@ if ($cfg['ShowStats']) { $odd_row = false; ?> + <fieldset> + <legend><?php echo __('Information'); ?></legend> <a name="showusage"></a> <?php if (! $tbl_is_view && ! $db_is_information_schema) { ?> <table id="tablespaceusage" class="data"> @@ -933,7 +934,7 @@ if ($cfg['ShowStats']) { ?> </tbody> </table> - + </fieldset>  </div> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 289d5c4..eab4ec1 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1736,6 +1736,48 @@ td.more_opts { white-space: nowrap; } +/** + * Indexes + */ +#index_frm .index_info input, +#index_frm .index_info select { + width: 100%; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#index_frm .slider { + width: 10em; + margin: 0.6em; + float: <?php echo $left; ?>; +} + +#index_frm .add_fields { + float: <?php echo $left; ?>; +} + +#index_frm .add_fields input { + margin-<?php echo $left; ?>: 1em; +} + +#index_frm input { + margin: 0; +} + +#index_frm td { + vertical-align: middle; +} + +table#index_columns { + width: 100%; +} + +table#index_columns select { + width: 100%; +} + iframe.IE_hack { z-index: 1; position: absolute; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index a2b594b..aa0f27b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2119,6 +2119,48 @@ td.more_opts { white-space: nowrap; } +/** + * Indexes + */ +#index_frm .index_info input, +#index_frm .index_info select { + width: 100%; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#index_frm .slider { + width: 10em; + margin: 0.6em; + float: <?php echo $left; ?>; +} + +#index_frm .add_fields { + float: <?php echo $left; ?>; +} + +#index_frm .add_fields input { + margin-<?php echo $left; ?>: 1em; +} + +#index_frm input { + margin: 0; +} + +#index_frm td { + vertical-align: middle; +} + +table#index_columns { + width: 100%; +} + +table#index_columns select { + width: 100%; +} + iframe.IE_hack { z-index: 1; position: absolute; hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-22967-gc2a8246

by Marc Delisle

The branch, master has been updated via c2a8246bc882bd6194e02aea61ff12878136c83a (commit) via 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit) from 6723a5bed5a36df583ac7e0863a2c91bac073196 (commit) - Log ----------------------------------------------------------------- commit c2a8246bc882bd6194e02aea61ff12878136c83a Merge: 6723a5b 8219f7c Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 19 07:03:12 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/db_info.inc.php | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f528816..39086e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,8 @@ phpMyAdmin - ChangeLog - bug #3431427 [display] Dropdown results - setting NULL does not work - patch #3428764 [edit] Inline edit on multi-server configuration - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 +- [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the + view name in main panel db Structure page 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index cb5bf4c..66c3951 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -50,6 +50,10 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) // remove InnoDB comment from end, just the minimal part (*? is non greedy) $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']); } + // views have VIEW as comment so it's not a real comment put by a user + if ('VIEW' == $table['Comment']) { + $table['Comment'] = ''; + } if (empty($table['Comment'])) { $table['Comment'] = $table['Name']; } else { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-29-g8219f7c

by Marc Delisle

The branch, QA_3_4 has been updated via 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit) from 2e92b86f92df4dc4d295e7ad7250ab4a3c29bbf2 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/db_info.inc.php | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2432fd3..9940711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ phpMyAdmin - ChangeLog - bug #3431427 [display] Dropdown results - setting NULL does not work - patch #3428764 [edit] Inline edit on multi-server configuration - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 +- [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the + view name in main panel db Structure page 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 44dc3a8..4dc7eb0 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -75,6 +75,10 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) // remove InnoDB comment from end, just the minimal part (*? is non greedy) $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']); } + // views have VIEW as comment so it's not a real comment put by a user + if ('VIEW' == $table['Comment']) { + $table['Comment'] = ''; + } if (empty($table['Comment'])) { $table['Comment'] = $table['Name']; } else { hooks/post-receive -- phpMyAdmin

12 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2011