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

RFE #571838 : Add 'DROP TABLE IF EXISTS' checkbox.

Browse Source
This commit is contained in:
Garvin Hicking
2003-03-12 15:51:51 +00:00
parent d516720b77
commit 61bd5043f3
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@ $Id$
$Source$ $Source$
2003-03-12 Garvin Hicking <me@supergarv.de> 2003-03-12 Garvin Hicking <me@supergarv.de>
* tbl_move_copy.php3, tbl_properties_operations.php3: RFE #571838 :
Add 'DROP TABLE IF EXISTS' checkbox. Will maintain any existing PMA_* entries
for that table.
* tbl_properties_export.php3, db_details_export.php3, * tbl_properties_export.php3, db_details_export.php3,
libraries/display_export.lib.php3: Reworked DB/Table export, so that DB libraries/display_export.lib.php3: Reworked DB/Table export, so that DB
export now is a perfect look-alike except for a multi-tables dropdown. export now is a perfect look-alike except for a multi-tables dropdown.

23
tbl_move_copy.php3
View File

@@ -146,6 +146,27 @@ if (isset($new_name) && trim($new_name) != '') {
// do not create the table if dataonly // do not create the table if dataonly
if ($what != 'dataonly') { if ($what != 'dataonly') {
// If table exists, and 'add drop table' is selected: Drop it!
$drop_query = '';
if (isset($drop_if_exists) && $drop_if_exists == 'true') {
$drop_query = 'DROP TABLE IF EXISTS ' . PMA_backquote($target_db) . '.' . PMA_backquote($new_name);
$result = @PMA_mysql_query($drop_query);
if (PMA_mysql_error()) {
include('./header.inc.php3');
PMA_mysqlDie('', $sql_structure, '', $err_url);
}
if (isset($sql_query)) {
$sql_query .= "\n" . $drop_query . ';';
} else {
$sql_query = $drop_query . ';';
}
// garvin: If an existing table gets deleted, maintain any entries
// for the PMA_* tables
$maintain_relations = true;
}
$result = @PMA_mysql_query($sql_structure); $result = @PMA_mysql_query($sql_structure);
if (PMA_mysql_error()) { if (PMA_mysql_error()) {
include('./header.inc.php3'); include('./header.inc.php3');
@@ -280,7 +301,7 @@ if (isset($new_name) && trim($new_name) != '') {
$table = $new_name; $table = $new_name;
} else { } else {
// garvin: Create new entries as duplicates from old PMA DBs // garvin: Create new entries as duplicates from old PMA DBs
if ($what != 'dataonly') { if ($what != 'dataonly' && !isset($maintain_relations)) {
if ($cfgRelation['commwork']) { if ($cfgRelation['commwork']) {
// Get all comments and MIME-Types for current table // Get all comments and MIME-Types for current table
$comments_copy_query = 'SELECT $comments_copy_query = 'SELECT

4
tbl_properties_operations.php3
View File

@@ -174,7 +174,9 @@ for ($i = 0; $i < $num_dbs; $i++) {
<input type="radio" name="what" value="data" id="radio_copy_data" /> <input type="radio" name="what" value="data" id="radio_copy_data" />
<label for="radio_copy_data"><?php echo $strStrucData; ?></label>&nbsp;&nbsp;<br /> <label for="radio_copy_data"><?php echo $strStrucData; ?></label>&nbsp;&nbsp;<br />
<input type="radio" name="what" value="dataonly" id="radio_copy_data" /> <input type="radio" name="what" value="dataonly" id="radio_copy_data" />
<label for="radio_copy_data"><?php echo $strDataOnly; ?></label>&nbsp;&nbsp; <label for="radio_copy_data"><?php echo $strDataOnly; ?></label>&nbsp;&nbsp;<br />
<input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" />
<label for="checkbox_drop"><?php echo $strStrucDrop; ?></label>&nbsp;&nbsp;
</td> </td>
<td align="<?php echo $cell_align_right; ?>" valign="top"> <td align="<?php echo $cell_align_right; ?>" valign="top">
<input type="submit" name="submit_copy" value="<?php echo $strGo; ?>" /> <input type="submit" name="submit_copy" value="<?php echo $strGo; ?>" />