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

bug #1401864, preparing for possible DROP VIEW clauses

Browse Source
This commit is contained in:
Marc Delisle
2006-03-23 18:01:43 +00:00
parent 78416302a8
commit 9c993cdacd
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-03-23 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_export.lib.php, lang/*: start work for bug #1401864,
generation of DROP VIEW statements where appropriate
2006-03-23 Michal Čihař <michal@cihar.com> 2006-03-23 Michal Čihař <michal@cihar.com>
* libraries/import/sql.php: Fix handling of -- (bug #1453430). * libraries/import/sql.php: Fix handling of -- (bug #1453430).

2
db_operations.php
View File

@@ -254,7 +254,7 @@ if (!$is_information_schema) {
<?php echo $strCreateDatabaseBeforeCopying; ?></label><br /> <?php echo $strCreateDatabaseBeforeCopying; ?></label><br />
<input type="checkbox" name="drop_if_exists" value="true" <input type="checkbox" name="drop_if_exists" value="true"
id="checkbox_drop" style="vertical-align: middle" /> id="checkbox_drop" style="vertical-align: middle" />
<label for="checkbox_drop"><?php echo $strStrucDrop; ?></label><br /> <label for="checkbox_drop"><?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
<input type="checkbox" name="sql_auto_increment" value="1" <input type="checkbox" name="sql_auto_increment" value="1"
id="checkbox_auto_increment" style="vertical-align: middle" /> id="checkbox_auto_increment" style="vertical-align: middle" />
<label for="checkbox_auto_increment"> <label for="checkbox_auto_increment">

6
libraries/display_export.lib.php
View File

@@ -311,7 +311,7 @@ function show_checked_option() {
id="checkbox_drop_database" id="checkbox_drop_database"
<?php PMA_exportCheckboxCheck('sql_drop_database'); ?> /> <?php PMA_exportCheckboxCheck('sql_drop_database'); ?> />
<label for="checkbox_drop_database"> <label for="checkbox_drop_database">
<?php echo $strAddDropDatabase; ?></label> <?php echo sprintf($strAddClause, 'DROP DATABASE'); ?></label>
</fieldset> </fieldset>
<?php } if ( ! $hide_structure ) { /* SQL structure */ ?> <?php } if ( ! $hide_structure ) { /* SQL structure */ ?>
<fieldset> <fieldset>
@@ -330,13 +330,13 @@ function show_checked_option() {
<input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop"
<?php PMA_exportCheckboxCheck('sql_drop_table'); ?> /> <?php PMA_exportCheckboxCheck('sql_drop_table'); ?> />
<label for="checkbox_dump_drop"> <label for="checkbox_dump_drop">
<?php echo $strStrucDrop; ?></label><br /> <?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
<input type="checkbox" name="if_not_exists" value="1" <input type="checkbox" name="if_not_exists" value="1"
id="checkbox_dump_if_not_exists" id="checkbox_dump_if_not_exists"
<?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> /> <?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> />
<label for="checkbox_dump_if_not_exists"> <label for="checkbox_dump_if_not_exists">
<?php echo $strAddIfNotExists; ?></label><br /> <?php echo sprintf($strAddClause, 'IF NOT EXISTS'); ?></label><br />
<input type="checkbox" name="sql_auto_increment" value="1" <input type="checkbox" name="sql_auto_increment" value="1"
id="checkbox_auto_increment" id="checkbox_auto_increment"

2
tbl_properties_operations.php
View File

@@ -356,7 +356,7 @@ foreach ($dblist as $each_db) {
<label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label><br /> <label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label><br />
<input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" /> <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" />
<label for="checkbox_drop"><?php echo $strStrucDrop; ?></label><br /> <label for="checkbox_drop"><?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
<input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" /> <input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" />
<label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br /> <label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
<?php <?php