Call Database::makeInsertOptions from Database::insertSelect
authorumherirrender <umherirrender_de.wp@web.de>
Fri, 3 Jan 2014 15:32:33 +0000 (16:32 +0100)
committerReedy <reedy@wikimedia.org>
Fri, 3 Jan 2014 18:57:22 +0000 (18:57 +0000)
This allows other database types to modify the options.

Bug: 59233
Change-Id: I45a2c7944057f43453423c8edbe5d173b1fc067d

includes/db/Database.php

index 3388297..e4ff5ee 100644 (file)
@@ -2875,10 +2875,12 @@ abstract class DatabaseBase implements IDatabase, DatabaseType {
        ) {
                $destTable = $this->tableName( $destTable );
 
-               if ( is_array( $insertOptions ) ) {
-                       $insertOptions = implode( ' ', $insertOptions );
+               if ( !is_array( $insertOptions ) ) {
+                       $insertOptions = array( $insertOptions );
                }
 
+               $insertOptions = $this->makeInsertOptions( $insertOptions );
+
                if ( !is_array( $selectOptions ) ) {
                        $selectOptions = array( $selectOptions );
                }