From 35438cbe914abce800c68371bd4be3928e132446 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sun, 12 Feb 2006 02:20:32 +0000 Subject: [PATCH] options to insertSelect(), indenting --- includes/Database.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/includes/Database.php b/includes/Database.php index b7b0a16d76..1dfe194cf6 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -1327,15 +1327,20 @@ class Database { * $conds may be "*" to copy the whole table * srcTable may be an array of tables. */ - function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'Database::insertSelect' ) { + function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = 'Database::insertSelect', + $options = array() ) + { $destTable = $this->tableName( $destTable ); - if( is_array( $srcTable ) ) { - $srcTable = implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) ); - } else { + if ( is_array( $options ) ) { + $options = implode( ' ', $options ); + } + if( is_array( $srcTable ) ) { + $srcTable = implode( ',', array_map( array( &$this, 'tableName' ), $srcTable ) ); + } else { $srcTable = $this->tableName( $srcTable ); } - $sql = "INSERT INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' . - ' SELECT ' . implode( ',', $varMap ) . + $sql = "INSERT $options INTO $destTable (" . implode( ',', array_keys( $varMap ) ) . ')' . + ' SELECT ' . implode( ',', $varMap ) . " FROM $srcTable"; if ( $conds != '*' ) { $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND ); -- 2.20.1