Git September 2011

git@phpmyadmin.net

7 participants
167 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-32-gacbbd8f

by Marc Delisle

The branch, QA_3_4 has been updated via acbbd8fc56f45cdb648e52c3389e4cccf925f400 (commit) from 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/schema/User_Schema.class.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec2549f..1746f5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change - bug #3390832 [display] Delete records from last page breaks search +- bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 17c2d39..310ffec 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -66,7 +66,7 @@ class PMA_User_Schema $this->_editCoordinates($db, $cfgRelation,$query_default_option); break; case 'delete_old_references': - $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); + $this->_deleteTableRows($_POST['delrow'], $cfgRelation, $db, $_POST['chpage']); break; case 'process_export': $this->_processExportSchema(); @@ -318,7 +318,7 @@ class PMA_User_Schema echo "\n" . '</form>' . "\n\n"; } // end if - $this->_deleteTables($db, $this->chosenPage, isset($tabExist)); + $this->_deleteTables($db, $this->chosenPage, $tabExist); } /** @@ -438,7 +438,7 @@ class PMA_User_Schema } if ($shoot) { echo '<form action="schema_edit.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs($db, $table) + . PMA_generate_common_hidden_inputs($db) . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' . htmlspecialchars($chpage) . '" />' . "\n" . __('The current page has references to tables that no longer exist. Would you like to delete those references?') hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20504-g8672278

by Marc Delisle

The branch, master has been updated via 86722781ebeb5f740c778ec22c72015d9d63a414 (commit) from 0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c (commit) - Log ----------------------------------------------------------------- commit 86722781ebeb5f740c778ec22c72015d9d63a414 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 06:19:03 2011 -0400 A table has been dropped from outside phpMyAdmin ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index ae0a629..29b1bf3 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -526,8 +526,12 @@ class PMA_User_Schema echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); - foreach ($fields as $row) { - echo '<br />' . htmlspecialchars($row['Field']) . "\n"; + // if the table has been dropped from outside phpMyAdmin, + // we can no longer obtain its columns list + if ($fields) { + foreach ($fields as $row) { + echo '<br />' . htmlspecialchars($row['Field']) . "\n"; + } } } echo '</div>' . "\n"; hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-31-g789ed0d

by Marc Delisle

The branch, QA_3_4 has been updated via 789ed0d3d122f2165365cb5285b52c9885e6bffe (commit) from 37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit) - Log ----------------------------------------------------------------- commit 789ed0d3d122f2165365cb5285b52c9885e6bffe Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Sep 29 06:08:30 2011 -0400 A table has been dropped from outside phpMyAdmin ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index cb42dde..17c2d39 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -491,10 +491,12 @@ class PMA_User_Schema $local_query = 'SHOW FIELDS FROM ' . PMA_backquote($temp_sh_page['table_name']) . ' FROM ' . PMA_backquote($db); - $fields_rs = PMA_DBI_query($local_query); + $fields_rs = PMA_DBI_try_query($local_query); unset($local_query); - $fields_cnt = PMA_DBI_num_rows($fields_rs); - + // the table has been dropped from outside phpMyAdmin + if (PMA_DBI_getError()) { + continue; + } echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { while ($row = PMA_DBI_fetch_assoc($fields_rs)) { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20503-g0ad7567

by Madhura Jayaratne

The branch, master has been updated via 0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c (commit) via 37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit) from 192b534b95db07714dd392a4e0fd9759fdad8920 (commit) - Log ----------------------------------------------------------------- commit 0ad7567d3f89e1e2481de5a588bfd0d93e8c5f1c Merge: 192b534 37dff12 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 28 18:20:07 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + sql.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04ce19b..bc7d5b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog - bug #3413743 [interface] Display options link missing after search - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change +- bug #3390832 [display] Delete records from last page breaks search 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/sql.php b/sql.php index dc3d1a1..e941b7c 100644 --- a/sql.php +++ b/sql.php @@ -677,7 +677,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { } // end else "didn't ask to see php code" // No rows returned -> move back to the calling page -if (0 == $num_rows || $is_affected) { +if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { if ($is_delete) { $message = PMA_Message::deleted_rows($num_rows); } elseif ($is_insert) { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-30-g37dff12

by Madhura Jayaratne

The branch, QA_3_4 has been updated via 37dff129010b54c90156f55e8e61ef4e7ac850d1 (commit) from 2e101cc7336f2a448dd1682a49f8b343386f8c07 (commit) - Log ----------------------------------------------------------------- commit 37dff129010b54c90156f55e8e61ef4e7ac850d1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 28 10:14:24 2011 +0530 bug #3390832 [display] Delete records from last page breaks search ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + sql.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a45a6ca..ec2549f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug #3413743 [interface] Display options link missing after search - bug #3324161 [core] CSP policy causing designer JS buttons to fail - bug #3412862 [relation] Relations/constraints are dropped/created on every change +- bug #3390832 [display] Delete records from last page breaks search 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/sql.php b/sql.php index 83900ab..6caeb7b 100644 --- a/sql.php +++ b/sql.php @@ -580,7 +580,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } // end else "didn't ask to see php code" // No rows returned -> move back to the calling page -if (0 == $num_rows || $is_affected) { +if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { if ($is_delete) { $message = PMA_Message::deleted_rows($num_rows); } elseif ($is_insert) { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20501-g192b534

by Madhura Jayaratne

