August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13270-g67d5346
by Piotr Przybylski 06 Aug '11

06 Aug '11

The branch, master has been updated via 67d5346da5fdcfacdd73bf49c444a88842c88ae7 (commit) from eb66564960eeb840a7521a35c00d32aebb9525bb (commit) - Log ----------------------------------------------------------------- commit 67d5346da5fdcfacdd73bf49c444a88842c88ae7 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Aug 6 11:02:25 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index 623681c..28a7193 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -913,7 +913,7 @@ if (isset($_REQUEST['synchronize_db'])) { } foreach ($source_tables_uncommon as $tbl_nc_name) { $rows[] = array( - 'src_table_name' => '+ ' + $tbl_nc_name, + 'src_table_name' => '+ ' . $tbl_nc_name, 'dst_table_name' => $tbl_nc_name); } foreach ($target_tables_uncommon as $tbl_nc_name) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13269-geb66564
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via eb66564960eeb840a7521a35c00d32aebb9525bb (commit) from 680cfbe726e52c016435683fec809d105954afa1 (commit) - Log ----------------------------------------------------------------- commit eb66564960eeb840a7521a35c00d32aebb9525bb Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:44:06 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: libraries/advisory_rules.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index 9e1b0ec..3f3f985 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -78,14 +78,14 @@ rule 'Slow query logging' rule 'Release Series' version !PMA_DRIZZLE && substr(value,0,3) != "5.1" - The MySQL server version less then 5.1. + The MySQL server version less than 5.1. You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 even more so. Current version: %s | value rule 'Minor Version' version !PMA_DRIZZLE && substr(value,4,2) < 30 - Version less then 5.1.30 (the first GA release of 5.1). + Version less than 5.1.30 (the first GA release of 5.1). You should upgrade, as recent versions of MySQL 5.1 have improved performance and MySQL 5.5 even more so. Current version: %s | value @@ -139,7 +139,7 @@ rule 'Query cache fragmentation' [!fired('Query cache disabled')] Qcache_free_blocks / (Qcache_total_blocks / 2) * 100 value > 20 The query cache is considerably fragmented. - Severe fragementation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache + Severe fragementation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache The cache is currently fragmented by %s% , with 100% fragmentation meaning that the query cache is an alternating pattern of free and used blocks. This value should be below 20%. | round(value,1) rule 'Query cache low memory prunes' [Qcache_inserts > 0 && !fired('Query cache disabled')] hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13268-g680cfbe
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 680cfbe726e52c016435683fec809d105954afa1 (commit) via 990820f5fac3ad741662419c923e2bda74097442 (commit) via 23389d2e4f9bce3e12def3ab479f376738c83216 (commit) via 36e1af721ef427214dcf4e276bdf247ebce4032b (commit) from ca9c30f1d60ad88ed1a0320dd231c54e866ab439 (commit) - Log ----------------------------------------------------------------- commit 680cfbe726e52c016435683fec809d105954afa1 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:39:16 2011 +0200 Server Synchronize: better layout for displayed queries commit 990820f5fac3ad741662419c923e2bda74097442 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:38:50 2011 +0200 Server Synchronize: fix a few cases of undefined variable warning commit 23389d2e4f9bce3e12def3ab479f376738c83216 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:38:10 2011 +0200 Server Synchronize: make it fully work on servers other than the first one commit 36e1af721ef427214dcf4e276bdf247ebce4032b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 22:36:12 2011 +0200 Server Synchronize: display semicolon after executed queries ----------------------------------------------------------------------- Summary of changes: js/server_synchronize.js | 30 ++++++++++-------------------- libraries/server_synchronize.lib.php | 4 ++++ server_synchronize.php | 21 +++++++++++---------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 2cc0365..8425423 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -226,33 +226,23 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem */ function ApplySelectedChanges(token) { - var div = document.getElementById("list"); - var table = div.getElementsByTagName('table')[0]; - var table_body = table.getElementsByTagName('tbody')[0]; - // Get all the rows from the details table - var table_rows = table_body.getElementsByTagName('tr'); - var x = table_rows.length; - var i; /** Append the token at the beginning of the query string followed by Table_ids that shows that "Apply Selected Changes" button is pressed */ - var append_string = "?token="+token+"&Table_ids="+1; - for(i=0; i<x; i++){ - append_string += "&"; - append_string += i+"="+table_rows[i].id; + var params = { + token: $('#synchronize_form input[name=token]').val(), + server: $('#synchronize_form input[name=server]').val(), + checked: $('#delete_rows').prop('checked') ? 'true' : 'false', + Table_ids: 1 + }; + var $rows = $('#list tbody tr'); + for(var i = 0; i < $rows.length; i++) { + params[i] = $($rows[i]).attr('id'); } - // Getting the value of checkbox delete_rows - var checkbox = document.getElementById("delete_rows"); - if (checkbox.checked){ - append_string += "&checked=true"; - } else { - append_string += "&checked=false"; - } //Appending the token and list of table ids in the URL - location.href += token; - location.href += append_string; + location.href += '?' + $.param(params); } diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1d8bfab..eacae70 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -422,6 +422,7 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li } } } + $query .= ';'; if ($display == true) { echo "<p>" . $query . "</p>"; } @@ -621,6 +622,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm } } } + $Create_Table_Query .= ';'; if ($display == true) { echo '<p>' . $Create_Table_Query . '</p>'; } @@ -1040,6 +1042,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s } } } + $query .= ';'; if ($check) { if ($display == true) { echo '<p>' . $query . '</p>'; @@ -1229,6 +1232,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind $query .= " )"; } } + $query .= ';'; if ($display == true) { echo '<p>' . $query . '</p>'; } diff --git a/server_synchronize.php b/server_synchronize.php index faffd65..623681c 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -254,7 +254,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ ?> <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php"> - <?php PMA_generate_common_hidden_inputs('', ''); ?> + <?php echo PMA_generate_common_hidden_inputs('', ''); ?> <table width="40%"> <tr> <td> @@ -281,8 +281,9 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Calculating the number of updates for each matching table */ - if (isset($update_array[$i]) && isset($update_array[$i][0]) && - isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($update_array[$i]) && isset($update_array[$i][0]) + && !empty($matching_tables_keys[$i][0]) + && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_updates = sizeof($update_array[$i]); } else { $num_of_updates = 0; @@ -290,8 +291,9 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Calculating the number of insertions for each matching table */ - if (isset($insert_array[$i]) && isset($insert_array[$i][0]) && - isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { + if (isset($insert_array[$i]) && isset($insert_array[$i][0]) + && !empty($matching_tables_keys[$i]) + && isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { $num_of_insertions = sizeof($insert_array[$i]); } else { $num_of_insertions = 0; @@ -341,7 +343,7 @@ if ((isset($_REQUEST['submit_connect']))) { /** * Display the green button of data synchronization if there exists any data difference. */ - if (isset($update_array[$i]) || isset($insert_array[$i])) { + if ((isset($update_array[$i]) || isset($insert_array[$i])) && !empty($matching_tables_keys[$i])) { if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null); } @@ -743,6 +745,7 @@ if (isset($_REQUEST['Table_ids'])) { } $rows[] = array( 'src_table_name' => $matching_tables[$i], + 'dst_table_name' => $matching_tables[$i], 'btn_type' => 'M', 'btn_structure' => $btn_structure_params, 'btn_data' => $btn_data_params @@ -945,9 +948,7 @@ if (isset($_REQUEST['synchronize_db'])) { /** * Displaying the queries. */ - echo '<h5>' . __('The following queries have been executed:') . '</h5>'; - echo '<div id="serverstatus" style = "overflow: auto; width: 1050px; height: 180px; - border-left: 1px gray solid; border-bottom: 1px gray solid; padding: 0px; margin: 0px"> '; + echo '<fieldset><legend>' . __('Executed queries') . '</legend>'; /** * Applying all sorts of differences for each matching table */ @@ -1018,7 +1019,7 @@ if (isset($_REQUEST['synchronize_db'])) { PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, true); } } - echo "</div>"; + echo "</fieldset>"; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13264-gca9c30f
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via ca9c30f1d60ad88ed1a0320dd231c54e866ab439 (commit) from efa788d00d4ab546f7ec1b24522087c9cbc13743 (commit) - Log ----------------------------------------------------------------- commit ca9c30f1d60ad88ed1a0320dd231c54e866ab439 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 18:14:05 2011 +0200 Synchronize: allow to connect to local server through socket ----------------------------------------------------------------------- Summary of changes: server_synchronize.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server_synchronize.php b/server_synchronize.php index 3e57f44..faffd65 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1083,7 +1083,7 @@ if (isset($_REQUEST['synchronize_db'])) { echo '>' . __('Current connection') . '</option>'; foreach ($GLOBALS['cfg']['Servers'] as $key => $tmp_server) { - if (empty($tmp_server['host'])) { + if (empty($tmp_server['host']) && empty($tmp_server['socket'])) { continue; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13263-gefa788d
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via efa788d00d4ab546f7ec1b24522087c9cbc13743 (commit) from 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 (commit) - Log ----------------------------------------------------------------- commit efa788d00d4ab546f7ec1b24522087c9cbc13743 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 17:12:46 2011 +0200 Synchronize: add missing arguments to a function, document possibly broken function ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index a862a60..1d8bfab 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -436,6 +436,9 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li /** * PMA_insertIntoTargetTable() inserts missing rows in the target table using $array_insert[$matching_table_index] * + * @todo this function uses undefined variables and is possibly broken: $matching_tables, + * $matching_tables_fields, $remove_indexes_array, $matching_table_keys + * * @param array $matching_table matching table names * @param string $src_db name of source database * @param string $trg_db name of target database @@ -865,8 +868,8 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma if (isset($is_fk_result)) { if (in_array($is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables)) { $table_index = array_keys($uncommon_tables, $is_fk_result[0]['REFERENCED_TABLE_NAME']); - PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[0]['REFERENCED_TABLE_NAME'], $uncommon_tables, $uncommon_tables_fields); - PMA_createTargetTables($src_db, $trg_db, $trg_link, $src_link, $uncommon_tables, $table_index[0], $uncommon_tables_fields); + PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link, $is_fk_result[0]['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]]); } $fk_query = "ALTER TABLE " . PMA_backquote($trg_db) . '.' . PMA_backquote($matching_tables[$table_counter]) . hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13262-g7a14dd6
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 (commit) from 092108bdee43d0dd4389e323eadc7d3ae58d8a37 (commit) - Log ----------------------------------------------------------------- commit 7a14dd6ba80432f9627ae66e6f114bc2f7ff8751 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 16:50:00 2011 +0200 Fix file ----------------------------------------------------------------------- Summary of changes: libraries/replication.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index a6b5d99..58ed7c5 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -358,7 +358,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) * INTEGRATION OF STRUCTURE DIFFERENCE CODE * */ - $source_columns = array();test/libraries/common/PMA_contains_nonprintable_ascii_test.php: + $source_columns = array(); $target_columns = array(); $alter_str_array = array(array()); $add_column_array = array(array()); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13261-g092108b
by Piotr Przybylski 05 Aug '11

05 Aug '11

The branch, master has been updated via 092108bdee43d0dd4389e323eadc7d3ae58d8a37 (commit) via 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 (commit) from efee7ec87094a31885adfe96e7667733a1c763aa (commit) - Log ----------------------------------------------------------------- commit 092108bdee43d0dd4389e323eadc7d3ae58d8a37 Merge: 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 efee7ec87094a31885adfe96e7667733a1c763aa Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 16:47:14 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 9d7d5f960f7da9242c9a69a7eba82e135bb52b59 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Aug 5 12:51:05 2011 +0200 Remove unused variables ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 1edbb83..a862a60 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -125,9 +125,6 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } $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; @@ -307,11 +304,9 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma { if (isset($trg_keys[$matching_table_index])) { $target_key_values = PMA_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_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++) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13259-gefee7ec
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via efee7ec87094a31885adfe96e7667733a1c763aa (commit) from 43161e7876fc27975ea27e44d21401d5cbcb95ab (commit) - Log ----------------------------------------------------------------- commit efee7ec87094a31885adfe96e7667733a1c763aa Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 16:10:31 2011 +0200 Definie missing variable ----------------------------------------------------------------------- Summary of changes: .../rte/PMA_RTN_getDataFromRequest_test.php | 3 +++ test/libraries/rte/PMA_RTN_getEditorForm_test.php | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index 1a75ca7..db61325 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -18,6 +18,9 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { public function setUp() { + global $cfg; + + $cfg['ShowFunctionFields'] = false; require 'libraries/data_mysql.inc.php'; } diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index ac1ba52..2fd0129 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -17,6 +17,9 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase { public function setUp() { + global $cfg; + + $cfg['ShowFunctionFields'] = false; require 'libraries/data_mysql.inc.php'; if (! function_exists('PMA_generateCharsetDropdownBox')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13258-g43161e7
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via 43161e7876fc27975ea27e44d21401d5cbcb95ab (commit) from cdd2044274fa8de257fbdc873d9df57922c8ba19 (commit) - Log ----------------------------------------------------------------- commit 43161e7876fc27975ea27e44d21401d5cbcb95ab Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 16:01:39 2011 +0200 Ensure that ColumnTypes is set on test run ----------------------------------------------------------------------- Summary of changes: .../rte/PMA_RTN_getDataFromRequest_test.php | 10 +++++----- test/libraries/rte/PMA_RTN_getEditorForm_test.php | 3 ++- test/libraries/rte/PMA_RTN_getExecuteForm_test.php | 2 +- .../rte/PMA_RTN_getQueryFromRequest_test.php | 9 +-------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index d24de2b..1a75ca7 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -6,7 +6,6 @@ * @package phpMyAdmin-test */ -require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/common.lib.php'; @@ -17,6 +16,11 @@ require_once 'libraries/rte/rte_routines.lib.php'; class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { + public function setUp() + { + require 'libraries/data_mysql.inc.php'; + } + /** * @dataProvider provider */ @@ -24,10 +28,6 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase { global $cfg, $_REQUEST; - if (! isset($cfg['ColumnTypes'])) { - $this->markTestSkipped('Can\'t get column types'); // FIXME - } - unset($_REQUEST); foreach ($in as $key => $value) { if ($value !== '') { diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index ef96a79..ac1ba52 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -6,7 +6,6 @@ * @package phpMyAdmin-test */ require_once 'libraries/common.lib.php'; -require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/php-gettext/gettext.inc'; require_once 'libraries/url_generating.lib.php'; /* @@ -18,6 +17,8 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase { public function setUp() { + require 'libraries/data_mysql.inc.php'; + if (! function_exists('PMA_generateCharsetDropdownBox')) { function PMA_generateCharsetDropdownBox() {} } diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index eab74b4..f74f5a3 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -53,7 +53,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase $cfg['DefaultFunctions']['FUNC_DATE'] = ''; $GLOBALS['tear_down']['default'] = true; } - eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3)); // FIXME + require 'libraries/data_mysql.inc.php'; } public function tearDown() diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index 175c95b..db11ff4 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -9,7 +9,6 @@ /* * Needed for PMA_backquote() and PMA_RTN_getQueryFromRequest() */ -//require_once 'libraries/data_mysql.inc.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/php-gettext/gettext.inc'; @@ -28,15 +27,9 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase { global $_REQUEST, $errors, $cfg; - // FIXME: the below two lines are needed to get the test to work, - // but are definitely the wrong way to go about the issue - // of $cfg['ColumnTypes'] being undefined $cfg['ShowFunctionFields'] = false; - eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3)); - if (! isset($cfg['ColumnTypes'])) { - $this->markTestSkipped('Can\'t get column types'); // FIXME - } + require 'libraries/data_mysql.inc.php'; $errors = array(); PMA_RTN_setGlobals(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13257-gcdd2044
by Michal Čihař 05 Aug '11

05 Aug '11

The branch, master has been updated via cdd2044274fa8de257fbdc873d9df57922c8ba19 (commit) from 99986466008f4729f29b990b440afc1c9693b220 (commit) - Log ----------------------------------------------------------------- commit cdd2044274fa8de257fbdc873d9df57922c8ba19 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Aug 5 15:50:14 2011 +0200 Add some missing spacing in docblocks ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 353e775..e491adb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -31,6 +31,7 @@ function PMA_detect_pow() * @param string $base base to raise * @param string $exp exponent to use * @param mixed $use_function pow function to use, or false for auto-detect + * * @return mixed string or float */ function PMA_pow($base, $exp, $use_function = false) @@ -76,6 +77,7 @@ function PMA_pow($base, $exp, $use_function = false) * @param string $alternate alternate text * @param boolean $force_text whether to force alternate text to be displayed * @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite + * * @return html img tag */ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = false) @@ -119,6 +121,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa * Displays the maximum size for an upload * * @param integer $max_upload_size the size + * * @return string the message * * @access public @@ -136,6 +139,7 @@ function PMA_displayMaximumUploadSize($max_upload_size) * the maximum size for upload * * @param integer $max_size the size + * * @return string the INPUT field * * @access public @@ -191,6 +195,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php * Note: This function does not escape backslashes! * * @param string $name the string to escape + * * @return string the escaped string * * @access public @@ -208,7 +213,9 @@ function PMA_escape_mysql_wildcards($name) * Note: This function does not unescape backslashes! * * @param string $name the string to escape + * * @return string the escaped string + * * @access public */ function PMA_unescape_mysql_wildcards($name) @@ -226,6 +233,7 @@ function PMA_unescape_mysql_wildcards($name) * * @param string $quoted_string string to remove quotes from * @param string $quote type of quote to remove + * * @return string unqoted string */ function PMA_unQuote($quoted_string, $quote = null) @@ -259,6 +267,7 @@ function PMA_unQuote($quoted_string, $quote = null) * @todo move into PMA_Sql * @param mixed $parsed_sql pre-parsed SQL structure * @param string $unparsed_sql raw SQL string + * * @return string the formatted sql * * @global array the configuration array @@ -406,6 +415,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju * Displays a link to the phpMyAdmin documentation * * @param string $anchor anchor in documentation + * * @return string the html link * * @access public @@ -423,6 +433,7 @@ function PMA_showDocu($anchor) * Displays a link to the PHP documentation * * @param string $target anchor in documentation + * * @return string the html link * * @access public @@ -444,7 +455,9 @@ function PMA_showPHPDocu($target) * @param string $message the error message * @param bool $bbcode * @param string $type + * * @return string html code for a footnote marker + * * @access public */ function PMA_showHint($message, $bbcode = false, $type = 'notice') @@ -636,6 +649,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', * @param string $tables name of tables * @param integer $limit_offset list offset * @param int|bool $limit_count max tables to return + * * @return array (recursive) grouped table list */ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = false) @@ -766,7 +780,9 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * or array of it * @param boolean $do_it a flag to bypass this function (used by dump * functions) + * * @return mixed the "backquoted" database, table or field name + * * @access public */ function PMA_backquote($a_name, $do_it = true) @@ -860,7 +876,9 @@ if (!$jsonly) * @param string $sql_query the query to display * @param string $type the type (level) of the message * @param boolean $is_view is this a message after a VIEW operation? + * * @return string + * * @access public */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) @@ -1216,6 +1234,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * Verifies if current MySQL server supports profiling * * @access public + * * @return boolean whether profiling is supported */ function PMA_profilingSupported() @@ -1301,6 +1320,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) * Changes thousands and decimal separators to locale specific values. * * @param $value + * * @return string */ function PMA_localizeNumber($value) @@ -1414,6 +1434,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow * Returns the number of bytes when a formatted size is given * * @param string $formatted_size the size expression (for example 8MB) + * * @return integer The numerical part of the expression (for example 8) */ function PMA_extractValueFromFormattedSize($formatted_size) @@ -1435,6 +1456,7 @@ function PMA_extractValueFromFormattedSize($formatted_size) * * @param string $timestamp the current timestamp * @param string $format format + * * @return string the formatted date * * @access public @@ -1504,7 +1526,9 @@ function PMA_localisedDate($timestamp = -1, $format = '') * * @param array $tab array with all options * @param array $url_params + * * @return string html code for one tab, a link if valid otherwise a span + * * @access public */ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') @@ -1603,6 +1627,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') * * @param array $tabs one element per tab * @param string $url_params + * * @return string html-code for tab-navigation */ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') @@ -1779,6 +1804,7 @@ function PMA_timespanFormat($seconds) * @param string $Separator The Separator (defaults to "<br />\n") * * @access public + * * @return string The flipped string */ function PMA_flipstring($string, $Separator = "<br />\n") @@ -1880,6 +1906,7 @@ function PMA_checkParameters($params, $die = true, $request = true) * @param boolean $force_unique generate condition only on pk or unique * * @access public + * * @return array the calculated condition and whether condition is unique */ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) @@ -2049,6 +2076,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, * @param string $prompt The prompt to display (sometimes empty) * * @return string + * * @access public */ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, @@ -2223,7 +2251,9 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * $user_dir = PMA_userDir('/var/pma_tmp/%u/'); // '/var/pma_tmp/root/' * * </code> + * * @param string $dir with wildcard for user + * * @return string per user directory */ function PMA_userDir($dir) @@ -2240,6 +2270,7 @@ function PMA_userDir($dir) * returns html code for db link to default db page * * @param string $database + * * @return string html link to default db page */ function PMA_getDbLink($database = null) @@ -2330,6 +2361,7 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' * @param string $id id of the select element; can be different in case * the dropdown is present more than once on the page * @return string + * * @todo support titles */ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) @@ -2467,6 +2499,7 @@ function PMA_clearUserCache() * * @param string $var * @param int|true $server + * * @return boolean */ function PMA_cacheExists($var, $server = 0) @@ -2482,6 +2515,7 @@ function PMA_cacheExists($var, $server = 0) * * @param string $var * @param int|true $server + * * @return mixed */ function PMA_cacheGet($var, $server = 0) @@ -2502,6 +2536,7 @@ function PMA_cacheGet($var, $server = 0) * @param string $var * @param mixed $val * @param int|true $server + * * @return mixed */ function PMA_cacheSet($var, $val = null, $server = 0) @@ -2533,6 +2568,7 @@ function PMA_cacheUnset($var, $server = 0) * * @param numeric $value coming from a BIT field * @param integer $length + * * @return string the printable value */ function PMA_printable_bit_value($value, $length) @@ -2549,6 +2585,7 @@ function PMA_printable_bit_value($value, $length) * Verifies whether the value contains a non-printable character * * @param string $value + * * @return boolean */ function PMA_contains_nonprintable_ascii($value) @@ -2561,6 +2598,7 @@ function PMA_contains_nonprintable_ascii($value) * for example, b'010' becomes 010 * * @param string $bit_default_value + * * @return string the converted value */ function PMA_convert_bit_default_value($bit_default_value) @@ -2572,6 +2610,7 @@ function PMA_convert_bit_default_value($bit_default_value) * Extracts the various parts from a field type spec * * @param string $fieldspec + * * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) */ @@ -2687,6 +2726,7 @@ function PMA_extractFieldSpec($fieldspec) * Verifies if this table's engine supports foreign keys * * @param string $engine + * * @return boolean */ function PMA_foreignkey_supported($engine) @@ -2703,6 +2743,7 @@ function PMA_foreignkey_supported($engine) * Replaces some characters by a displayable equivalent * * @param string $content + * * @return string the content with characters replaced */ function PMA_replace_binary_contents($content) @@ -2719,6 +2760,7 @@ function PMA_replace_binary_contents($content) * If the string starts with a \r\n pair (0x0d0a) add an extra \n * * @param string $string + * * @return string with the chars replaced */ @@ -2737,6 +2779,7 @@ function PMA_duplicateFirstNewline($string) * * @param string $target a valid value for $cfg['LeftDefaultTabTable'], $cfg['DefaultTabTable'] * or $cfg['DefaultTabDatabase'] + * * @return array */ function PMA_getTitleForTarget($target) @@ -2764,6 +2807,7 @@ function PMA_getTitleForTarget($target) * @param string $string Text where to do expansion. * @param function $escape Function to call for escaping variable values. * @param array $updates Array with overrides for default parameters (obtained from GLOBALS). + * * @return string */ function PMA_expandUserString($string, $escape = null, $updates = array()) @@ -3154,6 +3198,7 @@ function PMA_getFunctionsForField($field, $insert_mode) * string, db name where to also check for privileges * @param mixed $tbl null, to only check global privileges * string, db name where to also check for privileges + * * @return bool */ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) hooks/post-receive -- phpMyAdmin

1 0