gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1331 from smita786/gsoc_automated_normalizaion

Browse Source 
coding style fix
This commit is contained in:
Marc Delisle 2014-08-14 11:43:38 -04:00
commit 76150d6f65
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/normalization.lib.php
View File

@ -89,7 +89,7 @@ function PMA_getHtmlForCreateNewColumn(
8, '', null, array(), null, null, null,
$comments_map, null, true,
array(), $cfgRelation,
$available_mime, $mime_map
isset($available_mime)?$available_mime:array(), $mime_map
);
}
return PMA_getHtmlForTableFieldDefinitions($header_cells, $content_cells);
@ -471,7 +471,7 @@ function PMA_createNewTablesFor2NF($partialDependencies, $tablesName, $table, $d
* build the html for showing the new tables to have in order
* to put given tables in 3NF
*
* @param array $dependencies containing all the dependencies
* @param object $dependencies containing all the dependencies
* @param array $tables tables formed after 2NF and need to convert to 3NF
* @param string $db current database
*

13
libraries/tbl_columns_definition_form.lib.php
View File

@ -138,7 +138,8 @@ function PMA_getHtmlForTableConfigurations()
function PMA_getHtmlForFooter()
{
$html = '<fieldset class="tblFooters">'
. '<input type="button" class="preview_sql" value="' . __('Preview SQL') . '" />'
. '<input type="button" class="preview_sql" value="'
. __('Preview SQL') . '" />'
. '<input type="submit" name="do_save_data" value="' . __('Save') . '" />'
. '</fieldset>'
. '<div id="properties_message"></div>'
@ -566,11 +567,11 @@ function PMA_getColumnMetaForDefault($columnMeta, $isDefault)
/**
* Function to get html for the column name
*
* @param int $columnNumber column number
* @param int $ci cell index
* @param int $ci_offset cell index offset
* @param array $columnMeta column meta
* @param array $cfgRelation configuration relation
* @param int $columnNumber column number
* @param int $ci cell index
* @param int $ci_offset cell index offset
* @param array|null $columnMeta column meta
* @param array $cfgRelation configuration relation
*
* @return string
*/

5
test/libraries/PMA_normalization_test.php
View File

@ -337,7 +337,8 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
{
$tables= array("PMA_table"=>array('col1'));
$db = 'PMA_db';
$dependencies = array('col1'=>array('col2'));
$dependencies = new stdClass();
$dependencies->col1 = array('col2');
$result = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
$this->assertEquals(
array(
@ -346,8 +347,6 @@ class PMA_Normalization_Test extends PHPUnit_Framework_TestCase
), $result
);
$tables= array("PMA_table"=>array('col1', 'PMA_table'));
$dependencies = new stdClass();
$dependencies->col1 = array('col2');
$dependencies->PMA_table = array('col4', 'col5');
$result1 = PMA_getHtmlForNewTables3NF($dependencies, $tables, $db);
$this->assertInternalType('array', $result1);