The branch, master has been updated via 192b534b95db07714dd392a4e0fd9759fdad8920 (commit) via 09d48a6554a4c5db6f08e53fffba9b9a19ad51c3 (commit) from 0ad1a0f831c8fb9c8f68dd8be29d845ee54b7d65 (commit) - Log ----------------------------------------------------------------- commit 192b534b95db07714dd392a4e0fd9759fdad8920 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 28 15:30:13 2011 +0530 bug #3356456 [interface] Interface problems for queries having LIMIT clauses commit 09d48a6554a4c5db6f08e53fffba9b9a19ad51c3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 28 13:32:14 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 15 +++++ libraries/display_tbl.lib.php | 25 ++++++-- sql.php | 125 ++++++++++++++++++++++++----------------- 4 files changed, 108 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 576bd5c..04ce19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog + [import] Import GIS data from ESRI Shapefiles + [interface] 'Function based search' for GIS data + Support Drizzle database +- bug #3356456 [interface] Interface problems for queries having LIMIT clauses 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 1236667..2aabf6f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3709,4 +3709,19 @@ function PMA_getServerType() return $server_type; } +/** + * Analyzes the limit clause and return the start and length attributes of it. + * + * @param string $limit_clause limit clause + * + * @return array Start and length attributes of the limit clause + */ +function PMA_analyzeLimitClause($limit_clause) +{ + $start_and_length = explode(',', str_ireplace('LIMIT', '', $limit_clause)); + return array( + 'start' => trim($start_and_length[0]), + 'length' => trim($start_and_length[1]) + ); +} ?> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 75ddc56..d088698 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2321,9 +2321,22 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } else { $selectstring = ''; } - $last_shown_rec = ($_SESSION['tmp_user_values']['max_rows'] == 'all' || $pos_next > $total) - ? $total - 1 - : $pos_next - 1; + + if (! empty($analyzed_sql[0]['limit_clause'])) { + $limit_data = PMA_analyzeLimitClause($analyzed_sql[0]['limit_clause']); + $first_shown_rec = $limit_data['start']; + if ($limit_data['length'] < $total) { + $last_shown_rec = $limit_data['start'] + $limit_data['length'] - 1; + } else { + $last_shown_rec = $limit_data['start'] + $total - 1; + } + } elseif ($_SESSION['tmp_user_values']['max_rows'] == 'all' || $pos_next > $total) { + $first_shown_rec = $_SESSION['tmp_user_values']['pos']; + $last_shown_rec = $total - 1; + } else { + $first_shown_rec = $_SESSION['tmp_user_values']['pos']; + $last_shown_rec = $pos_next - 1; + } if (PMA_Table::isView($db, $table) && $total == $GLOBALS['cfg']['MaxExactCountViews'] @@ -2337,7 +2350,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } $message = PMA_Message::success(__('Showing rows')); - $message->addMessage($_SESSION['tmp_user_values']['pos']); + $message->addMessage($first_shown_rec); if ($message_view_warning) { $message->addMessage('...', ' - '); $message->addMessage($message_view_warning); @@ -2382,7 +2395,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } } - if ($is_display['nav_bar'] == '1') { + if ($is_display['nav_bar'] == '1' && empty($analyzed_sql[0]['limit_clause'])) { PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown'); echo "\n"; } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { @@ -2509,7 +2522,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) // 5. ----- Displays the navigation bar at the bottom if required ----- - if ($is_display['nav_bar'] == '1') { + if ($is_display['nav_bar'] == '1' && empty($analyzed_sql[0]['limit_clause'])) { echo '<br />' . "\n"; PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown'); } elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { diff --git a/sql.php b/sql.php index 42a9ac1..dc3d1a1 100644 --- a/sql.php +++ b/sql.php @@ -47,7 +47,7 @@ if (! empty($goto)) { } // end if if (! isset($err_url)) { - $err_url = (!empty($back) ? $back : $goto) + $err_url = (! empty($back) ? $back : $goto) . '?' . PMA_generate_common_url($db) . ((strpos(' ' . $goto, 'db_') != 1 && strlen($table)) ? '&table=' . urlencode($table) : ''); } // end if @@ -81,8 +81,11 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value $foreignData = PMA_getForeignData($foreigners, $column, false, '', ''); if ($_SESSION['tmp_user_values']['relational_display'] == 'D' - && (isset($display_field) && strlen($display_field) - && (isset($_REQUEST['relation_key_or_display_column']) && $_REQUEST['relation_key_or_display_column']))) { + && isset($display_field) + && strlen($display_field) + && isset($_REQUEST['relation_key_or_display_column']) + && $_REQUEST['relation_key_or_display_column'] + ) { $curr_value = $_REQUEST['relation_key_or_display_column']; } else { $curr_value = $_REQUEST['curr_value']; @@ -181,7 +184,6 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { } } - // set column visibility if ($retval === true && isset($_REQUEST['col_visib'])) { $col_visib = explode(',', $_REQUEST['col_visib']); @@ -198,8 +200,13 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) { // (needed for browsing from DefaultTabTable) if (empty($sql_query) && strlen($table) && strlen($db)) { include_once './libraries/bookmark.lib.php'; - $book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddSlashes($table) . '\'', - 'label', false, true); + $book_sql_query = PMA_Bookmark_get( + $db, + '\'' . PMA_sqlAddSlashes($table) . '\'', + 'label', + false, + true + ); if (! empty($book_sql_query)) { $GLOBALS['using_bookmark_message'] = PMA_message::notice(__('Using bookmark "%s" as default browse query.')); @@ -219,8 +226,10 @@ if (empty($sql_query) && strlen($table) && strlen($db)) { } // instead of doing the test twice -$is_drop_database = preg_match('/DROP[[:space:]]+(DATABASE|SCHEMA)[[:space:]]+/i', - $sql_query); +$is_drop_database = preg_match( + '/DROP[[:space:]]+(DATABASE|SCHEMA)[[:space:]]+/i', + $sql_query +); /** * Check rights in case of DROP DATABASE @@ -229,10 +238,11 @@ $is_drop_database = preg_match('/DROP[[:space:]]+(DATABASE|SCHEMA)[[:space:]]+/i * but since a malicious user may pass this variable by url/form, we don't take * into account this case. */ -if (!defined('PMA_CHK_DROP') - && !$cfg['AllowUserDropDatabase'] - && $is_drop_database - && !$is_superuser) { +if (! defined('PMA_CHK_DROP') + && ! $cfg['AllowUserDropDatabase'] + && $is_drop_database + && ! $is_superuser +) { include_once './libraries/header.inc.php'; PMA_mysqlDie(__('"DROP DATABASE" statements are disabled.'), '', '', $err_url); } // end if @@ -278,7 +288,7 @@ if ($goto == 'sql.php') { * Go back to further page if table should not be dropped */ if (isset($btnDrop) && $btnDrop == __('No')) { - if (!empty($back)) { + if (! empty($back)) { $goto = $back; } if ($is_gotofile) { @@ -303,11 +313,14 @@ if (isset($btnDrop) && $btnDrop == __('No')) { * * Also bypassed if only showing php code.or validating a SQL query */ -if (! $cfg['Confirm'] || isset($_REQUEST['is_js_confirmed']) || isset($btnDrop) - // if we are coming from a "Create PHP code" or a "Without PHP Code" - // dialog, we won't execute the query anyway, so don't confirm - || isset($GLOBALS['show_as_php']) - || !empty($GLOBALS['validatequery'])) { +if (! $cfg['Confirm'] + || isset($_REQUEST['is_js_confirmed']) + || isset($btnDrop) + // if we are coming from a "Create PHP code" or a "Without PHP Code" + // dialog, we won't execute the query anyway, so don't confirm + || isset($GLOBALS['show_as_php']) + || ! empty($GLOBALS['validatequery']) +) { $do_confirm = false; } else { $do_confirm = isset($analyzed_sql[0]['queryflags']['need_confirm']); @@ -357,7 +370,8 @@ if ($do_confirm) { */ if (empty($reload) - && preg_match('/^(CREATE|ALTER|DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i', $sql_query)) { + && preg_match('/^(CREATE|ALTER|DROP)\s+(VIEW|TABLE|DATABASE|SCHEMA)\s+/i', $sql_query) +) { $reload = 1; } @@ -375,8 +389,8 @@ if (empty($reload) $is_explain = $is_count = $is_export = $is_delete = $is_insert = $is_affected = $is_show = $is_maint = $is_analyse = $is_group = $is_func = $is_replace = false; if ($is_select) { // see line 141 $is_group = preg_match('@(GROUP[[:space:]]+BY|HAVING|SELECT[[:space:]]+DISTINCT)[[:space:]]+@i', $sql_query); - $is_func = !$is_group && (preg_match('@[[:space:]]+(SUM|AVG|STD|STDDEV|MIN|MAX|BIT_OR|BIT_AND)\s*$@i', $sql_query)); - $is_count = !$is_group && (preg_match('@^SELECT[[:space:]]+COUNT\((.*\.+)?.*$@i', $sql_query)); + $is_func = ! $is_group && (preg_match('@[[:space:]]+(SUM|AVG|STD|STDDEV|MIN|MAX|BIT_OR|BIT_AND)\s*$@i', $sql_query)); + $is_count = ! $is_group && (preg_match('@^SELECT[[:space:]]+COUNT\((.*\.+)?.*$@i', $sql_query)); $is_export = (preg_match('@[[:space:]]+INTO[[:space:]]+OUTFILE[[:space:]]+@i', $sql_query)); $is_analyse = (preg_match('@[[:space:]]+PROCEDURE[[:space:]]+ANALYSE@i', $sql_query)); } elseif (preg_match('@^EXPLAIN[[:space:]]+@i', $sql_query)) { @@ -403,18 +417,19 @@ $full_sql_query = $sql_query; // Handle remembered sorting order, only for single table query if ($GLOBALS['cfg']['RememberSorting'] - && ! ($is_count || $is_export || $is_func || $is_analyse) - && count($analyzed_sql[0]['select_expr']) == 0 - && isset($analyzed_sql[0]['queryflags']['select_from']) - && count($analyzed_sql[0]['table_ref']) == 1 - ) { + && ! ($is_count || $is_export || $is_func || $is_analyse) + && count($analyzed_sql[0]['select_expr']) == 0 + && isset($analyzed_sql[0]['queryflags']['select_from']) + && count($analyzed_sql[0]['table_ref']) == 1 +) { $pmatable = new PMA_Table($table, $db); if (empty($analyzed_sql[0]['order_by_clause'])) { $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN); if ($sorted_col) { // retrieve the remembered sorting order for current table $sql_order_to_append = ' ORDER BY ' . $sorted_col . ' '; - $full_sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_order_to_append . $analyzed_sql[0]['section_after_limit']; + $full_sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_order_to_append + . $analyzed_sql[0]['section_after_limit']; // update the $analyzed_sql $analyzed_sql[0]['section_before_limit'] .= $sql_order_to_append; @@ -428,14 +443,16 @@ if ($GLOBALS['cfg']['RememberSorting'] // Do append a "LIMIT" clause? if ((! $cfg['ShowAll'] || $_SESSION['tmp_user_values']['max_rows'] != 'all') - && ! ($is_count || $is_export || $is_func || $is_analyse) - && isset($analyzed_sql[0]['queryflags']['select_from']) - && ! isset($analyzed_sql[0]['queryflags']['offset']) - && empty($analyzed_sql[0]['limit_clause']) - ) { - $sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos'] . ', ' . $_SESSION['tmp_user_values']['max_rows'] . " "; - - $full_sql_query = $analyzed_sql[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; + && ! ($is_count || $is_export || $is_func || $is_analyse) + && isset($analyzed_sql[0]['queryflags']['select_from']) + && ! isset($analyzed_sql[0]['queryflags']['offset']) + && empty($analyzed_sql[0]['limit_clause']) +) { + $sql_limit_to_append = ' LIMIT ' . $_SESSION['tmp_user_values']['pos'] + . ', ' . $_SESSION['tmp_user_values']['max_rows'] . " "; + + $full_sql_query = $analyzed_sql[0]['section_before_limit'] . "\n" + . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; /** * @todo pretty printing of this modified query */ @@ -444,9 +461,12 @@ if ((! $cfg['ShowAll'] || $_SESSION['tmp_user_values']['max_rows'] != 'all') // a section_after_limit, we now have to analyze $display_query // to display it correctly - if (!empty($analyzed_sql[0]['section_after_limit']) && trim($analyzed_sql[0]['section_after_limit']) != ';') { + if (! empty($analyzed_sql[0]['section_after_limit']) + && trim($analyzed_sql[0]['section_after_limit']) != ';' + ) { $analyzed_display_query = PMA_SQP_analyze(PMA_SQP_parse($display_query)); - $display_query = $analyzed_display_query[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_display_query[0]['section_after_limit']; + $display_query = $analyzed_display_query[0]['section_before_limit'] + . "\n" . $sql_limit_to_append . $analyzed_display_query[0]['section_after_limit']; } } @@ -459,7 +479,7 @@ if (strlen($db)) { // E x e c u t e t h e q u e r y // Only if we didn't ask to see the php code (mikebeck) -if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { +if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) { unset($result); $num_rows = 0; } else { @@ -516,7 +536,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // (This must be done immediately after the query because // mysql_affected_rows() reports about the last query done) - if (!$is_affected) { + if (! $is_affected) { $num_rows = ($result) ? @PMA_DBI_num_rows($result) : 0; } elseif (! isset($num_rows)) { $num_rows = @PMA_DBI_affected_rows(); @@ -544,7 +564,8 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // tmpfile remove after convert encoding appended by Y.Kawada if (function_exists('PMA_kanji_file_conv') - && (isset($textfile) && file_exists($textfile))) { + && (isset($textfile) && file_exists($textfile)) + ) { unlink($textfile); } @@ -568,12 +589,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // However, do not count again if we did it previously // due to $find_real_end == true - if (!$is_group - && ! isset($analyzed_sql[0]['queryflags']['union']) - && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) - && (empty($analyzed_sql[0]['where_clause']) - || $analyzed_sql[0]['where_clause'] == '1 ') - && ! isset($find_real_end) + if (! $is_group + && ! isset($analyzed_sql[0]['queryflags']['union']) + && ! isset($analyzed_sql[0]['table_ref'][1]['table_name']) + && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ') + && ! isset($find_real_end) ) { // "j u s t b r o w s i n g" @@ -592,7 +612,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $count_query = PMA_SQP_formatHtml($parsed_sql, 'query_only', 0, $analyzed_sql[0]['position_of_first_select'] + 1); $count_query .= ' SQL_CALC_FOUND_ROWS '; // add everything that was after the first SELECT - $count_query .= PMA_SQP_formatHtml($parsed_sql, 'query_only', $analyzed_sql[0]['position_of_first_select']+1); + $count_query .= PMA_SQP_formatHtml($parsed_sql, 'query_only', $analyzed_sql[0]['position_of_first_select'] + 1); // ensure there is no semicolon at the end of the // count query because we'll probably add // a LIMIT 1 clause after it @@ -649,7 +669,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } // end if ($purge) // If a column gets dropped, do relation magic. - if (isset($dropped_column) && strlen($db) && strlen($table) && !empty($dropped_column)) { + if (isset($dropped_column) && strlen($db) && strlen($table) && ! empty($dropped_column)) { include_once './libraries/relation_cleanup.lib.php'; PMA_relationsCleanupColumn($db, $table, $dropped_column); @@ -688,14 +708,14 @@ if (0 == $num_rows || $is_affected) { // fact that $message_to_show is sent for every case. // The $message_to_show containing a success message and sent with // the form should not have priority over errors - } elseif (!empty($message_to_show) && !$is_select) { + } elseif (! empty($message_to_show) && ! $is_select) { $message = PMA_Message::rawSuccess(htmlspecialchars($message_to_show)); - } elseif (!empty($GLOBALS['show_as_php'])) { + } elseif (! empty($GLOBALS['show_as_php'])) { $message = PMA_Message::success(__('Showing as PHP code')); } elseif (isset($GLOBALS['show_as_php'])) { /* User disable showing as PHP, query is only displayed */ $message = PMA_Message::notice(__('Showing SQL query')); - } elseif (!empty($GLOBALS['validatequery'])) { + } elseif (! empty($GLOBALS['validatequery'])) { $message = PMA_Message::notice(__('Validated SQL')); } else { $message = PMA_Message::success(__('MySQL returned an empty result set (i.e. zero rows).')); @@ -926,7 +946,8 @@ $(document).ready(makeProfilingChart); // Bookmark support if required if ($disp_mode[7] == '1' && (! empty($cfg['Bookmark']) && empty($id_bookmark)) - && !empty($sql_query)) { + && ! empty($sql_query) + ) { echo "\n"; $goto = 'sql.php?' hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20499-g0ad1a0f

