}
protected function doSelectDomain( DatabaseDomain $domain ) {
- $encDatabase = $this->addIdentifierQuotes( $domain->getDatabase() );
- $this->query( "USE $encDatabase" );
+ if ( $domain->getSchema() !== null ) {
+ throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ }
+
+ $database = $domain->getDatabase();
+ if ( $database !== $this->getDBname() ) {
+ $encDatabase = $this->addIdentifierQuotes( $database );
+ $res = $this->doQuery( "USE $encDatabase" );
+ if ( !$res ) {
+ throw new DBExpectedError( $this, "Could not select database '$database'." );
+ }
+ }
// Update that domain fields on success (no exception thrown)
$this->currentDomain = $domain;
/**
* @param string $name
- * @param string $format
- * @return string
+ * @param string $format One of "quoted" (default), "raw", or "split".
+ * @return string|array When the requested $format is "split", a list of database, schema, and
+ * table name is returned. Database and schema can be `false`.
*/
function tableName( $name, $format = 'quoted' ) {
# Replace reserved words with better ones
/**
* call this instead of tableName() in the updater when renaming tables
* @param string $name
- * @param string $format One of quoted, raw, or split
- * @return string
+ * @param string $format One of "quoted" (default), "raw", or "split".
+ * @return string|array When the requested $format is "split", a list of database, schema, and
+ * table name is returned. Database and schema can be `false`.
+ * @private
*/
function realTableName( $name, $format = 'quoted' ) {
$table = parent::tableName( $name, $format );
if ( $format == 'split' ) {
// Used internally, we want the schema split off from the table name and returned
// as a list with 3 elements (database, schema, table)
- $table = explode( '.', $table );
- while ( count( $table ) < 3 ) {
- array_unshift( $table, false );
- }
+ return array_pad( explode( '.', $table, 3 ), -3, false );
}
return $table;
}