Skip to content

#4663 Export missing back ticks for order table name #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lem9 merged 1 commit into from
Dec 23, 2014
Merged

#4663 Export missing back ticks for order table name #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/Util.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ public static function backquoteCompat(
$quote = '"';
break;
default:
(isset($GLOBALS['sql_backquotes'])) ? $quote = "`" : $quote = '';
$quote = "`";
break;
}

Expand Down
84 changes: 55 additions & 29 deletions libraries/plugins/export/ExportSql.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,8 +773,9 @@ public function exportDBCreate($db, $db_alias = '')
if (isset($GLOBALS['sql_drop_database'])) {
if (! PMA_exportOutputHandler(
'DROP DATABASE '
. (isset($GLOBALS['sql_backquotes'])
? PMA_Util::backquoteCompat($db_alias, $compat) : $db_alias)
. PMA_Util::backquoteCompat(
$db_alias, $compat, isset($GLOBALS['sql_backquotes'])
)
. ';' . $crlf
)) {
return false;
Expand All @@ -785,8 +786,9 @@ public function exportDBCreate($db, $db_alias = '')
}

$create_query = 'CREATE DATABASE IF NOT EXISTS '
. (isset($GLOBALS['sql_backquotes'])
? PMA_Util::backquoteCompat($db_alias, $compat) : $db_alias);
. PMA_Util::backquoteCompat(
$db_alias, $compat, isset($GLOBALS['sql_backquotes'])
);
$collation = PMA_getDbCollation($db);
if (PMA_DRIZZLE) {
$create_query .= ' COLLATE ' . $collation;
Expand All @@ -807,13 +809,15 @@ public function exportDBCreate($db, $db_alias = '')
if (! PMA_exportOutputHandler($create_query)) {
return false;
}
if (isset($GLOBALS['sql_backquotes'])
&& ((isset($GLOBALS['sql_compatibility'])
if ((isset($GLOBALS['sql_compatibility'])
&& $GLOBALS['sql_compatibility'] == 'NONE')
|| PMA_DRIZZLE)
|| PMA_DRIZZLE
) {
$result = PMA_exportOutputHandler(
'USE ' . PMA_Util::backquoteCompat($db_alias, $compat)
'USE '
. PMA_Util::backquoteCompat(
$db_alias, $compat, isset($GLOBALS['sql_backquotes'])
)
. ';' . $crlf
);
} else {
Expand Down Expand Up @@ -843,9 +847,9 @@ public function exportDBHeader($db, $db_alias = '')
$head = $this->_exportComment()
. $this->_exportComment(
__('Database:') . ' '
. (isset($GLOBALS['sql_backquotes'])
? PMA_Util::backquoteCompat($db_alias, $compat)
: '\'' . $db_alias . '\'')
. PMA_Util::backquoteCompat(
$db_alias, $compat, isset($GLOBALS['sql_backquotes'])
)
)
. $this->_exportComment();
return PMA_exportOutputHandler($head);
Expand Down Expand Up @@ -1313,19 +1317,30 @@ public function getTableDef(
. $this->_exportComment(
__('Constraints for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
)
. $this->_exportComment();
}
$sql_constraints_query .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf;
$sql_constraints .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf;
$sql_drop_foreign_keys .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($db_alias, $compat) . '.'
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$db_alias, $compat, $sql_backquotes
)
. '.'
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf;
}
//if there are indexes
Expand Down Expand Up @@ -1357,16 +1372,22 @@ public function getTableDef(
. $this->_exportComment(
__('Indexes for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
)
. $this->_exportComment();
}
$sql_indexes_query .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf . ' ';

$sql_indexes .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf . ' ';
}
if ($update_indexes_increments && preg_match(
Expand All @@ -1393,12 +1414,16 @@ public function getTableDef(
. $this->_exportComment(
__('AUTO_INCREMENT for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
)
. $this->_exportComment();
}
$sql_auto_increments .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf;
}

Expand Down Expand Up @@ -1748,9 +1773,9 @@ public function exportStructure(
$compat = 'NONE';
}

$formatted_table_name = (isset($GLOBALS['sql_backquotes']))
? PMA_Util::backquoteCompat($table_alias, $compat)
: '\'' . $table_alias . '\'';
$formatted_table_name = PMA_Util::backquoteCompat(
$table_alias, $compat, isset($GLOBALS['sql_backquotes'])
);
$dump = $this->_possibleCRLF()
. $this->_exportComment(str_repeat('-', 56))
. $this->_possibleCRLF()
Expand Down Expand Up @@ -1891,9 +1916,9 @@ public function exportData(
$compat = 'NONE';
}

$formatted_table_name = (isset($GLOBALS['sql_backquotes']))
? PMA_Util::backquoteCompat($table_alias, $compat)
: '\'' . $table_alias . '\'';
$formatted_table_name = PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
);

// Do not export data for a VIEW, unless asked to export the view as a table
// (For a VIEW, this is called only when exporting a single VIEW)
Expand Down Expand Up @@ -2077,7 +2102,8 @@ public function exportData(
'SET IDENTITY_INSERT '
. PMA_Util::backquoteCompat(
$table_alias,
$compat
$compat,
$sql_backquotes
)
. ' ON ;' . $crlf
)) {
Expand Down Expand Up @@ -2217,7 +2243,7 @@ public function exportData(
) {
$outputSucceeded = PMA_exportOutputHandler(
$crlf . 'SET IDENTITY_INSERT '
. PMA_Util::backquoteCompat($table_alias, $compat)
. PMA_Util::backquoteCompat($table_alias, $compat, $sql_backquotes)
. ' OFF;' . $crlf
);
if (! $outputSucceeded) {
Expand Down
12 changes: 6 additions & 6 deletions test/classes/plugin/export/PMA_ExportSql_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ public function testExportDBCreate()
public function testExportDBHeader()
{
$GLOBALS['sql_compatibility'] = 'MSSQL';
$GLOBALS['sql_backquotes'] = '';
$GLOBALS['sql_backquotes'] = true;
$GLOBALS['sql_include_comments'] = true;
$GLOBALS['crlf'] = "\n";

Expand All @@ -881,7 +881,7 @@ public function testExportDBHeader()
$result = ob_get_clean();

$this->assertContains(
"'testDB'",
"testDB",
$result
);
}
Expand Down Expand Up @@ -1694,7 +1694,7 @@ public function testExportStructure()
$result = ob_get_clean();

$this->assertContains(
"-- Triggers 't&bl'\n",
"-- Triggers t&bl\n",
$result
);

Expand All @@ -1718,7 +1718,7 @@ public function testExportStructure()
$result = ob_get_clean();

$this->assertContains(
"-- Structure for view 't&bl'\n",
"-- Structure for view t&bl\n",
$result
);

Expand Down Expand Up @@ -2028,12 +2028,12 @@ public function testExportDataWithIsView()

ob_start();
$this->assertTrue(
$this->object->exportData('db', 'table', "\n", "err.com", "SELECT")
$this->object->exportData('db', 'tbl', "\n", "err.com", "SELECT")
);
$result = ob_get_clean();

$this->assertContains(
"-- VIEW 'table'\n",
"-- VIEW tbl\n",
$result
);

Expand Down
4 changes: 0 additions & 4 deletions test/libraries/common/PMA_quoting_slashing_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,6 @@ public function testbackquoteCompat($a, $b)
// Test bypass quoting (used by dump functions)
$this->assertEquals($a, PMA_Util::backquoteCompat($a, 'NONE', false));

// Test backquote (backquoting will be enabled only
// if isset $GLOBALS['sql_backquotes']
$this->assertEquals($a, PMA_Util::backquoteCompat($a, 'NONE'));

// Run tests in MSSQL compatibility mode
// Test bypass quoting (used by dump functions)
$this->assertEquals($a, PMA_Util::backquoteCompat($a, 'MSSQL', false));
Expand Down