August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15002-ge19d93a
by Piotr Przybylski 15 Aug '11

15 Aug '11

The branch, master has been updated via e19d93a70c52fd490f0d10da6ac9adc20fbfbc65 (commit) from b3939c021af17416deae247d8e3365c8975a9f1f (commit) - Log ----------------------------------------------------------------- commit e19d93a70c52fd490f0d10da6ac9adc20fbfbc65 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Mon Aug 15 11:58:54 2011 +0200 Remove unneeded variables from config.default.php ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 308 ++--------------------------------------- 1 files changed, 15 insertions(+), 293 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index d8367e5..c40e784 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2753,325 +2753,49 @@ $cfg['DBG']['sql'] = false; * Column types; * VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity * + * This variable is filled in data_*.inc.php + * * @global array $cfg['ColumnTypes'] */ -$cfg['ColumnTypes'] = array( - // most used - 'INT', - 'VARCHAR', - 'TEXT', - 'DATE', - - // numeric - 'NUMERIC' => array( - 'TINYINT', - 'SMALLINT', - 'MEDIUMINT', - 'INT', - 'BIGINT', - '-', - 'DECIMAL', - 'FLOAT', - 'DOUBLE', - 'REAL', - '-', - 'BIT', - 'BOOLEAN', - 'SERIAL', - ), - - - // Date/Time - 'DATE and TIME' => array( - 'DATE', - 'DATETIME', - 'TIMESTAMP', - 'TIME', - 'YEAR', - ), - - // Text - 'STRING' => array( - 'CHAR', - 'VARCHAR', - '-', - 'TINYTEXT', - 'TEXT', - 'MEDIUMTEXT', - 'LONGTEXT', - '-', - 'BINARY', - 'VARBINARY', - '-', - 'TINYBLOB', - 'MEDIUMBLOB', - 'BLOB', - 'LONGBLOB', - '-', - 'ENUM', - 'SET', - ), - - 'SPATIAL' => array( - 'GEOMETRY', - 'POINT', - 'LINESTRING', - 'POLYGON', - 'MULTIPOINT', - 'MULTILINESTRING', - 'MULTIPOLYGON', - 'GEOMETRYCOLLECTION', - ), -); +$cfg['ColumnTypes'] = array(); /** * Attributes * + * This variable is filled in data_*.inc.php + * * @global array $cfg['AttributeTypes'] */ -$cfg['AttributeTypes'] = array( - '', - 'BINARY', - 'UNSIGNED', - 'UNSIGNED ZEROFILL', - 'on update CURRENT_TIMESTAMP', -); +$cfg['AttributeTypes'] = array(); if ($cfg['ShowFunctionFields']) { /** * Available functions * + * This variable is filled in data_*.inc.php + * * @global array $cfg['Functions'] */ - $cfg['Functions'] = array( - 'ABS', - 'ACOS', - 'ASCII', - 'ASIN', - 'ATAN', - 'BIN', - 'BIT_COUNT', - 'BIT_LENGTH', - 'CEILING', - 'CHAR', - 'CHAR_LENGTH', - 'COMPRESS', - 'COS', - 'COT', - 'CRC32', - 'CURDATE', - 'CURRENT_USER', - 'CURTIME', - 'DATE', - 'DAYNAME', - 'DEGREES', - 'DES_DECRYPT', - 'DES_ENCRYPT', - 'ENCRYPT', - 'EXP', - 'FLOOR', - 'FROM_DAYS', - 'FROM_UNIXTIME', - 'HEX', - 'INET_ATON', - 'INET_NTOA', - 'LENGTH', - 'LN', - 'LOG', - 'LOG10', - 'LOG2', - 'LOWER', - 'MD5', - 'NOW', - 'OCT', - 'OLD_PASSWORD', - 'ORD', - 'PASSWORD', - 'RADIANS', - 'RAND', - 'REVERSE', - 'ROUND', - 'SEC_TO_TIME', - 'SHA1', - 'SOUNDEX', - 'SPACE', - 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', - 'TAN', - 'TIMESTAMP', - 'TIME_TO_SEC', - 'UNCOMPRESS', - 'UNHEX', - 'UNIX_TIMESTAMP', - 'UPPER', - 'USER', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'UUID', - 'VAR_POP', - 'VAR_SAMP', - 'YEAR', - ); + $cfg['Functions'] = array(); /** * Which column types will be mapped to which Group? * + * This variable is filled in data_*.inc.php + * * @global array $cfg['RestrictColumnTypes'] */ - $cfg['RestrictColumnTypes'] = array( - 'TINYINT' => 'FUNC_NUMBER', - 'SMALLINT' => 'FUNC_NUMBER', - 'MEDIUMINT' => 'FUNC_NUMBER', - 'INT' => 'FUNC_NUMBER', - 'BIGINT' => 'FUNC_NUMBER', - 'DECIMAL' => 'FUNC_NUMBER', - 'FLOAT' => 'FUNC_NUMBER', - 'DOUBLE' => 'FUNC_NUMBER', - 'REAL' => 'FUNC_NUMBER', - 'BIT' => 'FUNC_NUMBER', - 'BOOLEAN' => 'FUNC_NUMBER', - 'SERIAL' => 'FUNC_NUMBER', - - 'DATE' => 'FUNC_DATE', - 'DATETIME' => 'FUNC_DATE', - 'TIMESTAMP' => 'FUNC_DATE', - 'TIME' => 'FUNC_DATE', - 'YEAR' => 'FUNC_DATE', - - 'CHAR' => 'FUNC_CHAR', - 'VARCHAR' => 'FUNC_CHAR', - 'TINYTEXT' => 'FUNC_CHAR', - 'TEXT' => 'FUNC_CHAR', - 'MEDIUMTEXT' => 'FUNC_CHAR', - 'LONGTEXT' => 'FUNC_CHAR', - 'BINARY' => 'FUNC_CHAR', - 'VARBINARY' => 'FUNC_CHAR', - 'TINYBLOB' => 'FUNC_CHAR', - 'MEDIUMBLOB' => 'FUNC_CHAR', - 'BLOB' => 'FUNC_CHAR', - 'LONGBLOB' => 'FUNC_CHAR', - 'ENUM' => '', - 'SET' => '', - - 'GEOMETRY' => 'FUNC_SPATIAL', - 'POINT' => 'FUNC_SPATIAL', - 'LINESTRING' => 'FUNC_SPATIAL', - 'POLYGON' => 'FUNC_SPATIAL', - 'MULTIPOINT' => 'FUNC_SPATIAL', - 'MULTILINESTRING' => 'FUNC_SPATIAL', - 'MULTIPOLYGON' => 'FUNC_SPATIAL', - 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', - - ); + $cfg['RestrictColumnTypes'] = array(); /** * Map above defined groups to any function * + * This variable is filled in data_*.inc.php + * * @global array $cfg['RestrictFunctions'] */ - $cfg['RestrictFunctions'] = array( - 'FUNC_CHAR' => array( - 'BIN', - 'CHAR', - 'CURRENT_USER', - 'COMPRESS', - 'DAYNAME', - 'DES_DECRYPT', - 'DES_ENCRYPT', - 'ENCRYPT', - 'HEX', - 'INET_NTOA', - 'LOWER', - 'MD5', - 'OLD_PASSWORD', - 'PASSWORD', - 'REVERSE', - 'SHA1', - 'SOUNDEX', - 'SPACE', - 'UNCOMPRESS', - 'UNHEX', - 'UPPER', - 'USER', - 'UUID', - ), - - 'FUNC_DATE' => array( - 'CURDATE', - 'CURTIME', - 'DATE', - 'FROM_DAYS', - 'FROM_UNIXTIME', - 'NOW', - 'SEC_TO_TIME', - 'TIMESTAMP', - 'UTC_DATE', - 'UTC_TIME', - 'UTC_TIMESTAMP', - 'YEAR', - ), - - 'FUNC_NUMBER' => array( - 'ABS', - 'ACOS', - 'ASCII', - 'ASIN', - 'ATAN', - 'BIT_LENGTH', - 'BIT_COUNT', - 'CEILING', - 'CHAR_LENGTH', - 'COS', - 'COT', - 'CRC32', - 'DEGREES', - 'EXP', - 'FLOOR', - 'INET_ATON', - 'LENGTH', - 'LN', - 'LOG', - 'LOG2', - 'LOG10', - 'OCT', - 'ORD', - 'RADIANS', - 'RAND', - 'ROUND', - 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', - 'TAN', - 'TIME_TO_SEC', - 'UNIX_TIMESTAMP', - 'VAR_POP', - 'VAR_SAMP', - ), - - 'FUNC_SPATIAL' => array( - 'GeomFromText', - 'GeomFromWKB', - - 'GeomCollFromText', - 'LineFromText', - 'MLineFromText', - 'PointFromText', - 'MPointFromText', - 'PolyFromText', - 'MPolyFromText', - - 'GeomCollFromWKB', - 'LineFromWKB', - 'MLineFromWKB', - 'PointFromWKB', - 'MPointFromWKB', - 'PolyFromWKB', - 'MPolyFromWKB', - ), - ); + $cfg['RestrictFunctions'] = array(); /** * Default functions for above defined groups @@ -3085,8 +2809,6 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW', 'pk_char36' => 'UUID', ); - - } // end if /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15001-gb3939c0
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via b3939c021af17416deae247d8e3365c8975a9f1f (commit) via 21e2913adde82d36cfa9ab2daaab90d3a4b185f0 (commit) via b0a108473e3087fa50b121ed48e16809e9ace20a (commit) via bbccd32c816b2bf56e3e36c8c0f86a42ca15dd37 (commit) from 74764f3cf1c238fed2cdb29e62fb59bbcf771c69 (commit) - Log ----------------------------------------------------------------- commit b3939c021af17416deae247d8e3365c8975a9f1f Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 11:41:49 2011 +0200 Remove not needed global $query_default_option commit 21e2913adde82d36cfa9ab2daaab90d3a4b185f0 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 11:37:23 2011 +0200 Remove not needed param from PMA_REL_create_page commit b0a108473e3087fa50b121ed48e16809e9ace20a Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 11:36:13 2011 +0200 Remove not needed param from PMA_REL_create_page commit bbccd32c816b2bf56e3e36c8c0f86a42ca15dd37 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 11:33:00 2011 +0200 Improve coding style ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 5 +- libraries/schema/User_Schema.class.php | 69 +++++++++++++++++++++----------- pmd_pdf.php | 18 +++----- schema_edit.php | 23 ++++------- schema_export.php | 12 +----- 5 files changed, 64 insertions(+), 63 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index c24c249..4411743 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1068,10 +1068,9 @@ function PMA_REL_renameField($db, $table, $field, $new_name) * @param string $newpage * @param array $cfgRelation * @param string $db - * @param string $query_default_option * @return string $pdf_page_number */ -function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) +function PMA_REL_create_page($newpage, $cfgRelation, $db) { if (! isset($newpage) || $newpage == '') { $newpage = __('no description'); @@ -1079,7 +1078,7 @@ function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) $ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' (db_name, page_descr)' . ' VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($newpage) . '\')'; - PMA_query_as_controluser($ins_query, false, $query_default_option); + PMA_query_as_controluser($ins_query, false); return PMA_DBI_insert_id(isset($GLOBALS['controllink']) ? $GLOBALS['controllink'] : ''); } ?> diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 2ea0a2b..aa17c47 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -38,31 +38,52 @@ class PMA_User_Schema public function processUserChoice() { - global $action_choose,$db,$cfgRelation,$cfg,$query_default_option; + global $action_choose,$db,$cfgRelation,$cfg; if (isset($this->action)) { switch ($this->action) { case 'selectpage': $this->chosenPage = $_REQUEST['chpage']; if ($action_choose=="1") { - $this->deleteCoordinates($db, $cfgRelation, $this->chosenPage, $query_default_option); - $this->deletePages($db, $cfgRelation, $this->chosenPage, $query_default_option); + $this->deleteCoordinates( + $db, + $cfgRelation, + $this->chosenPage + ); + $this->deletePages( + $db, + $cfgRelation, + $this->chosenPage + ); $this->chosenPage = 0; } break; case 'createpage': - $this->pageNumber = PMA_REL_create_page($_POST['newpage'], $cfgRelation, $db, $query_default_option); + $this->pageNumber = PMA_REL_create_page( + $_POST['newpage'], + $cfgRelation, + $db + ); $this->autoLayoutForeign = isset($_POST['auto_layout_foreign']) ? "1":NULL; $this->autoLayoutInternal = isset($_POST['auto_layout_internal']) ? "1":NULL; - $this->processRelations($db, $this->pageNumber,$cfgRelation,$query_default_option); + $this->processRelations( + $db, + $this->pageNumber, + $cfgRelation + ); break; case 'edcoord': $this->chosenPage = $_POST['chpage']; $this->c_table_rows = $_POST['c_table_rows']; - $this->_editCoordinates($db, $cfgRelation,$query_default_option); + $this->_editCoordinates($db, $cfgRelation); break; case 'delete_old_references': - $this->_deleteTableRows($delrow,$cfgRelation,$db,$this->chosenPage); + $this->_deleteTableRows( + $delrow, + $cfgRelation, + $db, + $this->chosenPage + ); break; case 'process_export': $this->_processExportSchema(); @@ -132,10 +153,10 @@ class PMA_User_Schema */ public function selectPage() { - global $db,$table,$query_default_option,$cfgRelation; + global $db,$table,$cfgRelation; $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''; - $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); + $page_rs = PMA_query_as_controluser($page_query, false, PMA_DBI_QUERY_STORE); if ($page_rs && PMA_DBI_num_rows($page_rs) > 0) { ?> <form method="get" action="schema_edit.php" name="frm_select_page"> @@ -186,7 +207,7 @@ class PMA_User_Schema */ public function showTableDashBoard() { - global $db,$cfgRelation,$table,$cfg,$with_field_names,$query_default_option; + global $db,$cfgRelation,$table,$cfg,$with_field_names; /* * We will need an array of all tables in this db */ @@ -209,7 +230,7 @@ class PMA_User_Schema $page_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; - $page_rs = PMA_query_as_controluser($page_query, false, $query_default_option); + $page_rs = PMA_query_as_controluser($page_query, false); $array_sh_page = array(); while ($temp_sh_page = @PMA_DBI_fetch_assoc($page_rs)) { $array_sh_page[] = $temp_sh_page; @@ -543,7 +564,7 @@ class PMA_User_Schema . ' AND table_name = \'' . PMA_sqlAddSlashes($current_row) . '\'' . "\n" . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($chpage) . '\''; echo $del_query; - PMA_query_as_controluser($del_query, false, $query_default_option); + PMA_query_as_controluser($del_query, false); } } @@ -584,12 +605,12 @@ class PMA_User_Schema * @return void * @access private */ - public function deleteCoordinates($db, $cfgRelation, $choosePage, $query_default_option) + public function deleteCoordinates($db, $cfgRelation, $choosePage) { $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($choosePage) . '\''; - PMA_query_as_controluser($query, false, $query_default_option); + PMA_query_as_controluser($query, false); } /** @@ -601,12 +622,12 @@ class PMA_User_Schema * @return void * @access private */ - public function deletePages($db, $cfgRelation, $choosePage, $query_default_option) + public function deletePages($db, $cfgRelation, $choosePage) { $query = 'DELETE FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND page_nr = \'' . PMA_sqlAddSlashes($choosePage) . '\''; - PMA_query_as_controluser($query, false, $query_default_option); + PMA_query_as_controluser($query, false); } /** @@ -618,7 +639,7 @@ class PMA_User_Schema * @return void * @access private */ - public function processRelations($db, $pageNumber, $cfgRelation, $query_default_option) + public function processRelations($db, $pageNumber, $cfgRelation) { /* * A u t o m a t i c l a y o u t @@ -665,7 +686,7 @@ class PMA_User_Schema . ' WHERE master_db = \'' . $db . '\'' . ' GROUP BY master_table' . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC '; - $master_tables_rs = PMA_query_as_controluser($master_tables, false, $query_default_option); + $master_tables_rs = PMA_query_as_controluser($master_tables, false, PMA_DBI_QUERY_STORE); if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) { /* first put all the master tables at beginning * of the list, so they are near the center of @@ -703,7 +724,7 @@ class PMA_User_Schema } if (isset($this->autoLayoutInternal) || isset($this->autoLayoutForeign)) { - $this->addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation,$query_default_option); + $this->addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation); } $this->chosenPage = $pageNumber; @@ -719,7 +740,7 @@ class PMA_User_Schema * @return void * @access private */ - public function addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation,$query_default_option) + public function addRelationCoordinates($all_tables,$pageNumber,$db, $cfgRelation) { /* * Now generate the coordinates for the schema @@ -737,7 +758,7 @@ class PMA_User_Schema $insert_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) . ' ' . '(db_name, table_name, pdf_page_number, x, y) ' . 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($current_table) . '\',' . $pageNumber . ',' . $pos_x . ',' . $pos_y . ')'; - PMA_query_as_controluser($insert_query, false, $query_default_option); + PMA_query_as_controluser($insert_query, false); /* * compute for the next table @@ -775,7 +796,7 @@ class PMA_User_Schema * @return void * @access private */ - private function _editCoordinates($db, $cfgRelation,$query_default_option) + private function _editCoordinates($db, $cfgRelation) { for ($i = 0; $i < $this->c_table_rows; $i++) { $arrvalue = 'c_table_' . $i; @@ -792,7 +813,7 @@ class PMA_User_Schema . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\'' . ' AND pdf_page_number = \'' . PMA_sqlAddSlashes($this->chosenPage) . '\''; - $test_rs = PMA_query_as_controluser($test_query, false, $query_default_option); + $test_rs = PMA_query_as_controluser($test_query, false, PMA_DBI_QUERY_STORE); //echo $test_query; if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { if (isset($arrvalue['delete']) && $arrvalue['delete'] == 'y') { @@ -813,7 +834,7 @@ class PMA_User_Schema . 'VALUES (\'' . PMA_sqlAddSlashes($db) . '\', \'' . PMA_sqlAddSlashes($arrvalue['name']) . '\', \'' . PMA_sqlAddSlashes($this->chosenPage) . '\',' . $arrvalue['x'] . ',' . $arrvalue['y'] . ')'; } //echo $ch_query; - PMA_query_as_controluser($ch_query, false, $query_default_option); + PMA_query_as_controluser($ch_query, false); } // end if } // end for } diff --git a/pmd_pdf.php b/pmd_pdf.php index d697dd5..adf5fac 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -8,7 +8,7 @@ include_once 'pmd_common.php'; /** - * If called directly from the designer, first save the positions + * If called directly from the designer, first save the positions */ if (! isset($scale)) { $no_die_save_pos = 1; @@ -25,11 +25,7 @@ if (isset($mode)) { $scale_q = PMA_sqlAddSlashes($scale); if ('create_export' == $mode) { - /* - * @see pdf_pages.php - */ - $query_default_option = PMA_DBI_QUERY_STORE; - $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option); + $pdf_page_number = PMA_REL_create_page($newpage, $cfgRelation, $db); if ($pdf_page_number > 0) { $message = PMA_Message::success(__('Page has been created')); $mode = 'export'; @@ -57,7 +53,7 @@ if (isset($mode)) { ' . $pmd_table . '.`table_name` = ' . $pma_table . '.`table_name` AND ' . $pmd_table . '.`db_name`=\''. PMA_sqlAddSlashes($db) .'\' - AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE); + AND pdf_page_number = ' . $pdf_page_number_q . ';', true, PMA_DBI_QUERY_STORE); } } @@ -68,20 +64,20 @@ require_once './libraries/header_meta_style.inc.php'; <body> <br> <div> -<?php - if (!empty($message)) { +<?php + if (!empty($message)) { $message->display(); } ?> <form name="form1" method="post" action="pmd_pdf.php"> -<?php +<?php echo PMA_generate_common_hidden_inputs($db); echo '<div>'; echo '<fieldset><legend>' . __('Import/Export coordinates for PDF schema') . '</legend>'; $choices = array(); -$table_info_result = PMA_query_as_controluser('SELECT * FROM ' +$table_info_result = PMA_query_as_controluser('SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\''); diff --git a/schema_edit.php b/schema_edit.php index 4ab41d4..3662b0b 100644 --- a/schema_edit.php +++ b/schema_edit.php @@ -20,19 +20,12 @@ require_once './libraries/db_info.inc.php'; /** * Includ settings for relation stuff - * get all variables needed for exporting relational schema + * get all variables needed for exporting relational schema * in $cfgRelation */ require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); -/** - * This is to avoid "Command out of sync" errors. Before switching this to - * a value of 0 (for MYSQLI_USE_RESULT), please check the logic - * to free results wherever needed. - */ -$query_default_option = PMA_DBI_QUERY_STORE; - /** * Now in ./libraries/relation.lib.php we check for all tables * that we need, but if we don't find them we are quiet about it @@ -79,14 +72,14 @@ if ($cfgRelation['pdfwork']) { * and tables which will be exported as Relational schema * you can set the table positions on the paper via scratchboard * for table positions, put the x,y co-ordinates - * + * * @param string $do It tells what the Schema is supposed to do - * create and select a page, generate schema etc + * create and select a page, generate schema etc */ if (isset($_REQUEST['do'])) { $user_schema->setAction($_REQUEST['do']); $user_schema->processUserChoice(); - } + } /** * Show some possibility to select a page for the export of relation schema @@ -96,14 +89,14 @@ if ($cfgRelation['pdfwork']) { $user_schema->selectPage(); /** - * Create a new page where relations will be drawn + * Create a new page where relations will be drawn */ $user_schema->showCreatePageDialog($db); /** - * After selection of page or creating a page - * It will show you the list of tables + * After selection of page or creating a page + * It will show you the list of tables * A dashboard will also be shown where you can position the tables */ @@ -114,7 +107,7 @@ if ($cfgRelation['pdfwork']) { || ($_REQUEST['do']== 'selectpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0) || ($_REQUEST['do'] == 'createpage' && isset($user_schema->chosenPage) && $user_schema->chosenPage != 0))) { - /** + /** * show Export schema generation options */ $user_schema->displaySchemaGenerationOptions(); diff --git a/schema_export.php b/schema_export.php index 3e1067d..2abe91f 100644 --- a/schema_export.php +++ b/schema_export.php @@ -13,7 +13,7 @@ require './libraries/StorageEngine.class.php'; /** * Include settings for relation stuff - * get all variables needed for exporting relational schema + * get all variables needed for exporting relational schema * in $cfgRelation */ require_once './libraries/relation.lib.php'; @@ -21,14 +21,6 @@ $cfgRelation = PMA_getRelationsParam(); require_once './libraries/transformations.lib.php'; require_once './libraries/Index.class.php'; - -/** - * This is to avoid "Command out of sync" errors. Before switching this to - * a value of 0 (for MYSQLI_USE_RESULT), please check the logic - * to free results wherever needed. - */ -$query_default_option = PMA_DBI_QUERY_STORE; - include_once("./libraries/schema/Export_Relation_Schema.class.php"); /** @@ -47,4 +39,4 @@ if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist')); } include("./libraries/schema/".$path."_Relation_Schema.class.php"); -$obj_schema = eval("new PMA_".$path."_Relation_Schema();"); \ No newline at end of file +$obj_schema = eval("new PMA_".$path."_Relation_Schema();"); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14997-g74764f3
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 74764f3cf1c238fed2cdb29e62fb59bbcf771c69 (commit) via 7654af9632d9f56a791a3019a41624aca3a16ed7 (commit) from 670b6ea38b626750bd7ceaee393542e461d04c2b (commit) - Log ----------------------------------------------------------------- commit 74764f3cf1c238fed2cdb29e62fb59bbcf771c69 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 11:24:22 2011 +0200 Add test case for failed eval commit 7654af9632d9f56a791a3019a41624aca3a16ed7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 11:21:38 2011 +0200 Add test for errors ----------------------------------------------------------------------- Summary of changes: test/classes/Advisor_test.php | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index d5d9dda..d2be774 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -50,17 +50,19 @@ class Advisor_test extends PHPUnit_Framework_TestCase * @depends testParse * @dataProvider rulesProvider */ - public function testAddRule($rule, $expected) + public function testAddRule($rule, $expected, $error) { $advisor = new Advisor(); $parseResult = $advisor->parseRulesFile(); $this->assertEquals($parseResult['errors'], array()); $advisor->variables['value'] = 0; $advisor->addRule('fired', $rule); - if (isset($advisor->runResult['errors'])) { - $this->assertEquals($advisor->runResult['errors'], array()); + if (isset($advisor->runResult['errors']) || !is_null($error)) { + $this->assertEquals($advisor->runResult['errors'], array($error)); + } + if (isset($advisor->runResult['fired']) || $expected != array()) { + $this->assertEquals($advisor->runResult['fired'], array($expected)); } - $this->assertEquals($advisor->runResult['fired'], array($expected)); } public function rulesProvider() @@ -69,22 +71,32 @@ class Advisor_test extends PHPUnit_Framework_TestCase array( array('justification' => 'foo', 'name' => 'Basic', 'issue' => 'issue', 'recommendation' => 'Recommend'), array('justification' => 'foo', 'name' => 'Basic', 'issue' => 'issue', 'recommendation' => 'Recommend'), + null, ), array( array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend {status_var}'), array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?lang=en&token=token#filter=status_var">status_var</a>'), + null, ), array( array('justification' => '%s foo | value', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'), array('justification' => '0 foo', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'), + null, ), array( array('justification' => '%s% foo | value', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), array('justification' => '0% foo', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), + null, ), array( array('justification' => '"\'foo', 'name' => 'Quotes', 'issue' => 'issue', 'recommendation' => 'Recommend"\''), array('justification' => '"\'foo', 'name' => 'Quotes', 'issue' => 'issue', 'recommendation' => 'Recommend"\''), + null, + ), + array( + array('justification' => 'foo | fsafdsa', 'name' => 'Failure', 'issue' => 'issue', 'recommendation' => 'Recommend'), + array(), + 'Failed formattingstring for rule \'Failure\'. PHP threw following error: Use of undefined constant fsafdsa - assumed \'fsafdsa\'', ), ); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14995-g670b6ea
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 670b6ea38b626750bd7ceaee393542e461d04c2b (commit) from 83b859f679a36e8873477c45490dd46eb923cf5a (commit) - Log ----------------------------------------------------------------- commit 670b6ea38b626750bd7ceaee393542e461d04c2b Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 11:18:25 2011 +0200 Fix test with lang set ----------------------------------------------------------------------- Summary of changes: test/classes/Advisor_test.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 4f30f57..d5d9dda 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -19,6 +19,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase public function setup() { $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['lang'] = 'en'; } /** @@ -71,7 +72,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase ), array( array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend {status_var}'), - array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?token=token#filter=status_var">status_var</a>'), + array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?lang=en&token=token#filter=status_var">status_var</a>'), ), array( array('justification' => '%s foo | value', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14994-g83b859f
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 83b859f679a36e8873477c45490dd46eb923cf5a (commit) from e4c101c4d64ca3d63601c84b26b4c1be82f57f81 (commit) - Log ----------------------------------------------------------------- commit 83b859f679a36e8873477c45490dd46eb923cf5a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 11:07:07 2011 +0200 Add test for quotes handling ----------------------------------------------------------------------- Summary of changes: test/classes/Advisor_test.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 24b8fe6..4f30f57 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -81,6 +81,10 @@ class Advisor_test extends PHPUnit_Framework_TestCase array('justification' => '%s% foo | value', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), array('justification' => '0% foo', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), ), + array( + array('justification' => '"\'foo', 'name' => 'Quotes', 'issue' => 'issue', 'recommendation' => 'Recommend"\''), + array('justification' => '"\'foo', 'name' => 'Quotes', 'issue' => 'issue', 'recommendation' => 'Recommend"\''), + ), ); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14993-ge4c101c
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via e4c101c4d64ca3d63601c84b26b4c1be82f57f81 (commit) via 9889e68133fa209d961d1aea8a9cd51451af6f38 (commit) from 72f9042b9ae715b912057934bdbc061a2444ff65 (commit) - Log ----------------------------------------------------------------- commit e4c101c4d64ca3d63601c84b26b4c1be82f57f81 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 11:02:39 2011 +0200 Add more cases for adding rules commit 9889e68133fa209d961d1aea8a9cd51451af6f38 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 15 10:54:53 2011 +0200 Add testcase for adding rules ----------------------------------------------------------------------- Summary of changes: test/classes/Advisor_test.php | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 2bc0e68..24b8fe6 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -10,9 +10,17 @@ * Include to test. */ require_once 'libraries/Advisor.class.php'; +require_once 'libraries/php-gettext/gettext.inc'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/core.lib.php'; class Advisor_test extends PHPUnit_Framework_TestCase { + public function setup() + { + $_SESSION[' PMA_token '] = 'token'; + } + /** * @dataProvider escapeStrings */ @@ -36,5 +44,44 @@ class Advisor_test extends PHPUnit_Framework_TestCase $parseResult = $advisor->parseRulesFile(); $this->assertEquals($parseResult['errors'], array()); } + + /** + * @depends testParse + * @dataProvider rulesProvider + */ + public function testAddRule($rule, $expected) + { + $advisor = new Advisor(); + $parseResult = $advisor->parseRulesFile(); + $this->assertEquals($parseResult['errors'], array()); + $advisor->variables['value'] = 0; + $advisor->addRule('fired', $rule); + if (isset($advisor->runResult['errors'])) { + $this->assertEquals($advisor->runResult['errors'], array()); + } + $this->assertEquals($advisor->runResult['fired'], array($expected)); + } + + public function rulesProvider() + { + return array( + array( + array('justification' => 'foo', 'name' => 'Basic', 'issue' => 'issue', 'recommendation' => 'Recommend'), + array('justification' => 'foo', 'name' => 'Basic', 'issue' => 'issue', 'recommendation' => 'Recommend'), + ), + array( + array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend {status_var}'), + array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?token=token#filter=status_var">status_var</a>'), + ), + array( + array('justification' => '%s foo | value', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'), + array('justification' => '0 foo', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'), + ), + array( + array('justification' => '%s% foo | value', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), + array('justification' => '0% foo', 'name' => 'Percent', 'issue' => 'issue', 'recommendation' => 'Recommend'), + ), + ); + } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14991-g72f9042
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 72f9042b9ae715b912057934bdbc061a2444ff65 (commit) from 843de6fdf5ea5a157e43d0e4a4f17db114a9f5e1 (commit) - Log ----------------------------------------------------------------- commit 72f9042b9ae715b912057934bdbc061a2444ff65 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 10:43:21 2011 +0200 Coding style ----------------------------------------------------------------------- Summary of changes: libraries/Advisor.class.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index ca9fb6f..bf4fd41 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -69,9 +69,11 @@ class Advisor $this->variables['value'] = $value; try { - if($this->ruleExprEvaluate($rule['test'])) + if ($this->ruleExprEvaluate($rule['test'])) { $this->addRule('fired', $rule); - else $this->addRule('notfired', $rule); + } else { + $this->addRule('notfired', $rule); + } } catch(Exception $e) { $this->runResult['errors'][] = 'Failed running test for rule \''.$rule['name'].'\'. PHP threw following error: '.$e->getMessage(); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14990-g843de6f
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 843de6fdf5ea5a157e43d0e4a4f17db114a9f5e1 (commit) from 099be90fbafd84b0a427aed1c7f37d8f4e0d39ce (commit) - Log ----------------------------------------------------------------- commit 843de6fdf5ea5a157e43d0e4a4f17db114a9f5e1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 10:39:57 2011 +0200 Fix testcase ----------------------------------------------------------------------- Summary of changes: test/classes/Advisor_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index ac43516..2bc0e68 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -33,7 +33,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase public function testParse() { $advisor = new Advisor(); - $parseResult = $this->parseRulesFile(); + $parseResult = $advisor->parseRulesFile(); $this->assertEquals($parseResult['errors'], array()); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14989-g099be90
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 099be90fbafd84b0a427aed1c7f37d8f4e0d39ce (commit) via aec113c7b73a7f062cdf015fa24908b72a8180d1 (commit) from 0407bb70a9521fee3ec2fe9f301e11242b6e1ceb (commit) - Log ----------------------------------------------------------------- commit 099be90fbafd84b0a427aed1c7f37d8f4e0d39ce Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 10:38:09 2011 +0200 Add test for parsing commit aec113c7b73a7f062cdf015fa24908b72a8180d1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 10:36:01 2011 +0200 Rename file to match standards ----------------------------------------------------------------------- Summary of changes: libraries/{advisor.class.php => Advisor.class.php} | 0 libraries/advisory_rules.txt | 2 +- scripts/advisor2php | 4 ++-- server_status.php | 2 +- test/classes/Advisor_test.php | 9 ++++++++- 5 files changed, 12 insertions(+), 5 deletions(-) rename libraries/{advisor.class.php => Advisor.class.php} (100%) diff --git a/libraries/advisor.class.php b/libraries/Advisor.class.php similarity index 100% rename from libraries/advisor.class.php rename to libraries/Advisor.class.php diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index d50834c..f13f838 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -1,6 +1,6 @@ # phpMyAdmin Advisory rules file # Use only UNIX style newlines -# This file is being parsed by advisor.class.php, which should handle syntax errors correctly. +# This file is being parsed by Advisor.class.php, which should handle syntax errors correctly. # However, PHP Warnings and the like are being consumed by the phpMyAdmin error handler, so those won't show up # E.g.: Justification line is empty because you used an unescape percent sign, sprintf() returns an empty string and no warning/error is shown # diff --git a/scripts/advisor2php b/scripts/advisor2php index 7bc8567..c34f287 100644 --- a/scripts/advisor2php +++ b/scripts/advisor2php @@ -5,10 +5,10 @@ * by gettext for generating po(t) files. */ -if (!file_exists('./libraries/advisor.class.php')) { +if (!file_exists('./libraries/Advisor.class.php')) { chdir('..'); } -include './libraries/advisor.class.php'; +include './libraries/Advisor.class.php'; $rules = Advisor::parseRulesFile(); diff --git a/server_status.php b/server_status.php index e7d104b..1add0b6 100644 --- a/server_status.php +++ b/server_status.php @@ -357,7 +357,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if(isset($_REQUEST['advisor'])) { - include('libraries/advisor.class.php'); + include('libraries/Advisor.class.php'); $advisor = new Advisor(); exit(json_encode($advisor->run())); } diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php index 9bcba01..ac43516 100644 --- a/test/classes/Advisor_test.php +++ b/test/classes/Advisor_test.php @@ -9,7 +9,7 @@ /* * Include to test. */ -require_once 'libraries/advisor.class.php'; +require_once 'libraries/Advisor.class.php'; class Advisor_test extends PHPUnit_Framework_TestCase { @@ -29,5 +29,12 @@ class Advisor_test extends PHPUnit_Framework_TestCase array('%s% foo', '%s%% foo'), ); } + + public function testParse() + { + $advisor = new Advisor(); + $parseResult = $this->parseRulesFile(); + $this->assertEquals($parseResult['errors'], array()); + } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14987-g0407bb7
by Michal Čihař 15 Aug '11

15 Aug '11

The branch, master has been updated via 0407bb70a9521fee3ec2fe9f301e11242b6e1ceb (commit) from ac4b82ea13cbbf28e9024b67a1573cfaf98cdfb9 (commit) - Log ----------------------------------------------------------------- commit 0407bb70a9521fee3ec2fe9f301e11242b6e1ceb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Aug 15 10:18:22 2011 +0200 Param was missing ----------------------------------------------------------------------- Summary of changes: libraries/advisory_rules.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index dd18436..d50834c 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -422,7 +422,7 @@ rule 'InnoDB buffer pool size' [system_memory > 0] value < 60 Your InnoDB buffer pool is fairly small. The InnoDB buffer pool has a profound impact on performance for InnoDB tables. Assign all your remaining memory to this buffer. For database servers that use solely InnoDB as storage engine and have no other services (e.g. a web server) running, you may set this as high as 80% of your available memory. If that is not the case, you need to carefully assess the memory consumption of your other services and non-InnoDB-Tables and set this variable accordingly. If it is set too high, your system will start swapping, which decreases performance significantly. See also <a href="http://www.mysqlperformanceblog.com/2007/11/03/choosing-innodb_buffer_pool_…">this article</a> - You are currently using %s% of your memory for the InnoDB buffer pool. This rule fires if you are assigning less than 60%, however this might be perfectly adequate for your system if you don't have much InnoDB tables or other services running on the same machine. + You are currently using %s% of your memory for the InnoDB buffer pool. This rule fires if you are assigning less than 60%, however this might be perfectly adequate for your system if you don't have much InnoDB tables or other services running on the same machine. | value # # other hooks/post-receive -- phpMyAdmin

1 0