by Madhura Jayaratne

The branch, master has been updated via 0ad1a0f831c8fb9c8f68dd8be29d845ee54b7d65 (commit) via 1101e13a6af0af57108404942e0a2a1c02e3a2bd (commit) from 2aec106b901ff5d799bbd66c4eb29dd66d9db90e (commit) - Log ----------------------------------------------------------------- commit 0ad1a0f831c8fb9c8f68dd8be29d845ee54b7d65 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 27 21:49:41 2011 +0530 Fix doc blocks and multiline if statements commit 1101e13a6af0af57108404942e0a2a1c02e3a2bd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 27 21:19:57 2011 +0530 coding style improvements and fixing some doc blocks ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 206 +++++++++++++++++++++++++++----------------- tbl_relation.php | 27 +++--- 2 files changed, 143 insertions(+), 90 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index b7ea862..5e3d7ca 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -12,8 +12,9 @@ if (! defined('PHPMYADMIN')) { /** * Executes a query as controluser if possible, otherwise as normal user * - * @param string the query to execute - * @param boolean whether to display SQL error messages or not + * @param string $sql the query to execute + * @param boolean $show_error whether to display SQL error messages or not + * @param int $options query options * * @return integer the result set, or false if no result set * @@ -42,7 +43,8 @@ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) } // end of the "PMA_query_as_controluser()" function /** - * @param bool $verbose whether to print diagnostic info + * @param bool $verbose whether to print diagnostic info + * * @return array $cfgRelation */ function PMA_getRelationsParam($verbose = false) @@ -65,7 +67,9 @@ function PMA_getRelationsParam($verbose = false) /** * prints out diagnostic info for pma relation feature * - * @param array $cfgRelation + * @param array $cfgRelation + * + * @return nothing */ function PMA_printRelationsParamDiagnostic($cfgRelation) { @@ -157,10 +161,12 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) /** * prints out one diagnostic message for a feature * - * @param string feature name in a message string - * @param string the $GLOBALS['cfgRelation'] parameter to check - * @param array utility messages - * @param boolean whether to skip a line after the message + * @param string $feature_name feature name in a message string + * @param string $relation_parameter the $GLOBALS['cfgRelation'] parameter to check + * @param array $messages utility messages + * @param boolean $skip_line whether to skip a line after the message + * + * @return nothing */ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $messages, $skip_line=true) { @@ -175,10 +181,12 @@ function PMA_printDiagMessageForFeature($feature_name, $relation_parameter, $mes /** * prints out one diagnostic message for a configuration parameter * - * @param string config parameter name to display - * @param boolean whether this parameter is set - * @param array utility messages - * @param string anchor in Documentation.html + * @param string $parameter config parameter name to display + * @param boolean $relation_parameter_set whether this parameter is set + * @param array $messages utility messages + * @param string $doc_anchor anchor in Documentation.html + * + * @return nothing */ function PMA_printDiagMessageForParameter($parameter, $relation_parameter_set, $messages, $doc_anchor) { @@ -216,7 +224,8 @@ function PMA__getRelationsParam() $cfgRelation['db'] = null; if ($GLOBALS['server'] == 0 || empty($GLOBALS['cfg']['Server']['pmadb']) - || ! PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink'])) { + || ! PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']) + ) { // No server selected -> no bookmark table // we return the array with the falses in it, // to avoid some 'Unitialized string offset' errors later @@ -304,8 +313,9 @@ function PMA__getRelationsParam() PMA_DBI_free_result($mime_rs); if ($mime_field_mimetype - && $mime_field_transformation - && $mime_field_transformation_options) { + && $mime_field_transformation + && $mime_field_transformation_options + ) { $cfgRelation['mimework'] = true; } } else { @@ -344,11 +354,12 @@ function PMA__getRelationsParam() } if ($cfgRelation['relwork'] && $cfgRelation['displaywork'] - && $cfgRelation['pdfwork'] && $cfgRelation['commwork'] - && $cfgRelation['mimework'] && $cfgRelation['historywork'] - && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork'] - && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] - && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork']) { + && $cfgRelation['pdfwork'] && $cfgRelation['commwork'] + && $cfgRelation['mimework'] && $cfgRelation['historywork'] + && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork'] + && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] + && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork'] + ) { $cfgRelation['allworks'] = true; } @@ -359,12 +370,14 @@ function PMA__getRelationsParam() * Gets all Relations to foreign tables for a given table or * optionally a given column in a table * - * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $column the name of the column to check for - * @param string $source the source for foreign key information + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $column the name of the column to check for + * @param string $source the source for foreign key information + * * @return array db,table,column + * + * @access public */ function PMA_getForeigners($db, $table, $column = '', $source = 'both') { @@ -448,7 +461,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') if (isset($GLOBALS[$relations_key][$table])) { foreach ($GLOBALS[$relations_key][$table] as $field => $relations) { if ((! strlen($column) || $column == $field) - && (! isset($foreign[$field]) || ! strlen($foreign[$field]))) { + && (! isset($foreign[$field]) || ! strlen($foreign[$field])) + ) { $foreign[$field] = $relations; } } @@ -461,10 +475,12 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') /** * Gets the display field of a table * - * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * * @return string field name + * + * @access public */ function PMA_getDisplayField($db, $table) { @@ -491,8 +507,10 @@ function PMA_getDisplayField($db, $table) */ if ($db == 'information_schema') { switch ($table) { - case 'CHARACTER_SETS': return 'DESCRIPTION'; - case 'TABLES': return 'TABLE_COMMENT'; + case 'CHARACTER_SETS': + return 'DESCRIPTION'; + case 'TABLES': + return 'TABLE_COMMENT'; } } @@ -506,10 +524,12 @@ function PMA_getDisplayField($db, $table) /** * Gets the comments for all rows of a table or the db itself * - * @access public - * @param string the name of the db to check for - * @param string the name of the table to check for + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * * @return array [field_name] = comment + * + * @access public */ function PMA_getComments($db, $table = '') { @@ -535,9 +555,11 @@ function PMA_getComments($db, $table = '') /** * Gets the comment for a db * - * @access public - * @param string the name of the db to check for + * @param string $db the name of the db to check for + * * @return string comment + * + * @access public */ function PMA_getDbComment($db) { @@ -568,7 +590,7 @@ function PMA_getDbComment($db) * Gets the comment for a db * * @access public - * @param string the name of the db to check for + * * @return string comment */ function PMA_getDbComments() @@ -598,10 +620,12 @@ function PMA_getDbComments() /** * Set a database comment to a certain value. * - * @access public - * @param string $db the name of the db - * @param string $comment the value of the column + * @param string $db the name of the db + * @param string $comment the value of the column + * * @return boolean true, if comment-query was made. + * + * @access public */ function PMA_setDbComment($db, $comment = '') { @@ -642,10 +666,13 @@ function PMA_setDbComment($db, $comment = '') /** * Set a SQL history entry * - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $username the username - * @param string $sqlquery the sql query + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $username the username + * @param string $sqlquery the sql query + * + * @return nothing + * * @access public */ function PMA_setHistory($db, $table, $username, $sqlquery) @@ -681,27 +708,30 @@ function PMA_setHistory($db, $table, $username, $sqlquery) return; } - PMA_query_as_controluser(' - INSERT INTO + PMA_query_as_controluser( + 'INSERT INTO ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . ' (`username`, `db`, `table`, `timevalue`, `sqlquery`) - VALUES + VALUES (\'' . PMA_sqlAddSlashes($username) . '\', \'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($table) . '\', NOW(), - \'' . PMA_sqlAddSlashes($sqlquery) . '\')'); + \'' . PMA_sqlAddSlashes($sqlquery) . '\')' + ); } // end of 'PMA_setHistory()' function /** * Gets a SQL history entry * - * @param string $username the username + * @param string $username the username + * * @return array list of history items + * * @access public */ function PMA_getHistory($username) @@ -729,7 +759,10 @@ function PMA_getHistory($username) * deletes entries that exceeds $cfg['QueryHistoryMax'], oldest first, for the * given user * - * @param string $username the username + * @param string $username the username + * + * @return nothing + * * @access public */ function PMA_purgeHistory($username) @@ -751,20 +784,21 @@ function PMA_purgeHistory($username) LIMIT ' . $GLOBALS['cfg']['QueryHistoryMax'] . ', 1'; if ($max_time = PMA_DBI_fetch_value($search_query, 0, 0, $GLOBALS['controllink'])) { - PMA_query_as_controluser(' - DELETE FROM + PMA_query_as_controluser( + 'DELETE FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['history']) . ' WHERE `username` = \'' . PMA_sqlAddSlashes($username) . '\' - AND `timevalue` <= \'' . $max_time . '\''); + AND `timevalue` <= \'' . $max_time . '\'' + ); } } // end of 'PMA_purgeHistory()' function /** * Prepares the dropdown for one mode * - * @param array $foreign the keys and values for foreigns - * @param string $data the current data of the dropdown - * @param string $mode the needed mode + * @param array $foreign the keys and values for foreigns + * @param string $data the current data of the dropdown + * @param string $mode the needed mode * * @return array the <option value=""><option>s * @@ -807,7 +841,7 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) } if ((string) $key == (string) $data) { - $reloption .= ' selected="selected"'; + $reloption .= ' selected="selected"'; } if ($mode == 'content-id') { @@ -825,11 +859,14 @@ function PMA__foreignDropdownBuild($foreign, $data, $mode) /** * Outputs dropdown with values of foreign fields * - * @param array array of the displayed row - * @param string the foreign field - * @param string the foreign field to display - * @param string the current data of the dropdown (field in row) + * @param array $disp_row array of the displayed row + * @param string $foreign_field the foreign field + * @param string $foreign_display the foreign field to display + * @param string $data the current data of the dropdown (field in row) + * @param int $max maximum number of items in the dropdown + * * @return string the <option value=""><option>s + * * @access public */ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, @@ -861,12 +898,18 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, if ($foreign_display) { if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) { if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) { - $top = PMA__foreignDropdownBuild($foreign, $data, - $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0]); + $top = PMA__foreignDropdownBuild( + $foreign, + $data, + $GLOBALS['cfg']['ForeignKeyDropdownOrder'][0] + ); } if (PMA_isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][1])) { - $bottom = PMA__foreignDropdownBuild($foreign, $data, - $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]); + $bottom = PMA__foreignDropdownBuild( + $foreign, + $data, + $GLOBALS['cfg']['ForeignKeyDropdownOrder'][1] + ); } } else { $top = PMA__foreignDropdownBuild($foreign, $data, 'id-content'); @@ -897,12 +940,14 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector * - * @param array array of the foreign keys - * @param string the foreign field name - * @param bool whether to override the total - * @param string a possible filter - * @param string a possible LIMIT clause + * @param array $foreigners array of the foreign keys + * @param string $field the foreign field name + * @param bool $override_total whether to override the total + * @param string $foreign_filter a possible filter + * @param string $foreign_limit a possible LIMIT clause + * * @return array data about the foreign keys + * * @access public */ @@ -980,8 +1025,10 @@ function PMA_getForeignData($foreigners, $field, $override_total, $foreign_filte /** * Finds all related tables * - * @param string whether to go from master to foreign or vice versa + * @param string $from whether to go from master to foreign or vice versa + * * @return boolean always true + * * @global array $tab_left the list of tables that we still couldn't connect * @global array $tab_know the list of allready connected tables * @global string $fromclause @@ -1031,10 +1078,12 @@ function PMA_getRelatives($from) * * usually called after a field in a table was renamed in tbl_alter.php * - * @param string $db - * @param string $table - * @param string $field - * @param string $new_name + * @param string $db databse name + * @param string $table table name + * @param string $field old field name + * @param string $new_name new field name + * + * @return nothing */ function PMA_REL_renameField($db, $table, $field, $new_name) { @@ -1069,9 +1118,10 @@ function PMA_REL_renameField($db, $table, $field, $new_name) /** * Create a PDF page * - * @param string $newpage - * @param array $cfgRelation - * @param string $db + * @param string $newpage name of the new PDF page + * @param array $cfgRelation + * @param string $db database name + * * @return string $pdf_page_number */ function PMA_REL_create_page($newpage, $cfgRelation, $db) diff --git a/tbl_relation.php b/tbl_relation.php index 7e49758..fc3d868 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -48,9 +48,11 @@ $options_array = array( /** * Generate dropdown choices * - * @param string Message to display - * @param string Name of the <select> field - * @param array Choices for dropdown + * @param string $dropdown_question Message to display + * @param string $select_name Name of the <select> field + * @param array $choices Choices for dropdown + * @param string $selected_value Selected value + * * @return string The existing value (for selected) * * @access public @@ -74,7 +76,8 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele /** * Split a string on backquote pairs * - * @param string original string + * @param string $text original string + * * @return array containing the elements (and their surrounding backquotes) * * @access public @@ -121,8 +124,7 @@ if ($cfgRelation['displaywork']) { } // will be used in the logic for internal relations and foreign keys: -$me_fields_name = - isset($_REQUEST['fields_name']) +$me_fields_name = isset($_REQUEST['fields_name']) ? $_REQUEST['fields_name'] : null; @@ -137,8 +139,7 @@ if (isset($destination) && $cfgRelation['relwork']) { if (! empty($foreign_string)) { $foreign_string = trim($foreign_string, '`'); - list($foreign_db, $foreign_table, $foreign_field) = - explode('.', $foreign_string); + list($foreign_db, $foreign_table, $foreign_field) = explode('.', $foreign_string); if (! isset($existrel[$master_field])) { $upd_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation']) . '(master_db, master_table, master_field, foreign_db, foreign_table, foreign_field)' @@ -261,12 +262,13 @@ if (isset($_REQUEST['destination_foreign'])) { $seen_error = true; } if (substr($tmp_error, 1, 4) == '1216' - || substr($tmp_error, 1, 4) == '1452') { + || substr($tmp_error, 1, 4) == '1452' + ) { PMA_mysqlDie($tmp_error, $sql_query, false, '', false); echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; } if (substr($tmp_error, 1, 4) == '1005') { - $message = PMA_Message::error( __('Error creating foreign key on %1$s (check data types)')); + $message = PMA_Message::error(__('Error creating foreign key on %1$s (check data types)')); $message->addParam($master_field); $message->display(); echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n"; @@ -366,8 +368,9 @@ if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { // if foreign keys are supported, collect all keys from other // tables of the same engine if (PMA_foreignkey_supported($tbl_type) - && isset($curr_table[1]) - && strtoupper($curr_table[1]) == $tbl_type) { + && isset($curr_table[1]) + && strtoupper($curr_table[1]) == $tbl_type + ) { // explicitely ask for non-quoted list of indexed columns // need to obtain backquoted values to support dots inside values $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns($backquoted = true)); hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20497-g2aec106

by Madhura Jayaratne

The branch, master has been updated via 2aec106b901ff5d799bbd66c4eb29dd66d9db90e (commit) via 2e101cc7336f2a448dd1682a49f8b343386f8c07 (commit) from 66b879c458667b50f9243acebfc47efe53517c59 (commit) - Log ----------------------------------------------------------------- commit 2aec106b901ff5d799bbd66c4eb29dd66d9db90e Merge: 66b879c 2e101cc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 27 21:11:10 2011 +0530 Merge branch 'QA_3_4' Conflicts: tbl_relation.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_relation.php | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9971da..576bd5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog - bug #3411633 [core] Call to undefined function PMA_isSuperuser() - bug #3413743 [interface] Display options link missing after search - bug #3324161 [core] CSP policy causing designer JS buttons to fail +- bug #3412862 [relation] Relations/constraints are dropped/created on every change 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/tbl_relation.php b/tbl_relation.php index 6bebd28..7e49758 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -216,25 +216,18 @@ if (isset($_REQUEST['destination_foreign'])) { } elseif (PMA_backquote($existrel_foreign[$master_field]['foreign_db']) != $foreign_db || PMA_backquote($existrel_foreign[$master_field]['foreign_table']) != $foreign_table || PMA_backquote($existrel_foreign[$master_field]['foreign_field']) != $foreign_field - || ($_REQUEST['on_delete'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_delete']) ? $existrel_foreign[$master_field]['on_delete'] : '')) - || ($_REQUEST['on_update'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_update']) ? $existrel_foreign[$master_field]['on_update'] : '')) + || ($_REQUEST['on_delete'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_delete']) ? $existrel_foreign[$master_field]['on_delete'] : 'RESTRICT')) + || ($_REQUEST['on_update'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_update']) ? $existrel_foreign[$master_field]['on_update'] : 'RESTRICT')) ) { // another foreign key is already defined for this field // or // an option has been changed for ON DELETE or ON UPDATE - // remove existing key + // remove existing key and add the new one $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP FOREIGN KEY ' - . PMA_backquote($existrel_foreign[$master_field]['constraint']) . ';'; - - // I tried to send both in one query but it failed - PMA_DBI_query($sql_query); - $display_query .= $sql_query . "\n"; - - // add another - $sql_query = 'ALTER TABLE ' . PMA_backquote($table) - . ' ADD FOREIGN KEY (' + . PMA_backquote($existrel_foreign[$master_field]['constraint']) . ', ' + . 'ADD FOREIGN KEY (' . PMA_backquote($master_field) . ')' . ' REFERENCES ' . $foreign_db . '.' hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-29-g2e101cc

by Madhura Jayaratne

The branch, QA_3_4 has been updated via 2e101cc7336f2a448dd1682a49f8b343386f8c07 (commit) from f29ba65b70dc36b037a5a2620bf6b553709c8962 (commit) - Log ----------------------------------------------------------------- commit 2e101cc7336f2a448dd1682a49f8b343386f8c07 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 27 21:06:21 2011 +0530 bug #3412862 [relation] Relations/constraints are dropped/created on every change ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_relation.php | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc46481..a45a6ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - bug #3411633 [core] Call to undefined function PMA_isSuperuser() - bug #3413743 [interface] Display options link missing after search - bug #3324161 [core] CSP policy causing designer JS buttons to fail +- bug #3412862 [relation] Relations/constraints are dropped/created on every change 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/tbl_relation.php b/tbl_relation.php index 400fc63..e4dcc16 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -72,9 +72,9 @@ function PMA_generate_dropdown($dropdown_question, $select_name, $choices, $sele } /** - * Split a string on backquote pairs + * Split a string on backquote pairs * - * @param string original string + * @param string original string * @return array containing the elements (and their surrounding backquotes) * * @access public @@ -97,7 +97,7 @@ function PMA_backquote_split($text) } $elements[] = substr($text, $first_backquote, $second_backquote - $first_backquote + 1); $pos = $second_backquote + 1; - } + } return($elements); } @@ -216,25 +216,18 @@ if (isset($_REQUEST['destination_foreign'])) { } elseif (PMA_backquote($existrel_foreign[$master_field]['foreign_db']) != $foreign_db || PMA_backquote($existrel_foreign[$master_field]['foreign_table']) != $foreign_table || PMA_backquote($existrel_foreign[$master_field]['foreign_field']) != $foreign_field - || ($_REQUEST['on_delete'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_delete']) ? $existrel_foreign[$master_field]['on_delete'] : '')) - || ($_REQUEST['on_update'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_update']) ? $existrel_foreign[$master_field]['on_update'] : '')) + || ($_REQUEST['on_delete'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_delete']) ? $existrel_foreign[$master_field]['on_delete'] : 'RESTRICT')) + || ($_REQUEST['on_update'][$master_field_md5] != (!empty($existrel_foreign[$master_field]['on_update']) ? $existrel_foreign[$master_field]['on_update'] : 'RESTRICT')) ) { // another foreign key is already defined for this field // or // an option has been changed for ON DELETE or ON UPDATE - // remove existing key + // remove existing key and add the new one $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP FOREIGN KEY ' - . PMA_backquote($existrel_foreign[$master_field]['constraint']) . ';'; - - // I tried to send both in one query but it failed - PMA_DBI_query($sql_query); - $display_query .= $sql_query . "\n"; - - // add another - $sql_query = 'ALTER TABLE ' . PMA_backquote($table) - . ' ADD FOREIGN KEY (' + . PMA_backquote($existrel_foreign[$master_field]['constraint']) . ', ' + . 'ADD FOREIGN KEY (' . PMA_backquote($master_field) . ')' . ' REFERENCES ' . $foreign_db . '.' @@ -376,7 +369,7 @@ if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { && isset($curr_table[1]) && strtoupper($curr_table[1]) == $tbl_type) { // explicitely ask for non-quoted list of indexed columns - // need to obtain backquoted values to support dots inside values + // need to obtain backquoted values to support dots inside values $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns($backquoted = true)); } } // end while over tables @@ -506,9 +499,9 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { </span> <span class="formelement"> <?php - // For ON DELETE and ON UPDATE, the default action + // For ON DELETE and ON UPDATE, the default action // is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE - // won't display the clause if it's set as RESTRICT. + // won't display the clause if it's set as RESTRICT. PMA_generate_dropdown('ON DELETE', 'on_delete[' . $myfield_md5 . ']', $options_array, hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20495-g66b879c

by Michal Čihař

The branch, master has been updated via 66b879c458667b50f9243acebfc47efe53517c59 (commit) from 05d0c9df14ddca53a82c9c78aece52836e36636a (commit) - Log ----------------------------------------------------------------- commit 66b879c458667b50f9243acebfc47efe53517c59 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Sep 27 09:42:35 2011 +0200 Fix format string ----------------------------------------------------------------------- Summary of changes: po/ar.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index f4c3922..907d7f1b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2334,9 +2334,9 @@ msgid_plural "%1$d rows inserted." msgstr[0] "%1$d صف أضيف" msgstr[1] "%1$d صف أضيف" msgstr[2] "%1$d صفوف أضيفت" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[3] "%1$d صفوف أضيفت" +msgstr[4] "%1$d صفوف أضيفت" +msgstr[5] "%1$d صفوف أضيفت" #: libraries/PDF.class.php:81 msgid "Error while creating PDF:" hooks/post-receive -- phpMyAdmin

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git September 2011