Git August 2011

git@phpmyadmin.net

8 participants
476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16993-ge7994a3
by Piotr Przybylski 23 Aug '11

23 Aug '11

The branch, master has been updated via e7994a364e811c0fcbbd58fbbd2fa6a088bd0a3c (commit) from da6c5b71294892dda8da09ce8886ce35abf48a78 (commit) - Log ----------------------------------------------------------------- commit e7994a364e811c0fcbbd58fbbd2fa6a088bd0a3c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 23 22:56:35 2011 +0200 PMA_DBI_fetch_value() doesn't shouldn't allow to set the $options argument ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 3db1b49..074715d 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -899,7 +899,7 @@ function PMA_DBI_postConnect($link, $is_controluser = false) define('PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true)); } else { $mysql_version = PMA_DBI_fetch_value( - 'SELECT VERSION()', 0, 0, $link, PMA_DBI_QUERY_STORE); + 'SELECT VERSION()', 0, 0, $link); if ($mysql_version) { $match = explode('.', $mysql_version); define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); @@ -950,16 +950,15 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * @param integer|string $field field to fetch the value from, * starting at 0, with 0 beeing default * @param resource $link mysql link - * @param mixed $options * @return mixed value of first field in first row from result * or false if not found */ -function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null, $options = 0) +function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null) { $value = false; if (is_string($result)) { - $result = PMA_DBI_try_query($result, $link, $options | PMA_DBI_QUERY_STORE, false); + $result = PMA_DBI_try_query($result, $link, PMA_DBI_QUERY_STORE, false); } // return false if result is empty or false hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16992-gda6c5b7
by Piotr Przybylski 23 Aug '11

23 Aug '11

The branch, master has been updated via da6c5b71294892dda8da09ce8886ce35abf48a78 (commit) from cae0366d212bef81d3cef345b02c3e00f681602d (commit) - Log ----------------------------------------------------------------- commit da6c5b71294892dda8da09ce8886ce35abf48a78 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 23 22:19:21 2011 +0200 Inline PMA_DBI_get_default_engine(), this one-liner is used only once ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 +- libraries/database_interface.lib.php | 10 ---------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/db_structure.php b/db_structure.php index 9c2e045..c0c1d33 100644 --- a/db_structure.php +++ b/db_structure.php @@ -444,7 +444,7 @@ if ($is_show_stats) { <th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th> <?php if (!($cfg['PropertiesNumColumns'] > 1)) { - $default_engine = PMA_DBI_get_default_engine(); + $default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1); echo ' <th align="center">' . "\n" . ' <dfn title="' . sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine) . '">' .$default_engine . '</dfn></th>' . "\n"; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 58307fe..3db1b49 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1175,16 +1175,6 @@ function PMA_DBI_fetch_result($result, $key = null, $value = null, } /** - * return default table engine for given database - * - * @return string default table engine - */ -function PMA_DBI_get_default_engine() -{ - return PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1); -} - -/** * Get supported SQL compatibility modes * * @return array supported SQL compatibility modes hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16991-gcae0366
by Madhura Jayaratne 23 Aug '11

23 Aug '11

The branch, master has been updated via cae0366d212bef81d3cef345b02c3e00f681602d (commit) via d837b705a5cd34eb4119a7a556b71b7bd419a918 (commit) via 486638281a9b17144915dbc743256429ad34bf45 (commit) via 8b3f1b0247c50de4af178f7fa0f014eedbbc9de1 (commit) from c2e7d4be68ac792720eefa9fa5298f0d0014ba5a (commit) - Log ----------------------------------------------------------------- commit cae0366d212bef81d3cef345b02c3e00f681602d Merge: d837b70 c2e7d4b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 00:13:18 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit d837b705a5cd34eb4119a7a556b71b7bd419a918 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Aug 24 00:11:39 2011 +0530 Test cases for PMA_GIS_Geometry class commit 486638281a9b17144915dbc743256429ad34bf45 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Aug 23 22:47:34 2011 +0530 Abstract class PMA_GIS_GeometryTest renamed to PMA_GIS_GeomTest to make room for tests for functions in PMA_GIS_Geometry class commit 8b3f1b0247c50de4af178f7fa0f014eedbbc9de1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Aug 23 22:40:22 2011 +0530 tests for PMA_GIS_Linestring::scaleRow() method ----------------------------------------------------------------------- Summary of changes: ...GIS_Geometry_test.php => PMA_GIS_Geom_test.php} | 2 +- test/classes/gis/PMA_GIS_Geometry_test.php | 249 +++++++++++++++++--- test/classes/gis/PMA_GIS_Linestring_test.php | 38 +++- test/classes/gis/PMA_GIS_Multilinestring_test.php | 4 +- test/classes/gis/PMA_GIS_Multipoint_test.php | 4 +- test/classes/gis/PMA_GIS_Multipolygon_test.php | 4 +- test/classes/gis/PMA_GIS_Point_test.php | 4 +- test/classes/gis/PMA_GIS_Polygon_test.php | 4 +- 8 files changed, 265 insertions(+), 44 deletions(-) copy test/classes/gis/{PMA_GIS_Geometry_test.php => PMA_GIS_Geom_test.php} (95%) diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geom_test.php similarity index 95% copy from test/classes/gis/PMA_GIS_Geometry_test.php copy to test/classes/gis/PMA_GIS_Geom_test.php index 37d4c42..d7637eb 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geom_test.php @@ -10,7 +10,7 @@ require_once 'libraries/gis/pma_gis_geometry.php'; /** * Abstract parent class for all PMA_GIS_<Geom_type> test classes */ -abstract class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase +abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase { /** * test generateWkt method diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php index 37d4c42..b5d4732 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geometry_test.php @@ -1,6 +1,6 @@ <?php /** - * Abstract parent class for all PMA_GIS_<Geom_type> test classes + * Test for PMA_GIS_Geometry * * @package phpMyAdmin-test */ @@ -8,53 +8,240 @@ require_once 'libraries/gis/pma_gis_geometry.php'; /** - * Abstract parent class for all PMA_GIS_<Geom_type> test classes + * Tests for PMA_GIS_Geometry class */ -abstract class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase +class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase { /** - * test generateWkt method + * @access protected + */ + protected $object; + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. * - * @param array $gis_data array of GIS data - * @param int $index index - * @param string $empty string to be insterted in place of missing values - * @param string $wkt expected WKT + * @access protected + * @return nothing + */ + protected function setUp() + { + $this->object = $this->getMockForAbstractClass('PMA_GIS_Geometry'); + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. * + * @access protected * @return nothing - * @dataProvider providerForTestGenerateWkt */ - public function testGenerateWkt($gis_data, $index, $empty, $wkt) + protected function tearDown() + { + unset($this->object); + } + + /** + * Call protected functions by making the visibitlity to public. + * + * @param string $name method name + * @param array $params parameters for the invocation + * + * @return the output from the protected method. + */ + private function _callProtectedFunction($name, $params) + { + $class = new ReflectionClass('PMA_GIS_Geometry'); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method->invokeArgs($this->object, $params); + } + + /** + * tests setMinMax method + * + * @param string $point_set Point set + * @param array $min_max Existing min, max values + * @param array $output Expected output array + * + * @dataProvider providerForTestSetMinMax + * @return nothing + */ + public function testSetMinMax($point_set, $min_max, $output) + { + $this->assertEquals( + $this->_callProtectedFunction( + 'setMinMax', + array($point_set, $min_max) + ), + $output + ); + } + + /** + * data provider for testSetMinMax + * + * @return data for testSetMinMax + */ + public function providerForTestSetMinMax() { - if ($empty == null) { - $this->assertEquals($this->object->generateWkt($gis_data, $index), $wkt); - } else { - $this->assertEquals( - $this->object->generateWkt($gis_data, $index, $empty), - $wkt - ); - } + return array( + array( + '12 35,48 75,69 23,25 45,14 53,35 78', + array(), + array( + 'minX' => 12, + 'maxX' => 69, + 'minY' => 23, + 'maxY' => 78 + ) + ), + array( + '12 35,48 75,69 23,25 45,14 53,35 78', + array( + 'minX' => 2, + 'maxX' => 29, + 'minY' => 23, + 'maxY' => 128 + ), + array( + 'minX' => 2, + 'maxX' => 69, + 'minY' => 23, + 'maxY' => 128 + ) + ) + ); } /** - * test generateParams method + * tests generateParams method * - * @param string $wkt point in WKT form - * @param index $index index - * @param array $params expected output array + * @param string $value Geometry data + * @param string $output Expected output * * @dataProvider providerForTestGenerateParams * @return nothing */ - public function testGenerateParams($wkt, $index, $params) + public function testGenerateParams($value, $output) + { + $this->assertEquals( + $this->_callProtectedFunction( + 'generateParams', + array($value) + ), + $output + ); + } + + /** + * data provider for testGenerateParams + * + * @return data for testGenerateParams + */ + public function providerForTestGenerateParams() + { + return array( + array( + "'MULTIPOINT(125 50,156 25,178 43,175 80)',125", + array( + 'srid' => '125', + 'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)', + ), + ), + array( + 'MULTIPOINT(125 50,156 25,178 43,175 80)', + array( + 'srid' => '0', + 'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)', + ), + ), + array( + "foo", + array( + 'srid' => '0', + 'wkt' => '', + ), + ), + ); + } + + /** + * tests extractPoints method + * + * @param string $point_set String of comma sperated points + * @param array $scale_data Data related to scaling + * @param boolean $linear If true, as a 1D array, else as a 2D array + * @param array $output Expected output + * + * @dataProvider providerForTestExtractPoints + * @return nothing + */ + public function testExtractPoints($point_set, $scale_data, $linear, $output) + { + $this->assertEquals( + $this->_callProtectedFunction( + 'extractPoints', + array($point_set, $scale_data, $linear) + ), + $output + ); + } + + /** + * data provider for testExtractPoints + * + * @return data for testExtractPoints + */ + public function providerForTestExtractPoints() { - if ($index == null) { - $this->assertEquals($this->object->generateParams($wkt), $params); - } else { - $this->assertEquals( - $this->object->generateParams($wkt, $index), - $params - ); - } + return array( + // with no scale data + array( + '12 35,48 75,69 23', + null, + false, + array( + 0 => array(12, 35), + 1 => array(48, 75), + 2 => array(69, 23), + ), + ), + // with scale data + array( + '12 35,48 75,69 23', + array( + 'x' => 5, + 'y' => 5, + 'scale' => 2, + 'height' => 200, + ), + false, + array( + 0 => array(14, 140), + 1 => array(86, 60), + 2 => array(128, 164), + ), + ), + // linear output + array( + '12 35,48 75,69 23', + null, + true, + array(12, 35, 48, 75, 69, 23), + ), + // if a single part of a coordinate is empty + array( + '12 35,48 75,69 ', + null, + false, + array( + 0 => array(12, 35), + 1 => array(48, 75), + 2 => array('', ''), + ), + ), + ); } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php index 4bef75c..05413e1 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/PMA_GIS_Linestring_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_linestring.php'; /** * Tests for PMA_GIS_Linestring class */ -class PMA_GIS_LinestringTest extends PMA_GIS_GeometryTest +class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Linestring @@ -138,5 +138,39 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeometryTest ) ); } + + /** + * test scaleRow method + * + * @param string $spatial spatial data of a row + * @param array $min_max expected results + * + * @dataProvider providerForTestScaleRow + * @return nothing + */ + public function testScaleRow($spatial, $min_max) + { + $this->assertEquals($this->object->scaleRow($spatial), $min_max); + } + + /** + * data provider for testScaleRow + * + * @return data for testScaleRow + */ + public function providerForTestScaleRow() + { + return array( + array( + 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', + array( + 'minX' => 12, + 'maxX' => 69, + 'minY' => 23, + 'maxY' => 78 + ) + ) + ); + } } ?> \ No newline at end of file diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index d7b8132..a0ab50f 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_multilinestring.php'; /** * Tests for PMA_GIS_Multilinestring class */ -class PMA_GIS_MultilinestringTest extends PMA_GIS_GeometryTest +class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Multilinestring diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 8ab0aef..1d5fcdf 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_multipoint.php'; /** * Tests for PMA_GIS_Multipoint class */ -class PMA_GIS_MultipointTest extends PMA_GIS_GeometryTest +class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Multipoint diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 500cbae..1589f9d 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_multipolygon.php'; /** * Tests for PMA_GIS_Multipolygon class */ -class PMA_GIS_MultipolygonTest extends PMA_GIS_GeometryTest +class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Multipolygon diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index a25a66a..9f9ef21 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_point.php'; /** * Tests for PMA_GIS_Point class. */ -class PMA_GIS_PointTest extends PMA_GIS_GeometryTest +class PMA_GIS_PointTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Point diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index 9a27e34..e4941d3 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -5,14 +5,14 @@ * @package phpMyAdmin-test */ -require_once 'PMA_GIS_Geometry_test.php'; +require_once 'PMA_GIS_Geom_test.php'; require_once 'libraries/gis/pma_gis_geometry.php'; require_once 'libraries/gis/pma_gis_polygon.php'; /** * Tests for PMA_GIS_Polygon class */ -class PMA_GIS_PolygonTest extends PMA_GIS_GeometryTest +class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest { /** * @var PMA_GIS_Polygon hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16987-gc2e7d4b
by Marc Delisle 23 Aug '11

23 Aug '11

The branch, master has been updated via c2e7d4be68ac792720eefa9fa5298f0d0014ba5a (commit) from 42341de5e8dbc88345c583229375cf9943788a02 (commit) - Log ----------------------------------------------------------------- commit c2e7d4be68ac792720eefa9fa5298f0d0014ba5a Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 23 13:09:31 2011 -0400 Remove tab characters; coding style (first part) ----------------------------------------------------------------------- Summary of changes: tbl_zoom_select.php | 329 ++++++++++++++++++++++++--------------------------- 1 files changed, 152 insertions(+), 177 deletions(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 2352fc1..ad90043 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -36,14 +36,13 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; */ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { - $extra_data = array(); $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; $result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); - while ($row = PMA_DBI_fetch_assoc($result)) - $extra_data['row_info'] = $row; - + while ($row = PMA_DBI_fetch_assoc($result)) { + $extra_data['row_info'] = $row; + } PMA_ajaxResponse(NULL, true, $extra_data); } @@ -52,44 +51,41 @@ $titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaTh * Not selection yet required -> displays the selection form */ - // Gets some core libraries - require_once './libraries/tbl_common.php'; - //$err_url = 'tbl_select.php' . $err_url; - $url_query .= '&goto=tbl_select.php&back=tbl_select.php'; - - /** - * Gets tables informations - */ - require_once './libraries/tbl_info.inc.php'; - - /** - * Displays top menu links - */ - require_once './libraries/tbl_links.inc.php'; +// Gets some core libraries +require_once './libraries/tbl_common.php'; +$url_query .= '&goto=tbl_select.php&back=tbl_select.php'; - if (! isset($goto)) { - $goto = $GLOBALS['cfg']['DefaultTabTable']; - } - // Defines the url to return to in case of error in the next sql statement - $err_url = $goto . '?' . PMA_generate_common_url($db, $table); - - // Gets the list and number of fields - - list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db); - $fields_cnt = count($fields_list); - - // retrieve keys into foreign fields, if any - // check also foreigners even if relwork is FALSE (to get - // foreign keys from innodb) - $foreigners = PMA_getForeigners($db, $table); - $flag = 1; - $tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array(); - if(!isset($zoom_submit) && !isset($inputs)) - $dataLabel = PMA_getDisplayField($db,$table); - - ?> +/** + * Gets tables informations + */ +require_once './libraries/tbl_info.inc.php'; +/** + * Displays top menu links + */ +require_once './libraries/tbl_links.inc.php'; +if (! isset($goto)) { + $goto = $GLOBALS['cfg']['DefaultTabTable']; +} +// Defines the url to return to in case of error in the next sql statement +$err_url = $goto . '?' . PMA_generate_common_url($db, $table); + +// Gets the list and number of fields + +list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db); +$fields_cnt = count($fields_list); + +// retrieve keys into foreign fields, if any +// check also foreigners even if relwork is FALSE (to get +// foreign keys from innodb) +$foreigners = PMA_getForeigners($db, $table); +$flag = 1; +$tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array(); +if (! isset($zoom_submit) && ! isset($inputs)) { + $dataLabel = PMA_getDisplayField($db,$table); +} +?> <div id="sqlqueryresults"></div> <fieldset id="fieldset_subtab"> <?php @@ -101,27 +97,18 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params); /** * Set the field name,type,collation and whether null on select of a coulmn */ -if(isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) -{ +if (isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) { $flag = 2; - for($i = 0 ; $i < 4 ; $i++) - { - if($inputs[$i] != 'pma_null') - { - $key = array_search($inputs[$i],$fields_list); - $tbl_fields_type[$i] = $fields_type[$key]; - $tbl_fields_collation[$i] = $fields_collation[$key]; - $tbl_fields_null[$i] = $fields_null[$key]; - } - + for ($i = 0 ; $i < 4 ; $i++) { + if ($inputs[$i] != 'pma_null') { + $key = array_search($inputs[$i], $fields_list); + $tbl_fields_type[$i] = $fields_type[$key]; + $tbl_fields_collation[$i] = $fields_collation[$key]; + $tbl_fields_null[$i] = $fields_null[$key]; + } } } - -?> - -<?php - /* * Form for input criteria */ @@ -133,9 +120,6 @@ if(isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) <input type="hidden" name="back" value="tbl_zoom_select.php" /> <input type="hidden" name="flag" id="id_flag" value=<?php echo $flag; ?> /> - - - <fieldset id="inputSection"> <legend><?php echo __('Do a "query by example" (wildcard: "%") for two different columns') ?></legend> @@ -145,112 +129,105 @@ if(isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) <?php $odd_row = true; -for($i = 0 ; $i < 4 ; $i++){ - - if($i == 2){ - echo "<tr><td>"; +for ($i = 0; $i < 4; $i++) { + if ($i == 2) { + echo "<tr><td>"; echo __("Additional search criteria"); - echo "</td><tr>"; + echo "</td><tr>"; } - ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><select name="inputs[]" id=<?php echo 'tableid_' . $i?> > <option value= <?php echo 'pma_null'?>><?php echo __('None'); ?> </option> - <?php - for ($j = 0 ; $j < $fields_cnt ; $j++){ - if(isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])){?> + <?php + for ($j = 0 ; $j < $fields_cnt ; $j++) { + if (isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])) {?> <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected> <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php - } - else{ ?> + } else { ?> <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php - } - } ?> + } + } ?> </select></th> <td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td> <td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td> - <td> - <?php if(isset($inputs) && $inputs[$i] != 'pma_null'){ ?> - <select name="zoomFunc[]"> - <?php - - if (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { - foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { - if(isset($zoomFunc[$i]) && $zoomFunc[$i] == htmlspecialchars($fc)){ - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' - . htmlspecialchars($fc) . '</option>'; - } - else { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } - } - } elseif (preg_match('@char|blob|text|set@i', $tbl_fields_type[$i])) { - foreach ($GLOBALS['cfg']['TextOperators'] as $fc) { - if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){ - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' - . htmlspecialchars($fc) . '</option>'; - } - else { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } - } - } else { - foreach ($GLOBALS['cfg']['NumOperators'] as $fc) { - if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){ - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' - . htmlspecialchars($fc) . '</option>'; - } - else { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } - } - } // end if... else... - - if ($tbl_fields_null[$i]) { - foreach ($GLOBALS['cfg']['NullOperators'] as $fc) { - if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){ - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '" Selected>' - . htmlspecialchars($fc) . '</option>'; - } - else { - echo "\n" . ' ' - . '<option value="' . htmlspecialchars($fc) . '">' - . htmlspecialchars($fc) . '</option>'; - } - } - } +<td> +<?php + if (isset($inputs) && $inputs[$i] != 'pma_null') { ?> + <select name="zoomFunc[]"> + <?php + if (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { + foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { + if (isset($zoomFunc[$i]) && $zoomFunc[$i] == htmlspecialchars($fc)) { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . htmlspecialchars($fc) . '</option>'; + } else { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '">' + . htmlspecialchars($fc) . '</option>'; + } + } + } elseif (preg_match('@char|blob|text|set@i', $tbl_fields_type[$i])) { + foreach ($GLOBALS['cfg']['TextOperators'] as $fc) { + if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . htmlspecialchars($fc) . '</option>'; + } else { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '">' + . htmlspecialchars($fc) . '</option>'; + } + } + } else { + foreach ($GLOBALS['cfg']['NumOperators'] as $fc) { + if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . htmlspecialchars($fc) . '</option>'; + } else { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '">' + . htmlspecialchars($fc) . '</option>'; + } + } + } // end if... else... + + if ($tbl_fields_null[$i]) { + foreach ($GLOBALS['cfg']['NullOperators'] as $fc) { + if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '" Selected>' + . htmlspecialchars($fc) . '</option>'; + } else { + echo "\n" . ' ' + . '<option value="' . htmlspecialchars($fc) . '">' + . htmlspecialchars($fc) . '</option>'; + } + } + } ?> </select> </td> <td> - <?php - $field = $inputs[$i]; - - $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); - if (isset($fields)) - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields); - else - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], ''); + <?php + $field = $inputs[$i]; + $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); + if (isset($fields)) { + echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields); + } else { + echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], ''); } - else{ ?> + } else { ?> </td><td></td> - <?php } ?> + <?php + } ?> </td> </tr> @@ -260,22 +237,20 @@ for($i = 0 ; $i < 4 ; $i++){ <input type="hidden" name="collations[<?php echo $i; ?>]" value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /> - - <?php - }//end for +}//end for ?> </table> - <?php - /* - * Other inputs like data label and mode go after selection of column criteria - */ +<?php +/* + * Other inputs like data label and mode go after selection of column criteria + */ - //Set default datalabel if not selected +//Set default datalabel if not selected if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') { if ($dataLabel == '') - $dataLabel = PMA_getDisplayField($db,$table); + $dataLabel = PMA_getDisplayField($db,$table); } ?> <table class="data"> @@ -302,9 +277,9 @@ for($i = 0 ; $i < 4 ; $i++){ <?php } else { ?> - <input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr> +<input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr> <?php - } ?> +} ?> </table> </fieldset> @@ -334,7 +309,7 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & $sql_query .= ' FROM ' . PMA_backquote($table); for($i = 0 ; $i < 4 ; $i++){ if($inputs[$i] == 'pma_null') - continue; + continue; $tmp = array(); // The where clause $charsets = array(); @@ -350,7 +325,7 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & if ($w) { $sql_query .= ' WHERE ' . implode(' AND ', $w); } - $sql_query .= ' LIMIT ' . $maxPlotLimit; +$sql_query .= ' LIMIT ' . $maxPlotLimit; /* * Query execution part @@ -359,19 +334,19 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { //Need a row with indexes as 0,1,2 for the PMA_getUniqueCondition hence using a temporary array - $tmpRow = array(); - foreach($row as $val) - $tmpRow[] = $val; +$tmpRow = array(); +foreach($row as $val) + $tmpRow[] = $val; //Get unique conditon on each row (will be needed for row update) - $uniqueCondition = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $tmpRow, true); +$uniqueCondition = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $tmpRow, true); - //Append it to row array as where_clause - $row['where_clause'] = $uniqueCondition[0]; - if($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) +//Append it to row array as where_clause +$row['where_clause'] = $uniqueCondition[0]; +if($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]); - else if($dataLabel) +else if($dataLabel) $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]); - else +else $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]); } @@ -389,45 +364,45 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & <fieldset id="displaySection"> <legend><?php echo __('Browse/Edit the points') ?></legend> - <center> +<center> <?php //JSON encode the data(query result) if(isset($zoom_submit) && !empty($data)){ ?> <div id='resizer' style="width:600px;height:400px"> - <?php if (isset($data)) ?><center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> + <?php if (isset($data)) ?><center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> <div id="querydata" style="display:none"> <?php if(isset($data)) echo json_encode($data); ?> </div> - <div id="querychart" style="float:right"></div> + <div id="querychart" style="float:right"></div> </div> <?php - } ?> + } ?> </center> <fieldset id='dataDisplay' style="display:none"> <fieldset> <table class="data"> <thead> <tr> - <th> <?php echo __('Column'); ?> </th> - <th> <?php echo __('Null'); ?> </th> +<th> <?php echo __('Column'); ?> </th> +<th> <?php echo __('Null'); ?> </th> <th> <?php echo __('Value'); ?> </th> - </tr> +</tr> </thead> <tbody> <?php $odd_row = true; - for ($i = 4; $i < $fields_cnt + 4 ; $i++) { - $tbl_fields_type[$i] = $fields_type[$i - 4]; - $fieldpopup = $fields_list[$i - 4]; - $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); + for ($i = 4; $i < $fields_cnt + 4 ; $i++) { + $tbl_fields_type[$i] = $fields_type[$i - 4]; + $fieldpopup = $fields_list[$i - 4]; + $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> - <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th> + <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th> <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> </tr> <?php - } ?> +} ?> </tbody> </table> </fieldset> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16986-g42341de
by Piotr Przybylski 23 Aug '11

23 Aug '11

The branch, master has been updated via 42341de5e8dbc88345c583229375cf9943788a02 (commit) from b072a8d47cc80e346c31ccd8d6e6c0e58f39d390 (commit) - Log ----------------------------------------------------------------- commit 42341de5e8dbc88345c583229375cf9943788a02 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Aug 23 17:43:37 2011 +0200 Fix datepicker initialization ----------------------------------------------------------------------- Summary of changes: js/functions.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 022cb80..1c1dddb 100644 --- a/js/functions.js +++ b/js/functions.js @@ -684,8 +684,9 @@ $(document).ready(function() { /** * Add a date/time picker to each element that needs it + * (only when timepicker.js is loaded) */ - if ($.datetimepicker != undefined) { + if ($.timepicker != undefined) { $('.datefield, .datetimefield').each(function() { PMA_addDatepicker($(this)); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16985-gb072a8d
by Madhura Jayaratne 23 Aug '11

23 Aug '11

The branch, master has been updated via b072a8d47cc80e346c31ccd8d6e6c0e58f39d390 (commit) via b0465744fb17798c30ff552a508ee44af667c02a (commit) via 624a742054f7b2484c3c1e28f13757234377c710 (commit) from a8be4eb8c7a55ba6d3731c6fc6f3b65609ddec3d (commit) - Log ----------------------------------------------------------------- commit b072a8d47cc80e346c31ccd8d6e6c0e58f39d390 Merge: b046574 a8be4eb Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Aug 23 19:37:07 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit b0465744fb17798c30ff552a508ee44af667c02a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Aug 23 19:20:22 2011 +0530 Coding style improvements commit 624a742054f7b2484c3c1e28f13757234377c710 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Aug 23 19:13:55 2011 +0530 Test case for PMA_GIS_Multipolygon::getShape() ----------------------------------------------------------------------- Summary of changes: libraries/gis/pma_gis_multipolygon.php | 14 ++++-- test/classes/gis/PMA_GIS_Multipolygon_test.php | 58 ++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/libraries/gis/pma_gis_multipolygon.php b/libraries/gis/pma_gis_multipolygon.php index b5765ef..d04ccde 100644 --- a/libraries/gis/pma_gis_multipolygon.php +++ b/libraries/gis/pma_gis_multipolygon.php @@ -374,7 +374,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry // Determines whether each line ring is an inner ring or an outer ring. // If it's an inner ring get a point on the surface which can be used to // correctly classify inner rings to their respective outer rings. - require_once './libraries/gis/pma_gis_polygon.php'; + include_once './libraries/gis/pma_gis_polygon.php'; foreach ($row_data['parts'] as $i => $ring) { $row_data['parts'][$i]['isOuter'] = PMA_GIS_Polygon::isOuterRing($ring['points']); } @@ -382,7 +382,8 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry // Find points on surface for inner rings foreach ($row_data['parts'] as $i => $ring) { if (! $ring['isOuter']) { - $row_data['parts'][$i]['pointOnSurface'] = PMA_GIS_Polygon::getPointOnSurface($ring['points']); + $row_data['parts'][$i]['pointOnSurface'] + = PMA_GIS_Polygon::getPointOnSurface($ring['points']); } } @@ -391,8 +392,11 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry if (! $ring1['isOuter']) { foreach ($row_data['parts'] as $k => $ring2) { if ($ring2['isOuter']) { - // If the pointOnSurface of the inner ring is also inside the outer ring - if (PMA_GIS_Polygon::isPointInsidePolygon($ring1['pointOnSurface'], $ring2['points'])) { + // If the pointOnSurface of the inner ring + // is also inside the outer ring + if (PMA_GIS_Polygon::isPointInsidePolygon( + $ring1['pointOnSurface'], $ring2['points'] + )) { if (! isset($ring2['inner'])) { $row_data['parts'][$k]['inner'] = array(); } @@ -410,7 +414,7 @@ class PMA_GIS_Multipolygon extends PMA_GIS_Geometry $wkt .= '('; // start of polygon $wkt .= '('; // start of outer ring - foreach($ring['points'] as $point) { + foreach ($ring['points'] as $point) { $wkt .= $point['x'] . ' ' . $point['y'] . ','; } $wkt = substr($wkt, 0, strlen($wkt) - 1); diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 3281b4f..500cbae 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -168,5 +168,63 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeometryTest ) ); } + + /** + * test getShape method + * + * @param array $row_data array of GIS data + * @param string $shape expected shape in WKT + * + * @dataProvider providerForTestGetShape + * @return nothing + */ + public function testGetShape($row_data, $shape) + { + $this->assertEquals($this->object->getShape($row_data), $shape); + } + + /** + * data provider for testGetShape + * + * @return data for testGetShape + */ + public function providerForTestGetShape() + { + return array( + array( + array( + 'parts' => array( + 0 => array( + 'points' => array( + 0 => array('x' => 10, 'y' => 10), + 1 => array('x' => 10, 'y' => 40), + 2 => array('x' => 50, 'y' => 40), + 3 => array('x' => 50, 'y' => 10), + 4 => array('x' => 10, 'y' => 10), + ), + ), + 1 => array( + 'points' => array( + 0 => array('x' => 60, 'y' => 40), + 1 => array('x' => 75, 'y' => 65), + 2 => array('x' => 90, 'y' => 40), + 3 => array('x' => 60, 'y' => 40), + ), + ), + 2 => array( + 'points' => array( + 0 => array('x' => 20, 'y' => 20), + 1 => array('x' => 40, 'y' => 20), + 2 => array('x' => 25, 'y' => 30), + 3 => array('x' => 20, 'y' => 20), + ), + ), + ), + ), + 'MULTIPOLYGON(((10 10,10 40,50 40,50 10,10 10),(20 20,40 20,25 30' + . ',20 20)),((60 40,75 65,90 40,60 40)))' + ) + ); + } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16982-ga8be4eb
by Michal Čihař 23 Aug '11

23 Aug '11

The branch, master has been updated via a8be4eb8c7a55ba6d3731c6fc6f3b65609ddec3d (commit) via b99420e2aef859ff4c266fa7b31b90d80edbd8e2 (commit) from ebb47823a235c64c4f0200204cf5dfcb8b9f6604 (commit) - Log ----------------------------------------------------------------- commit a8be4eb8c7a55ba6d3731c6fc6f3b65609ddec3d Merge: b99420e ebb4782 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 23 15:09:49 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit b99420e2aef859ff4c266fa7b31b90d80edbd8e2 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 23 15:02:18 2011 +0200 Remove some unused variables ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index aa08a6a..6108375 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -798,8 +798,6 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines properties */ - private $_tables = array(); - private $_relations = array(); private $_ff = PMA_PDF_FONT; private $_xMax = 0; private $_yMax = 0; @@ -823,7 +821,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ function __construct() { - global $pdf,$db,$cfgRelation; + global $pdf, $db; $this->setPageNumber($_POST['pdf_page_number']); $this->setShowGrid(isset($_POST['show_grid'])); @@ -1115,7 +1113,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _showOutput($pageNumber) { - global $pdf, $db, $cfgRelation; + global $pdf, $cfgRelation; // Get the name of this pdfpage to use as filename $_name_sql = 'SELECT page_descr FROM ' @@ -1165,7 +1163,6 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // 'L', 0, $pdf->PMA_links['doc'][$table][$field_name] //); } - $lasttable = $table; $i++; } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); @@ -1206,9 +1203,6 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Gets table informations */ $showtable = PMA_Table::sGetStatusInfo($db, $table); - $num_rows = isset($showtable['Rows']) - ? $showtable['Rows'] - : 0; $show_comment = isset($showtable['Comment']) ? $showtable['Comment'] : ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16980-gebb4782
by Marc Delisle 23 Aug '11

23 Aug '11

The branch, master has been updated via ebb47823a235c64c4f0200204cf5dfcb8b9f6604 (commit) via e10a42596109034a19901e37e188ed47c3b2abce (commit) via 2b4acfa534835b7e41eaeb583c761c4312fd8488 (commit) via f82ad2318cc90bcff6e3624af704a769738e3e99 (commit) from dbb1b8a17ffd362339bb9697e7fb9def7df250d2 (commit) - Log ----------------------------------------------------------------- commit ebb47823a235c64c4f0200204cf5dfcb8b9f6604 Merge: dbb1b8a e10a425 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 23 08:11:51 2011 -0400 Merge commit 'e10a42596109034a19901e37e188ed47c3b2abce' commit e10a42596109034a19901e37e188ed47c3b2abce Merge: 2b4acfa 56b8c5b Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Aug 23 15:00:51 2011 +0800 Merge remote-tracking branch 'origin/master' into aris commit 2b4acfa534835b7e41eaeb583c761c4312fd8488 Merge: f82ad23 af5c63a Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Aug 23 02:26:57 2011 +0800 Merge remote-tracking branch 'origin/master' into aris commit f82ad2318cc90bcff6e3624af704a769738e3e99 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue Aug 23 02:10:58 2011 +0800 Grid edit: fix bug - show NULL checkbox for normal grid-editable text ----------------------------------------------------------------------- Summary of changes: js/makegrid.js | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index e7f2d32..f559677 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -806,7 +806,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.enum')) { //handle enum fields @@ -835,7 +834,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.set')) { //handle set fields @@ -865,7 +863,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').live('change', function(e) { $(g.cEdit).find('.edit_box').val($(this).val()); }) - $editArea.show(); } else if($td.is('.truncated, .transformed')) { if ($td.is('.to_be_saved')) { // cell has been edited @@ -929,7 +926,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }) // end $.post() } g.isEditCellTextEditable = true; - $editArea.show(); } else if ($td.is('.datefield, .datetimefield, .timestampfield')) { var $input_field = $(g.cEdit).find('.edit_box'); @@ -962,9 +958,16 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } else { $input_field.val(''); } - $editArea.show(); + $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>'); } else { g.isEditCellTextEditable = true; + // only append edit area hint if there is a null checkbox + if ($editArea.children().length > 0) { + $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>'); + } + } + if ($editArea.children().length > 0) { + $editArea.show(); } } }, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16965-g41d061a
by Michal Čihař 23 Aug '11

23 Aug '11

The branch, master has been updated via 41d061ab0a627f6bdbff652c9db24cc5602f3b8c (commit) via f4d2f96e71c5c71b4f68cb139647888985371e5b (commit) via 6d28fe5faf02906f86b8b82f86283376858d7235 (commit) via 0c55b9ef2a4ca5ff72c7ec821fa9cd240112a1d8 (commit) via 318af17c653ae4401d3fd8555de55fd3a580bb1d (commit) via 93ea6cd618f59e92ffc6866e4b2b35768ab362c2 (commit) via 16332a1dd573a6c37adfa995450a1f397372b34a (commit) via 0115ff0e71093234da8547bb8aa26116c53b6762 (commit) via e24c45901afd26ea6ec50dad8151d1666f6769f8 (commit) via 365f8c80a383f6a72b5c240c25e4e58d8899b542 (commit) via 2fbd5e53074d80417bcfb3882ef9dc3530e34948 (commit) via a49dabe0989d55a2d0addee91bddb3d0d99666f5 (commit) via 695821f3d5acb1888f5a1eef3a0adaa374ea5e07 (commit) via c6afe0501372daa83f8fe3781bc55f3a44c112be (commit) via 24400a6f2745c4e9659901c4ce4fb12e0901fe57 (commit) via 1a7c24f999e16c4e1433f18b63a4dd31ffccc7a2 (commit) via 8567db0fd1fc4855082a98644ba1c6ef72d5bf1e (commit) via 592da54ec19a81a857b78ce1828f7797b52f44a3 (commit) from 1433b4c3319a58c05e46ed8aca851ef0f8b76266 (commit) - Log ----------------------------------------------------------------- commit 41d061ab0a627f6bdbff652c9db24cc5602f3b8c Merge: 1433b4c f4d2f96 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 23 12:05:40 2011 +0200 Merge remote-tracking branch 'pootle/master' commit f4d2f96e71c5c71b4f68cb139647888985371e5b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 12:01:29 2011 +0200 Translation update done using Pootle. commit 6d28fe5faf02906f86b8b82f86283376858d7235 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 12:01:05 2011 +0200 Translation update done using Pootle. commit 0c55b9ef2a4ca5ff72c7ec821fa9cd240112a1d8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 12:00:50 2011 +0200 Translation update done using Pootle. commit 318af17c653ae4401d3fd8555de55fd3a580bb1d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 12:00:41 2011 +0200 Translation update done using Pootle. commit 93ea6cd618f59e92ffc6866e4b2b35768ab362c2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:59:53 2011 +0200 Translation update done using Pootle. commit 16332a1dd573a6c37adfa995450a1f397372b34a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:51:26 2011 +0200 Translation update done using Pootle. commit 0115ff0e71093234da8547bb8aa26116c53b6762 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:51:08 2011 +0200 Translation update done using Pootle. commit e24c45901afd26ea6ec50dad8151d1666f6769f8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:50:38 2011 +0200 Translation update done using Pootle. commit 365f8c80a383f6a72b5c240c25e4e58d8899b542 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:49:25 2011 +0200 Translation update done using Pootle. commit 2fbd5e53074d80417bcfb3882ef9dc3530e34948 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:47:08 2011 +0200 Translation update done using Pootle. commit a49dabe0989d55a2d0addee91bddb3d0d99666f5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:45:47 2011 +0200 Translation update done using Pootle. commit 695821f3d5acb1888f5a1eef3a0adaa374ea5e07 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:41:57 2011 +0200 Translation update done using Pootle. commit c6afe0501372daa83f8fe3781bc55f3a44c112be Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:40:21 2011 +0200 Translation update done using Pootle. commit 24400a6f2745c4e9659901c4ce4fb12e0901fe57 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:38:02 2011 +0200 Translation update done using Pootle. commit 1a7c24f999e16c4e1433f18b63a4dd31ffccc7a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:32:16 2011 +0200 Translation update done using Pootle. commit 8567db0fd1fc4855082a98644ba1c6ef72d5bf1e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:31:08 2011 +0200 Translation update done using Pootle. commit 592da54ec19a81a857b78ce1828f7797b52f44a3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 23 11:30:45 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/po/ja.po b/po/ja.po index b4c9511..45c3ea9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-23 11:03+0200\n" -"PO-Revision-Date: 2011-08-22 12:15+0200\n" +"PO-Revision-Date: 2011-08-23 12:01+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -868,24 +868,23 @@ msgstr "空間データ" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:288 msgid "Point" -msgstr "" +msgstr "座標" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:286 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:287 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:294 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "ルーチンを追加する" +msgstr "座標を追加する" #: gis_data_editor.php:218 js/messages.php:289 #, fuzzy @@ -1766,19 +1765,19 @@ msgstr "検索" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "プロット点は、それぞれの行のデータを表します。" #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "プロット点にマウスカーソルを重ねると、そのラベルが表示されます。" #: js/messages.php:268 msgid "Use mousewheel to zoom in or out of the plot." -msgstr "" +msgstr "マウスホイールでズームの調整ができます。" #: js/messages.php:270 msgid "Click and drag the mouse to navigate the plot." -msgstr "" +msgstr "ドラッグすることでプロットのスクロールが行えます。" #: js/messages.php:272 msgid "Click reset zoom link to come back to original state." @@ -1786,25 +1785,24 @@ msgstr "" #: js/messages.php:274 msgid "Click a data point to view and possibly edit the data row." -msgstr "" +msgstr "プロット点をクリックすることで、行のデータの閲覧と編集が可能です。" #: js/messages.php:276 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "グラフの右下をドラッグすることで、大きさの調整が行えます。" #: js/messages.php:278 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "文字列データは、数値に変換されてからプロットされます。" #: js/messages.php:280 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "カラムを追加・削除する" +msgstr "カラムを 2 つ選択してください" #: js/messages.php:281 msgid "Select two different columns" -msgstr "" +msgstr "異なるカラムを 2 つ選択してください" #: js/messages.php:284 tbl_change.php:316 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -8023,10 +8021,9 @@ msgid "Table Search" msgstr "テーブル検索" #: libraries/tbl_select.lib.php:208 tbl_change.php:993 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "挿入" +msgstr "編集／挿入" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -11275,7 +11272,7 @@ msgstr "行のサイズ " #: tbl_printview.php:388 tbl_structure.php:900 msgid "Next autoindex" -msgstr "" +msgstr "次の自動付番" #: tbl_relation.php:276 #, php-format @@ -11301,7 +11298,7 @@ msgstr "外部キー制約" #: tbl_select.php:92 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "\"query by example\"を実行 (ワイルドカード: \"%\")" +msgstr "定型問い合わせ (ワイルドカード: \"%\")" #: tbl_select.php:186 msgid "Select columns (at least one):" @@ -11569,10 +11566,9 @@ msgid "Create version" msgstr "バージョンを作成" #: tbl_zoom_select.php:141 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "\"query by example\"を実行 (ワイルドカード: \"%\")" +msgstr "異なる 2 つのカラムによる定型問い合わせ (ワイルドカード: \"%\")" #: tbl_zoom_select.php:152 msgid "Additional search criteria" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16947-g1433b4c
by Michal Čihař 23 Aug '11

23 Aug '11

The branch, master has been updated via 1433b4c3319a58c05e46ed8aca851ef0f8b76266 (commit) from 67ebda8d6c311251e12e4c28649f8ee0324286b4 (commit) - Log ----------------------------------------------------------------- commit 1433b4c3319a58c05e46ed8aca851ef0f8b76266 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 23 11:59:43 2011 +0200 Fixed and simplified type detection on editing Fixes bug#3392824 and cleans up the code. ----------------------------------------------------------------------- Summary of changes: libraries/tbl_properties.inc.php | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 3a4bf96..cdc2c55 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -289,21 +289,10 @@ for ($i = 0; $i < $num_fields; $i++) { // creating a column $row['Type'] = ''; $type = ''; + $length = ''; } else { - $type = $row['Type']; - } - - if (! empty($row['Type'])) { $type = $extracted_fieldspec['type']; - if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { - $length = $extracted_fieldspec['spec_in_brackets']; - } else { - $type = $extracted_fieldspec['print_type']; - $length = $extracted_fieldspec['spec_in_brackets']; - } // end if else - } else { - // creating a column - $length = ''; + $length = $extracted_fieldspec['spec_in_brackets']; } // some types, for example longtext, are reported as hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git August 2011