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

Fixed exporting issues related to views.

Browse Source 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
This commit is contained in:
Dan Ungureanu 2015-07-11 19:14:22 +03:00
parent 8d04cd5db8
commit deada65601
2 changed files with 187 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/Table.class.php
View File

@ -881,21 +881,24 @@ class PMA_Table
*/
$parser = new SqlParser\Parser($sql_structure);
/**
* The CREATE statement of this structure.
* @var SqlParser\Statements\CreateStatement $statement
*/
$statement = $parser->statements[0];
if (!empty($parser->statements[0])) {
// Changing the destination.
$statement->name = $destination;
/**
* The CREATE statement of this structure.
* @var SqlParser\Statements\CreateStatement $statement
*/
$statement = $parser->statements[0];
// Building back the query.
$sql_structure = $statement->build() . ';';
// Changing the destination.
$statement->name = $destination;
// Executing it.
$GLOBALS['dbi']->query($sql_structure);
$GLOBALS['sql_query'] .= "\n" . $sql_structure;
// Building back the query.
$sql_structure = $statement->build() . ';';
// Executing it.
$GLOBALS['dbi']->query($sql_structure);
$GLOBALS['sql_query'] .= "\n" . $sql_structure;
}
// -----------------------------------------------------------------
// Phase 3: Adding constraints.

333
libraries/plugins/export/ExportSql.class.php
View File

