Commit b79c6508 authored by alexpott's avatar alexpott

Issue #2388067 by david_garcia: getQualifiedMapTableName is database specific...

Issue #2388067 by david_garcia: getQualifiedMapTableName is database specific logic out of the database driver
parent f144ac6e
......@@ -317,6 +317,20 @@ public function tablePrefix($table = 'default') {
}
}
/**
* Get a fully qualified table name.
*
* @param string $table
* The name of the table in question.
*
* @return string
*/
public function getFullQualifiedTableName($table) {
$options = $this->getConnectionOptions();
$prefix = $this->tablePrefix($table);
return $options['database'] . '.' . $prefix . $table;
}
/**
* Prepares a query string and returns the prepared statement.
*
......@@ -922,7 +936,7 @@ public function rollback($savepoint_name = 'drupal_transaction') {
// in question has already been accidentally committed.
if (!isset($this->transactionLayers[$savepoint_name])) {
throw new TransactionNoActiveException();
}
}
// We need to find the point we're rolling back to, all other savepoints
// before are no longer needed. If we rolled back other active savepoints,
......
......@@ -207,10 +207,7 @@ public function messageTableName() {
* The fully qualified map table name.
*/
public function getQualifiedMapTableName() {
$database = $this->getDatabase();
$options = $database->getConnectionOptions();
$prefix = $database->tablePrefix($this->mapTableName);
return $options['database'] . '.' . $prefix . $this->mapTableName;
return $this->getDatabase()->getFullQualifiedTableName($this->mapTableName);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment