row limiting for export of results

This commit is contained in:
Marc Delisle
2003-01-21 17:50:20 +00:00
parent cac9bb934e
commit e1a8baa31b
4 changed files with 11 additions and 8 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2003-01-21 Marc Delisle <lem9@users.sourceforge.net>
* sql.php3, tbl_properties_export.php3, libraries/build_dump.lib.php3:
row limiting for exported results
2003-01-21 Michal Cihar <nijel@users.sourceforge.net>
* db_datadict.php3, pdf_schema.php3, tbl_printview.php3,
tbl_properties.inc.php3, tbl_properties_structure.php3, tbl_select.php3:
@@ -19,7 +23,6 @@ $Source$
* sql.php3, tbl_properties_export.php3, tbl_dump.php3,
tbl_move_copy.php3, libraries/build_dump.lib.php3:
Feature: Export results of SELECTs
(TODO: enable row limiting for the export)
2003-01-17 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: faq 5.12 about OS X Safari problem

View File

@@ -199,7 +199,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
global $current_row;
if (!empty($sql_query)) {
$local_query = $sql_query;
$local_query = $sql_query . $add_query;
PMA_mysql_select_db($db);
} else {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
@@ -332,7 +332,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
global $current_row;
if (!empty($sql_query)) {
$local_query = $sql_query;
$local_query = $sql_query . $add_query;
PMA_mysql_select_db($db);
} else {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
@@ -554,7 +554,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
// Gets the data from the database
if (!empty($sql_query)) {
$local_query = $sql_query;
$local_query = $sql_query . $add_query;
PMA_mysql_select_db($db);
} else {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
@@ -645,7 +645,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
}
if (!empty($sql_query)) {
$local_query = $sql_query;
$local_query = $sql_query . $add_query;
PMA_mysql_select_db($db);
} else {
$local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
@@ -704,7 +704,7 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
$tex_escape = array("$", "%", "{", "}", "&", "#", "_", "^");
if (!empty($sql_query)) {
$local_query = $sql_query;
$local_query = $sql_query . $add_query;
PMA_mysql_select_db($db);
} else {
$local_query = 'select * from ' . PMA_backquote($db) . '.' . PMA_backquote($table);

View File

@@ -567,7 +567,7 @@ else {
if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name'])
&& !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
echo ' <!-- Export -->' . "\n"
. ' <a href="tbl_properties_export.php3' . $url_query . '">' . $strExport . '</a>' . "\n";
. ' <a href="tbl_properties_export.php3' . $url_query . '&amp;unlim_num_rows=' . $unlim_num_rows . '">' . $strExport . '</a>' . "\n";
}
// Bookmark Support if required

View File

@@ -106,7 +106,7 @@ echo "\n";
<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" />
<label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
&nbsp;&nbsp;
<?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . PMA_countRecords($db, $table, TRUE) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" />') . "\n"; ?>
<?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . (isset($unlim_num_rows)?$unlim_num_rows: PMA_countRecords($db, $table, TRUE)) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" />') . "\n"; ?>
<br /><br />
<!-- For CSV data -->
<?php echo $strStrucCSV; ?><br />