- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2983-g8b47a1d
by Piotr Przybylski 06 Jun '11

06 Jun '11

The branch, master has been updated via 8b47a1dbd4a38fa12abe57f0eb0cbf74f1e433de (commit) via 610614c95fad9c3e4bebff0ce4900d850471c5f5 (commit) from 47528c2048d2f8cccb0fbe7477a87960211edcc9 (commit) - Log ----------------------------------------------------------------- commit 8b47a1dbd4a38fa12abe57f0eb0cbf74f1e433de Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Jun 6 00:31:52 2011 +0200 Remove $mysql_charsets_count and $mysql_collations_count commit 610614c95fad9c3e4bebff0ce4900d850471c5f5 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Jun 6 00:25:52 2011 +0200 Removed global variables with array counts in sqlparser.lib.php ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 3 +-- libraries/mysql_charsets.lib.php | 8 +------- libraries/sqlparser.data.php | 34 +--------------------------------- libraries/sqlparser.lib.php | 24 ++++++++++++------------ server_collations.php | 2 +- 5 files changed, 16 insertions(+), 55 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 77fc3fc..807376f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -826,9 +826,8 @@ function PMA_backquote($a_name, $do_it = true) if (! $do_it) { global $PMA_SQPdata_forbidden_word; - global $PMA_SQPdata_forbidden_word_cnt; - if(! PMA_STR_binarySearchInArr(strtoupper($a_name), $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt)) { + if(! PMA_STR_binarySearchInArr(strtoupper($a_name), $PMA_SQPdata_forbidden_word, count($PMA_SQPdata_forbidden_word))) { return $a_name; } } diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 51b79ba..8d1eb83 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) { /** * */ -if (! PMA_cacheExists('mysql_charsets_count', true)) { +if (! PMA_cacheExists('mysql_charsets', true)) { $sql = PMA_DRIZZLE ? 'SELECT * FROM data_dictionary.CHARACTER_SETS' : 'SELECT * FROM information_schema.CHARACTER_SETS'; @@ -26,7 +26,6 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { } PMA_DBI_free_result($res); - $mysql_charsets_count = count($mysql_charsets); sort($mysql_charsets, SORT_STRING); $mysql_collations = array_flip($mysql_charsets); @@ -60,7 +59,6 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { unset($mysql_collations['utf8_general_ci']); } - $mysql_collations_count = count($mysql_collations_flat); sort($mysql_collations_flat, SORT_STRING); foreach ($mysql_collations AS $key => $value) { sort($mysql_collations[$key], SORT_STRING); @@ -70,22 +68,18 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) { PMA_cacheSet('mysql_charsets', $GLOBALS['mysql_charsets'], true); PMA_cacheSet('mysql_charsets_descriptions', $GLOBALS['mysql_charsets_descriptions'], true); - PMA_cacheSet('mysql_charsets_count', $GLOBALS['mysql_charsets_count'], true); PMA_cacheSet('mysql_charsets_available', $GLOBALS['mysql_charsets_available'], true); PMA_cacheSet('mysql_collations', $GLOBALS['mysql_collations'], true); PMA_cacheSet('mysql_default_collations', $GLOBALS['mysql_default_collations'], true); PMA_cacheSet('mysql_collations_flat', $GLOBALS['mysql_collations_flat'], true); - PMA_cacheSet('mysql_collations_count', $GLOBALS['mysql_collations_count'], true); PMA_cacheSet('mysql_collations_available', $GLOBALS['mysql_collations_available'], true); } else { $GLOBALS['mysql_charsets'] = PMA_cacheGet('mysql_charsets', true); $GLOBALS['mysql_charsets_descriptions'] = PMA_cacheGet('mysql_charsets_descriptions', true); - $GLOBALS['mysql_charsets_count'] = PMA_cacheGet('mysql_charsets_count', true); $GLOBALS['mysql_charsets_available'] = PMA_cacheGet('mysql_charsets_available', true); $GLOBALS['mysql_collations'] = PMA_cacheGet('mysql_collations', true); $GLOBALS['mysql_default_collations'] = PMA_cacheGet('mysql_default_collations', true); $GLOBALS['mysql_collations_flat'] = PMA_cacheGet('mysql_collations_flat', true); - $GLOBALS['mysql_collations_count'] = PMA_cacheGet('mysql_collations_count', true); $GLOBALS['mysql_collations_available'] = PMA_cacheGet('mysql_collations_available', true); } diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index c7dacc6..5011ca7 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -12,9 +12,7 @@ * (around 4.0.2) as well as the MySQL documentation. * * Note: before adding a value in the arrays, ensure that you respect - * proper sorting, especially with underscores. And don't forget to - * update the _cnt variable at the end of each array. - * (It's slower to have PHP do the count). + * proper sorting, especially with underscores. * * It's easier to use only uppercase for proper sorting. In case of * doubt, use the test case to verify. @@ -332,12 +330,6 @@ $PMA_SQPdata_function_name = array ( 'YEAR', 'YEARWEEK' ); -/** - * $PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name); - * - * @global integer MySQL attributes count - */ -$PMA_SQPdata_function_name_cnt = 298; /** * @global array MySQL attributes @@ -374,12 +366,6 @@ $PMA_SQPdata_column_attrib = array ( 'VARYING', 'ZEROFILL' ); -/** - * $PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib); - * - * @global integer MySQL attributes count - */ -$PMA_SQPdata_column_attrib_cnt = 30; /** * words that are reserved by MySQL and may not be used as identifiers without quotes @@ -679,12 +665,6 @@ $PMA_SQPdata_reserved_word = array ( 'XOR', 'YEAR_MONTH' ); -/** - * $PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); - * - * @global integer MySQL reserved words count - */ -$PMA_SQPdata_reserved_word_cnt = 287; /** * words forbidden to be used as column or table name wihtout quotes @@ -1176,12 +1156,6 @@ $PMA_SQPdata_forbidden_word = array ( 'YEAR_MONTH', 'ZEROFILL' ); -/** - * count($PMA_SQPdata_forbidden_word); - * - * @global integer MySQL forbidden words count - */ -$PMA_SQPdata_forbidden_word_cnt = 482; /** * the MySQL column/data types @@ -1247,11 +1221,5 @@ $PMA_SQPdata_column_type = array ( 'VARCHAR', 'YEAR' ); -/** - * $PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type); - * - * @global integer MySQL column types count - */ -$PMA_SQPdata_column_type_cnt = 54; ?> diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 5000f4c..171a4a3 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -48,9 +48,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } if (! isset($mysql_charsets)) { $mysql_charsets = array(); - $mysql_charsets_count = 0; $mysql_collations_flat = array(); - $mysql_collations_count = 0; } if (!defined('DEBUG_TIMING')) { @@ -193,23 +191,16 @@ if (! defined('PMA_MINIMUM_COMMON')) { * @global array MySQL reserved words * @global array MySQL column types * @global array MySQL function names - * @global integer MySQL column attributes count - * @global integer MySQL reserved words count - * @global integer MySQL column types count - * @global integer MySQL function names count * @global array List of available character sets * @global array List of available collations - * @global integer Character sets count - * @global integer Collations count * * @access public */ function PMA_SQP_parse($sql) { - global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type, $PMA_SQPdata_function_name, - $PMA_SQPdata_column_attrib_cnt, $PMA_SQPdata_reserved_word_cnt, $PMA_SQPdata_column_type_cnt, $PMA_SQPdata_function_name_cnt; - global $mysql_charsets, $mysql_collations_flat, $mysql_charsets_count, $mysql_collations_count; - global $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt; + global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type; + global $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word; + global $mysql_charsets, $mysql_collations_flat; // Convert all line feeds to Unix style $sql = str_replace("\r\n", "\n", $sql); @@ -220,6 +211,15 @@ if (! defined('PMA_MINIMUM_COMMON')) { return array(); } + // Get counts of some arrays + $PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib); + $PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name); + $PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); + $PMA_SQPdata_forbidden_word_cnt = count($PMA_SQPdata_forbidden_word); + $PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type); + $mysql_charsets_count = count($mysql_charsets); + $mysql_collations_count = count($mysql_collations_flat); + $sql_array = array(); $sql_array['raw'] = $sql; $count1 = 0; diff --git a/server_collations.php b/server_collations.php index 0adc4d3..44d5157 100644 --- a/server_collations.php +++ b/server_collations.php @@ -55,7 +55,7 @@ echo '<div id="div_mysql_charset_collations">' . "\n" . '</tr>' . "\n"; $i = 0; -$table_row_count = count($mysql_charsets) + $mysql_collations_count; +$table_row_count = count($mysql_charsets) + count($mysql_collations); foreach ($mysql_charsets as $current_charset) { if ($i >= $table_row_count / 2) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2981-g47528c2
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, master has been updated via 47528c2048d2f8cccb0fbe7477a87960211edcc9 (commit) via 4294f8ea418c034706c7d028267e9b1517815fa5 (commit) from 1e0cff6161ba0fe675c47e94617b492fa155d089 (commit) - Log ----------------------------------------------------------------- commit 47528c2048d2f8cccb0fbe7477a87960211edcc9 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 5 07:02:19 2011 -0400 Document DisableMultiTableMaintenance commit 4294f8ea418c034706c7d028267e9b1517815fa5 Author: Gábor Kövesdán <gaborkovesdan(a)users.sourceforge.net> Date: Sun Jun 5 06:53:34 2011 -0400 patch #3271804 New DisableMultiTableMaintenance directive ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 9 +++++++++ db_structure.php | 2 +- libraries/config.default.php | 7 +++++++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54e05d3..014bc49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ + AJAX for Create table in navigation panel + rfe #3310562 Wording about Column + AJAX for Add a user in Database privileges ++ Patch #3271804 for rfe #3177495, new DisableMultiTableMaintenance directive 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/Documentation.html b/Documentation.html index ed6a5ca..6e98747 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1845,6 +1845,15 @@ $cfg['TrustedProxies'] = Default is <code>1000</code>. </dd> + <dt + id="cfg_DisableMultiTableMaintenance">$cfg['DisableMultiTableMaintenance'] boolean</dt> + <dd> + In the database Structure page, it's possible to mark some tables then + choose an operation like optimizing for many tables. This can slow down + a server; therefore, setting this to <code>true</code> prevents this kind + of multiple maintenance operation. Default is <code>false</code>. + </dd> + <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt> <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>. </dd> diff --git a/db_structure.php b/db_structure.php index ebc6915..6d301d5 100644 --- a/db_structure.php +++ b/db_structure.php @@ -504,7 +504,7 @@ echo ' <option value="export" >' echo ' <option value="print" >' . __('Print view') . '</option>' . "\n"; -if (!$db_is_information_schema) { +if (!$db_is_information_schema && !$cfg['DisableMultiTableMaintenance']) { echo ' <option value="empty_tbl" >' . __('Empty') . '</option>' . "\n"; echo ' <option value="drop_tbl" >' diff --git a/libraries/config.default.php b/libraries/config.default.php index c804dcc..ad1d9ac 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2621,6 +2621,13 @@ $cfg['CheckConfigurationPermissions'] = true; */ $cfg['LinkLengthLimit'] = 2000; +/** + * Disable the table maintenance mass operations, like optimizing or + * repairing the selected tables of a database. An accidental execution + * of such a maintenance task can enormously slow down a bigger database. + */ +$cfg['DisableMultiTableMaintenance'] = false; + /******************************************************************************* * SQL Parser Settings * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2979-g1e0cff6
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, master has been updated via 1e0cff6161ba0fe675c47e94617b492fa155d089 (commit) via 7996a365756f08c2175d996e1fa9efd3829c4b96 (commit) from 82823d67feed46f061cab99c611b9561c174517f (commit) - Log ----------------------------------------------------------------- commit 1e0cff6161ba0fe675c47e94617b492fa155d089 Merge: 82823d67feed46f061cab99c611b9561c174517f 7996a365756f08c2175d996e1fa9efd3829c4b96 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 5 06:30:23 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e054e1..54e05d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows +- patch #3311539 [edit] Inline edit does not escape backslashes 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 8a76e68..a165e4a 100644 --- a/js/sql.js +++ b/js/sql.js @@ -944,6 +944,8 @@ $(document).ready(function() { //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); + //Fix non-escaped backslashes + sql_query = sql_query.replace(/\\/g, '\\\\'); new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-10-g7996a36
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, QA_3_4 has been updated via 7996a365756f08c2175d996e1fa9efd3829c4b96 (commit) from 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b27d7db..3bc2610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows +- patch #3311539 [edit] Inline edit does not escape backslashes 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 739e5d1..73a2b78 100644 --- a/js/sql.js +++ b/js/sql.js @@ -944,6 +944,8 @@ $(document).ready(function() { //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); + //Fix non-escaped backslashes + sql_query = sql_query.replace(/\\/g, '\\\\'); new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2977-g82823d6
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, master has been updated via 82823d67feed46f061cab99c611b9561c174517f (commit) via 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e (commit) from a7a20980067c9c9dc436e59129cb420d0badafa3 (commit) - Log ----------------------------------------------------------------- commit 82823d67feed46f061cab99c611b9561c174517f Merge: a7a20980067c9c9dc436e59129cb420d0badafa3 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 5 06:14:33 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index cff530b..5e054e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word +- bug #3307616 [edit] Inline edit updates multiple duplicate rows 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 31afe84..8a76e68 100644 --- a/js/sql.js +++ b/js/sql.js @@ -947,6 +947,9 @@ $(document).ready(function() { new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); + // Avoid updating more than one row in case there is no primary key + // (happened only for duplicate rows) + sql_query += ' LIMIT 1'; /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-9-g86d3b7e
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, QA_3_4 has been updated via 86d3b7e58c7e87b3ee1fb9cc0fcb08dd2e73d24e (commit) from 60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8226ad5..b27d7db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word +- bug #3307616 [edit] Inline edit updates multiple duplicate rows 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 8a3e25f..739e5d1 100644 --- a/js/sql.js +++ b/js/sql.js @@ -947,6 +947,9 @@ $(document).ready(function() { new_clause = new_clause.substring(0, new_clause.length-5); new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); + // Avoid updating more than one row in case there is no primary key + // (happened only for duplicate rows) + sql_query += ' LIMIT 1'; /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2975-ga7a2098
by Marc Delisle 05 Jun '11

05 Jun '11

The branch, master has been updated via a7a20980067c9c9dc436e59129cb420d0badafa3 (commit) via b9c0f5b01a9f60a2dd5c307e8810f3d478313a75 (commit) via ba71acb32eae8d2d018d8cd45a2d8878fe393634 (commit) via 48f5745492cf92130ffb6d54263ae57d7c2393fb (commit) via 67b67faa71da9ada447e29aed7e1735af85ffcf4 (commit) via 65c8851e032dab93b62a9f37a3bb7bec4f6d0b4c (commit) via dc951157008e6407e9e6b35bb9df0a0822deaa2e (commit) via 344f7a57d389679e9abac713f33eb7e44ab11604 (commit) via 14b5515d3a686fcb88ba44c95494c92ce388f825 (commit) via b1c12a0b7446f9a7293aa0a02d09382812742e07 (commit) from 8d07c5bd77f86e65843248d31ccfa7d4d28a6586 (commit) - Log ----------------------------------------------------------------- commit a7a20980067c9c9dc436e59129cb420d0badafa3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jun 5 05:40:55 2011 -0400 - ChangeLog entry for "AJAX for Add a user in Database privileges - Fix whitespace inside function calls commit b9c0f5b01a9f60a2dd5c307e8810f3d478313a75 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jun 5 07:57:52 2011 +0530 Modified the indentation of the sever privileges js commit ba71acb32eae8d2d018d8cd45a2d8878fe393634 Merge: 48f5745492cf92130ffb6d54263ae57d7c2393fb 8d07c5bd77f86e65843248d31ccfa7d4d28a6586 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 4 23:14:58 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 48f5745492cf92130ffb6d54263ae57d7c2393fb Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 4 23:13:39 2011 +0530 Fixed the bug at add user in db ckeck privileges commit 67b67faa71da9ada447e29aed7e1735af85ffcf4 Merge: 65c8851e032dab93b62a9f37a3bb7bec4f6d0b4c c16138f9fd9b7c88ee412c0ef43419ef100ad0d8 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jun 3 22:50:39 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 65c8851e032dab93b62a9f37a3bb7bec4f6d0b4c Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jun 3 22:48:18 2011 +0530 Bug fixed on header warning commit dc951157008e6407e9e6b35bb9df0a0822deaa2e Merge: 344f7a57d389679e9abac713f33eb7e44ab11604 0dbc9f4a3c7fa46baed1477f001e37dad14fc908 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed Jun 1 21:42:37 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 344f7a57d389679e9abac713f33eb7e44ab11604 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed Jun 1 21:41:36 2011 +0530 Message undifined bug fixed in add new user to server privileges commit 14b5515d3a686fcb88ba44c95494c92ce388f825 Merge: b1c12a0b7446f9a7293aa0a02d09382812742e07 575f265293ffe0625da6a8fc0877a84d595d5322 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue May 31 23:16:28 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit b1c12a0b7446f9a7293aa0a02d09382812742e07 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue May 31 23:15:24 2011 +0530 Added Ajax behaviour to Add a new user in database privileges ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/messages.php | 3 ++ js/server_privileges.js | 88 +++++++++++++++++++++++++++++++++------------- server_privileges.php | 51 +++++++++++++++------------ 4 files changed, 96 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86756d5..cff530b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ + rfe #3078542 Remember the last sort order for each table + AJAX for Create table in navigation panel + rfe #3310562 Wording about Column ++ AJAX for Add a user in Database privileges 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/messages.php b/js/messages.php index a710260..03c92fe 100644 --- a/js/messages.php +++ b/js/messages.php @@ -79,6 +79,9 @@ $js_messages['strCreateTable'] = __('Create Table'); $js_messages['strYes'] = __('Yes'); $js_messages['strNo'] = __('No'); +/* For db_stucture.js */ +$js_messages['strInsertTable'] = __('Insert Table'); + /* For db_search.js */ $js_messages['strSearching'] = __('Searching'); $js_messages['strHideSearchResults'] = __('Hide search results'); diff --git a/js/server_privileges.js b/js/server_privileges.js index 314663f..0706405 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -154,7 +154,7 @@ $(document).ready(function() { * * @see PMA_ajaxShowMessage() * @see appendNewUser() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name add_user_click * @@ -176,14 +176,14 @@ $(document).ready(function() { */ var $form = $(this).find("form[name=usersForm]").last(); - if( ! checkAddUser($form.get(0)) ) { + if (! checkAddUser($form.get(0))) { PMA_ajaxShowMessage(PMA_messages['strFormEmpty']); return false; } //We also need to post the value of the submit button in order to get this to work correctly $.post($form.attr('action'), $form.serialize() + "&adduser_submit=" + $(this).find("input[name=adduser_submit]").attr('value'), function(data) { - if(data.success == true) { + if (data.success == true) { $("#add_user_dialog").dialog("close").remove(); PMA_ajaxShowMessage(data.message); $("#topmenucontainer") @@ -191,20 +191,58 @@ $(document).ready(function() { .remove() .end() .after(data.sql_query); - - //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var $notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($notice_class.text() == '') { - $notice_class.remove(); - } - appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() + var $notice_class = $("#topmenucontainer").next("div").find('.notice'); + if ($notice_class.text() == '') { + $notice_class.remove(); + } + if ($('#fieldset_add_user a.ajax').attr('name') == 'db_specific') { + + /*process the fieldset_add_user attribute and get the val of privileges*/ + var url = $('#fieldset_add_user a.ajax').attr('val'); + + if (url.substring(url.length - 23, url.length) == "&goto=db_operations.php") { + url = url.substring(0, url.length - 23); + } + url = url + "&ajax_request=true&db_specific=true"; + + /* post request for get the updated userForm table */ + $.post($form.attr('action' ), url, function(priv_data) { + + /*Remove the old userForm table*/ + if ($('#userFormDiv').length != 0) { + $('#userFormDiv').remove(); + } else { + $("#usersForm").remove(); + } + var user_div = $('<div id="userFormDiv"></div>'); + /*If the JSON string parsed correctly*/ + if (typeof priv_data.success != 'undefined') { + if (priv_data.success == true) { + user_div + .html(priv_data.user_form) + .insertAfter('#result_query'); + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, "7000"); + } + } else { + /*parse the JSON string*/ + var obj = $.parseJSON(priv_data); + user_div + .html(obj.user_form) + .insertAfter('#result_query'); + } + }); + } else { + appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string); + } } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000"); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, "7000"); } }) }; - button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} + button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); } $.get($(this).attr("href"), {'ajax_request':true}, function(data) { $('<div id="add_user_dialog"></div>') @@ -224,7 +262,7 @@ $(document).ready(function() { buttons: button_options }); //dialog options end displayPasswordGenerateButton(); - PMA_ajaxRemoveMessage($msgbox); + PMA_ajaxRemoveMessage($msgbox); }); // end $.get() });//end of Add New User AJAX event handler @@ -234,7 +272,7 @@ $(document).ready(function() { * Ajax event handler for 'Reload Privileges' anchor * * @see PMA_ajaxShowMessage() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name reload_privileges_click */ @@ -258,7 +296,7 @@ $(document).ready(function() { * AJAX handler for 'Revoke User' * * @see PMA_ajaxShowMessage() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name revoke_user_click */ @@ -268,7 +306,7 @@ $(document).ready(function() { PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']); $form = $("#usersForm"); - + $.post($form.attr('action'), $form.serialize() + "&delete=" + $(this).attr('value') + "&ajax_request=true", function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); @@ -309,7 +347,7 @@ $(document).ready(function() { * Step 1: Load Edit User Dialog * @memberOf jQuery * @name edit_user_click - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] */ $(".edit_user_anchor.ajax").live('click', function(event) { /** @lends jQuery */ @@ -334,15 +372,15 @@ $(document).ready(function() { buttons: button_options }); //dialog options end displayPasswordGenerateButton(); - PMA_ajaxRemoveMessage($msgbox); + PMA_ajaxRemoveMessage($msgbox); }) // end $.get() }) /** * Step 2: Submit the Edit User Dialog - * + * * @see PMA_ajaxShowMessage() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name edit_user_submit */ @@ -368,7 +406,7 @@ $(document).ready(function() { if(data.success == true) { PMA_ajaxShowMessage(data.message); - + //Close the jQueryUI dialog $("#edit_user_dialog").dialog("close").remove(); @@ -422,7 +460,7 @@ $(document).ready(function() { * AJAX handler for 'Export Privileges' * * @see PMA_ajaxShowMessage() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @memberOf jQuery * @name export_user_click */ @@ -445,7 +483,7 @@ $(document).ready(function() { width : 500, buttons: button_options }); - PMA_ajaxRemoveMessage($msgbox); + PMA_ajaxRemoveMessage($msgbox); }) //end $.get }) //end export privileges @@ -453,7 +491,7 @@ $(document).ready(function() { * AJAX handler to Paginate the Users Table * * @see PMA_ajaxShowMessage() - * @see $cfg['AjaxEnable'] + * @see $cfg['AjaxEnable'] * @name paginate_users_table_click * @memberOf jQuery */ @@ -476,7 +514,7 @@ $(document).ready(function() { })// end of the paginate users table /* - * Additional confirmation dialog after clicking + * Additional confirmation dialog after clicking * 'Drop the databases...' */ $('#checkbox_drop_users_db').click(function() { diff --git a/server_privileges.php b/server_privileges.php index 2cc6bdc..13ee074 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1358,7 +1358,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog'])) { +if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); @@ -2140,7 +2140,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '</form>' . "\n"; } else { // check the privileges for a particular database. - echo '<form id="usersForm"><table id="dbspecificuserrights" class="data">' . "\n" + $user_form = '<form id="usersForm"><table id="dbspecificuserrights" class="data">' . "\n" . '<caption class="tblHeaders">' . "\n" . PMA_getIcon('b_usrcheck.png') . ' ' . sprintf(__('Users having access to "%s"'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n" @@ -2235,29 +2235,29 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $current_privileges[] = $row; $row = PMA_DBI_fetch_assoc($res); } - echo ' <tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n" + $user_form .= ' <tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td'; if (count($current_privileges) > 1) { - echo ' rowspan="' . count($current_privileges) . '"'; + $user_form .= ' rowspan="' . count($current_privileges) . '"'; } - echo '>' . (empty($current_user) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($current_user)) . "\n" + $user_form .= '>' . (empty($current_user) ? '<span style="color: #FF0000">' . __('Any') . '</span>' : htmlspecialchars($current_user)) . "\n" . ' </td>' . "\n" . ' <td'; if (count($current_privileges) > 1) { - echo ' rowspan="' . count($current_privileges) . '"'; + $user_form .= ' rowspan="' . count($current_privileges) . '"'; } - echo '>' . htmlspecialchars($current_host) . '</td>' . "\n"; + $user_form .= '>' . htmlspecialchars($current_host) . '</td>' . "\n"; foreach ($current_privileges as $current) { - echo ' <td>' . "\n" + $user_form .= ' <td>' . "\n" . ' '; if (! isset($current['Db']) || $current['Db'] == '*') { - echo __('global'); + $user_form .= __('global'); } elseif ($current['Db'] == PMA_escape_mysql_wildcards($checkprivs)) { - echo __('database-specific'); + $user_form .= __('database-specific'); } else { - echo __('wildcard'), ': <tt>' . htmlspecialchars($current['Db']) . '</tt>'; + $user_form .= __('wildcard'). ': <tt>' . htmlspecialchars($current['Db']) . '</tt>'; } - echo "\n" + $user_form .= "\n" . ' </td>' . "\n" . ' <td>' . "\n" . ' <tt>' . "\n" @@ -2268,11 +2268,11 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n" . ' </td>' . "\n" . ' <td>' . "\n"; - printf($link_edit, urlencode($current_user), + $user_form .= sprintf($link_edit, urlencode($current_user), urlencode($current_host), urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']), ''); - echo '</td>' . "\n" + $user_form .= '</td>' . "\n" . ' </tr>' . "\n"; } if (empty($row) && empty($row1) && empty($row2)) { @@ -2281,21 +2281,28 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $odd_row = ! $odd_row; } } else { - echo ' <tr class="odd">' . "\n" + $user_form .= ' <tr class="odd">' . "\n" . ' <td colspan="6">' . "\n" . ' ' . __('No user found.') . "\n" . ' </td>' . "\n" . ' </tr>' . "\n"; } - echo '</tbody>' . "\n" + $user_form .= '</tbody>' . "\n" . '</table></form>' . "\n"; - // Offer to create a new user for the current database - echo '<fieldset id="fieldset_add_user">' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'">' . "\n" - . PMA_getIcon('b_usradd.png') - . ' ' . __('Add a new User') . '</a>' . "\n" - . '</fieldset>' . "\n"; + if($GLOBALS['is_ajax_request'] == true){ + $extra_data['user_form'] = $user_form; + $message = PMA_Message::success(__('New user has been added.')); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + }else{ + // Offer to create a new user for the current database + $user_form .= '<fieldset id="fieldset_add_user">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" + . PMA_getIcon('b_usradd.png') + . ' ' . __('Add a new User') . '</a>' . "\n" + . '</fieldset>' . "\n"; + echo $user_form ; + } } // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ... hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2965-g8d07c5b
by Marc Delisle 04 Jun '11

04 Jun '11

The branch, master has been updated via 8d07c5bd77f86e65843248d31ccfa7d4d28a6586 (commit) via 60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit) from 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba (commit) - Log ----------------------------------------------------------------- commit 8d07c5bd77f86e65843248d31ccfa7d4d28a6586 Merge: 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba 60089624dd6fdf1e31a05c551e4c78c21d06fb9d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jun 4 06:39:24 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/sqlparser.data.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index be1d37d..86756d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong +- bug #3304544 [parser] master is not a reserved word 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index e8a3115..c7dacc6 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -527,7 +527,6 @@ $PMA_SQPdata_reserved_word = array ( 'LOGS', 'LOW_PRIORITY', 'MARIA', // 5.1 ? - 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE', @@ -685,7 +684,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 288; +$PMA_SQPdata_reserved_word_cnt = 287; /** * words forbidden to be used as column or table name wihtout quotes hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-8-g6008962
by Marc Delisle 04 Jun '11

04 Jun '11

The branch, QA_3_4 has been updated via 60089624dd6fdf1e31a05c551e4c78c21d06fb9d (commit) from 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/sqlparser.data.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fb8151..8226ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong +- bug #3304544 [parser] master is not a reserved word 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index e8a3115..c7dacc6 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -527,7 +527,6 @@ $PMA_SQPdata_reserved_word = array ( 'LOGS', 'LOW_PRIORITY', 'MARIA', // 5.1 ? - 'MASTER', 'MASTER_CONNECT_RETRY', 'MASTER_HOST', 'MASTER_LOG_FILE', @@ -685,7 +684,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 288; +$PMA_SQPdata_reserved_word_cnt = 287; /** * words forbidden to be used as column or table name wihtout quotes hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2963-g8ae25cd
by Marc Delisle 04 Jun '11

04 Jun '11

The branch, master has been updated via 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba (commit) via 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d (commit) from 75091e52fde4633f990a60a5f70ffa58aeb623da (commit) - Log ----------------------------------------------------------------- commit 8ae25cd89a1f0836c5ad5c4e642ee8ecc9dc06ba Merge: 75091e52fde4633f990a60a5f70ffa58aeb623da 2bdfe069826caf9d4f5c82cfbb2a71b6990b976d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jun 4 05:59:55 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/config/messages.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6cea74..be1d37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize +- patch #3304473 [setup] Redefine a lable that was wrong 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index e76b52e..1b8cbf3 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -117,7 +117,7 @@ $strConfigExport_remember_file_template_name = __('Remember file name template') $strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value'); $strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes'); $strConfigExport_sql_compatibility_name = __('SQL compatibility mode'); -$strConfigExport_sql_create_table_statements_name = __('Syntax to use when inserting data'); +$strConfigExport_sql_create_table_statements_name = __('<code>CREATE TABLE</code> options:'); $strConfigExport_sql_dates_name = __('Creation/Update/Check dates'); $strConfigExport_sql_delayed_name = __('Use delayed inserts'); $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks'); hooks/post-receive -- phpMyAdmin

1 0