@ -1468,177 +1468,188 @@ class ExportSql extends ExportPlugin
);
}
// Using appropriate quotes.
if (($compat === 'MSSQL') || ($sql_backquotes === '"')) {
SqlParser\Context::$MODE |= SqlParser\Context::ANSI_QUOTES;
}
// Views have no constraints, indexes, etc. They do not require any
// analysis.
if (!$view) {
/**
* Parser used for analysis.
* @var SqlParser
*/
$parser = new SqlParser\Parser($create_query);
/**
* `CREATE TABLE` statement.
* @var SqlParser\Statements\SelectStatement
*/
$statement = $parser->statements[0];
/**
* Fragments containining definition of each constraint.
* @var array
*/
$constraints = array();
/**
* Fragments containining definition of each index.
* @var array
*/
$indexes = array();
/**
* Fragments containining definition of each FULLTEXT index.
* @var array
*/
$indexes_fulltext = array();
/**
* Fragments containining definition of each foreign key that will
* be dropped.
* @var array
*/
$dropped = array();
/**
* Fragment containining definition of the `AUTO_INCREMENT`.
* @var array
*/
$auto_increment = array();
// Scanning each field of the `CREATE` statement to fill the arrays
// above.
// If the field is used in any of the arrays above, it is removed
// from the original definition.
// Also, AUTO_INCREMENT attribute is removed.
foreach ($statement->fields as $key => $field) {
if ($field->isConstraint) {
// Creating the parts that add constraints.
$constraints[] = $field::build($field);
unset($statement->fields[$key]);
} elseif (!empty($field->key)) {
// Creating the parts that add indexes (must not be
// constraints).
if ($field->key->type === 'FULLTEXT KEY') {
$indexes_fulltext[] = $field->build($field);
} else {
$indexes[] = $field->build($field);
}
unset($statement->fields[$key]);
// Using appropriate quotes.
if (($compat === 'MSSQL') || ($sql_backquotes === '"')) {
SqlParser\Context::$MODE |= SqlParser\Context::ANSI_QUOTES;
}
// Creating the parts that drop foreign keys.
if (!empty($field->key)) {
if ($field->key->type === 'FOREIGN KEY') {
$dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name);
}
unset($statement->fields[$key]);
}
/**
* Parser used for analysis.
* @var SqlParser
*/
$parser = new SqlParser\Parser($create_query);
}
// Dropping AUTO_INCREMENT.
if (!empty($field->options)) {
if ($field->options->has('AUTO_INCREMENT')) {
$auto_increment[] = $field::build($field);
$field->options->remove('AUTO_INCREMENT');
if (!empty($parser->statements[0]->fields)) {
/**
* `CREATE TABLE` statement.
* @var SqlParser\Statements\SelectStatement
*/
$statement = $parser->statements[0];
/**
* Fragments containining definition of each constraint.
* @var array
*/
$constraints = array();
/**
* Fragments containining definition of each index.
* @var array
*/
$indexes = array();
/**
* Fragments containining definition of each FULLTEXT index.
* @var array
*/
$indexes_fulltext = array();
/**
* Fragments containining definition of each foreign key that will
* be dropped.
* @var array
*/
$dropped = array();
/**
* Fragment containining definition of the `AUTO_INCREMENT`.
* @var array
*/
$auto_increment = array();
// Scanning each field of the `CREATE` statement to fill the arrays
// above.
// If the field is used in any of the arrays above, it is removed
// from the original definition.
// Also, AUTO_INCREMENT attribute is removed.
foreach ($statement->fields as $key => $field) {
if ($field->isConstraint) {
// Creating the parts that add constraints.
$constraints[] = $field::build($field);
unset($statement->fields[$key]);
} elseif (!empty($field->key)) {
// Creating the parts that add indexes (must not be
// constraints).
if ($field->key->type === 'FULLTEXT KEY') {
$indexes_fulltext[] = $field->build($field);
} else {
$indexes[] = $field->build($field);
}
unset($statement->fields[$key]);
}
// Creating the parts that drop foreign keys.
if (!empty($field->key)) {
if ($field->key->type === 'FOREIGN KEY') {
$dropped[] = 'FOREIGN KEY ' . SqlParser\Context::escape($field->name);
}
unset($statement->fields[$key]);
}
// Dropping AUTO_INCREMENT.
if (!empty($field->options)) {
if ($field->options->has('AUTO_INCREMENT')) {
$auto_increment[] = $field::build($field);
$field->options->remove('AUTO_INCREMENT');
}
}
}
/**
* The header of the `ALTER` statement (`ALTER TABLE tbl`).
* @var string
*/
$alter_header = 'ALTER TABLE ' .
PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
);
/**
* The footer of the `ALTER` statement (usually ';')
* @var string
*/
$alter_footer = ';' . $crlf;
// Generating constraints-related query.
if (!empty($constraints)) {
$sql_constraints_query = $alter_header .
$crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $constraints) .
$alter_footer;
$sql_constraints = $this->generateComment(
$crlf, $sql_constraints, __('Constraints for dumped tables'),
__('Constraints for table'), $table_alias, $compat
) . $sql_constraints_query;
}
// Generating indexes-related query.
$sql_indexes_query = '';
if (!empty($indexes)) {
$sql_indexes_query .= $alter_header .
$crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $indexes) .
$alter_footer;
}
if (!empty($indexes_fulltext)) {
// InnoDB supports one FULLTEXT index creation at a time.
// So FULLTEXT indexes are created one-by-one after other
// indexes where created.
$sql_indexes_query .= $alter_header .
' ADD ' . implode(
$alter_footer . $alter_header . ' ADD ', $indexes_fulltext
) . $alter_footer;
}
if ((!empty($indexes)) || (!empty($indexes_fulltext))) {
$sql_indexes = $this->generateComment(
$crlf, $sql_indexes, __('Indexes for dumped tables'),
__('Indexes for table'), $table_alias, $compat
) . $sql_indexes_query;
}
// Generating drop foreign keys-related query.
if (!empty($dropped)) {
$sql_drop_foreign_keys = $alter_header .
$crlf . ' DROP ' . implode(',' . $crlf . ' DROP ', $dropped) .
$alter_footer;
}
// Generating auto-increment-related query.
if ((!empty($auto_increment)) && ($update_indexes_increments)) {
$sql_auto_increments_query = $alter_header .
$crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment) .
', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT')
. $alter_footer;
$sql_auto_increments = $this->generateComment(
$crlf, $sql_auto_increments,
__('AUTO_INCREMENT for dumped tables'),
__('AUTO_INCREMENT for table'), $table_alias, $compat
) . $sql_auto_increments_query;
}
// Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE`
// too.
if (!empty($statement->entityOptions)) {
$statement->entityOptions->remove('AUTO_INCREMENT');
}
// Rebuilding the query.
$create_query = $statement->build();
}
/**
* The header of the `ALTER` statement (`ALTER TABLE tbl`).
* @var string
*/
$alter_header = 'ALTER TABLE ' .
PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
);
/**
* The footer of the `ALTER` statement (usually ';')
* @var string
*/
$alter_footer = ';' . $crlf;
// Generating constraints-related query.
if (!empty($constraints)) {
$sql_constraints_query = $alter_header .
$crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $constraints) .
$alter_footer;
$sql_constraints = $this->generateComment(
$crlf, $sql_constraints, __('Constraints for dumped tables'),
__('Constraints for table'), $table_alias, $compat
) . $sql_constraints_query;
}
// Generating indexes-related query.
$sql_indexes_query = '';
if (!empty($indexes)) {
$sql_indexes_query .= $alter_header .
$crlf . ' ADD ' . implode(',' . $crlf . ' ADD ', $indexes) .
$alter_footer;
}
if (!empty($indexes_fulltext)) {
// InnoDB supports one FULLTEXT index creation at a time.
// So FULLTEXT indexes are created one-by-one after other
// indexes where created.
$sql_indexes_query .= $alter_header .
' ADD ' . implode(
$alter_footer . $alter_header . ' ADD ', $indexes_fulltext
) . $alter_footer;
}
if ((!empty($indexes)) || (!empty($indexes_fulltext))) {
$sql_indexes = $this->generateComment(
$crlf, $sql_indexes, __('Indexes for dumped tables'),
__('Indexes for table'), $table_alias, $compat
) . $sql_indexes_query;
}
// Generating drop foreign keys-related query.
if (!empty($dropped)) {
$sql_drop_foreign_keys = $alter_header .
$crlf . ' DROP ' . implode(',' . $crlf . ' DROP ', $dropped) .
$alter_footer;
}
// Generating auto-increment-related query.
if ((!empty($auto_increment)) && ($update_indexes_increments)) {
$sql_auto_increments_query = $alter_header .
$crlf . ' MODIFY ' . implode(',' . $crlf . ' MODIFY ', $auto_increment) .
', AUTO_INCREMENT=' . $statement->entityOptions->has('AUTO_INCREMENT')
. $alter_footer;
$sql_auto_increments = $this->generateComment(
$crlf, $sql_auto_increments,
__('AUTO_INCREMENT for dumped tables'),
__('AUTO_INCREMENT for table'), $table_alias, $compat
) . $sql_auto_increments_query;
}
// Removing the `AUTO_INCREMENT` attribute from the `CREATE TABLE`
// too.
if (!empty($statement->entityOptions)) {
$statement->entityOptions->remove('AUTO_INCREMENT');
}
// Rebuilding the query.
$schema_create .= $statement->build();
$schema_create .= $create_query;
}
$GLOBALS['dbi']->freeResult($result);
// Restoring old mode.