From 69fa7bab6b567400179950079017ea82dbd683fd Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 23 Nov 2013 20:44:36 -0500
Subject: [PATCH] Fixes #1307: move batchInsert() to base class.

---
 framework/yii/db/QueryBuilder.php        | 25 +++++++++++++++--
 framework/yii/db/cubrid/QueryBuilder.php | 47 --------------------------------
 framework/yii/db/mysql/QueryBuilder.php  | 47 --------------------------------
 3 files changed, 23 insertions(+), 96 deletions(-)

diff --git a/framework/yii/db/QueryBuilder.php b/framework/yii/db/QueryBuilder.php
index 0a547ae..d628bc0 100644
--- a/framework/yii/db/QueryBuilder.php
+++ b/framework/yii/db/QueryBuilder.php
@@ -140,12 +140,33 @@ class QueryBuilder extends \yii\base\Object
 	 * @param array $columns the column names
 	 * @param array $rows the rows to be batch inserted into the table
 	 * @return string the batch INSERT SQL statement
-	 * @throws NotSupportedException if this is not supported by the underlying DBMS
 	 */
 	public function batchInsert($table, $columns, $rows)
 	{
-		throw new NotSupportedException($this->db->getDriverName() . ' does not support batch insert.');
+		if (($tableSchema = $this->db->getTableSchema($table)) !== null) {
+			$columnSchemas = $tableSchema->columns;
+		} else {
+			$columnSchemas = [];
+		}
+
+		foreach ($columns as $i => $name) {
+			$columns[$i] = $this->db->quoteColumnName($name);
+		}
 
+		$values = [];
+		foreach ($rows as $row) {
+			$vs = [];
+			foreach ($row as $i => $value) {
+				if (!is_array($value) && isset($columnSchemas[$columns[$i]])) {
+					$value = $columnSchemas[$columns[$i]]->typecast($value);
+				}
+				$vs[] = is_string($value) ? $this->db->quoteValue($value) : $value;
+			}
+			$values[] = '(' . implode(', ', $vs) . ')';
+		}
+
+		return 'INSERT INTO ' . $this->db->quoteTableName($table)
+		. ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
 	}
 
 	/**
diff --git a/framework/yii/db/cubrid/QueryBuilder.php b/framework/yii/db/cubrid/QueryBuilder.php
index e80e1d6..727cb2d 100644
--- a/framework/yii/db/cubrid/QueryBuilder.php
+++ b/framework/yii/db/cubrid/QueryBuilder.php
@@ -67,51 +67,4 @@ class QueryBuilder extends \yii\db\QueryBuilder
 			throw new InvalidParamException("There is not sequence associated with table '$tableName'.");
 		}
 	}
-
-	/**
-	 * Generates a batch INSERT SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->batchInsert('tbl_user', ['name', 'age'], [
-	 *     ['Tom', 30],
-	 *     ['Jane', 20],
-	 *     ['Linda', 25],
-	 * ])->execute();
-	 * ~~~
-	 *
-	 * Note that the values in each row must match the corresponding column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column names
-	 * @param array $rows the rows to be batch inserted into the table
-	 * @return string the batch INSERT SQL statement
-	 */
-	public function batchInsert($table, $columns, $rows)
-	{
-		if (($tableSchema = $this->db->getTableSchema($table)) !== null) {
-			$columnSchemas = $tableSchema->columns;
-		} else {
-			$columnSchemas = [];
-		}
-
-		foreach ($columns as $i => $name) {
-			$columns[$i] = $this->db->quoteColumnName($name);
-		}
-
-		$values = [];
-		foreach ($rows as $row) {
-			$vs = [];
-			foreach ($row as $i => $value) {
-				if (!is_array($value) && isset($columnSchemas[$columns[$i]])) {
-					$value = $columnSchemas[$columns[$i]]->typecast($value);
-				}
-				$vs[] = is_string($value) ? $this->db->quoteValue($value) : $value;
-			}
-			$values[] = '(' . implode(', ', $vs) . ')';
-		}
-
-		return 'INSERT INTO ' . $this->db->quoteTableName($table)
-			. ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
-	}
 }
diff --git a/framework/yii/db/mysql/QueryBuilder.php b/framework/yii/db/mysql/QueryBuilder.php
index 50e717c..27df567 100644
--- a/framework/yii/db/mysql/QueryBuilder.php
+++ b/framework/yii/db/mysql/QueryBuilder.php
@@ -140,51 +140,4 @@ class QueryBuilder extends \yii\db\QueryBuilder
 	{
 		return 'SET FOREIGN_KEY_CHECKS = ' . ($check ? 1 : 0);
 	}
-
-	/**
-	 * Generates a batch INSERT SQL statement.
-	 * For example,
-	 *
-	 * ~~~
-	 * $connection->createCommand()->batchInsert('tbl_user', ['name', 'age'], [
-	 *     ['Tom', 30],
-	 *     ['Jane', 20],
-	 *     ['Linda', 25],
-	 * ])->execute();
-	 * ~~~
-	 *
-	 * Note that the values in each row must match the corresponding column names.
-	 *
-	 * @param string $table the table that new rows will be inserted into.
-	 * @param array $columns the column names
-	 * @param array $rows the rows to be batch inserted into the table
-	 * @return string the batch INSERT SQL statement
-	 */
-	public function batchInsert($table, $columns, $rows)
-	{
-		if (($tableSchema = $this->db->getTableSchema($table)) !== null) {
-			$columnSchemas = $tableSchema->columns;
-		} else {
-			$columnSchemas = [];
-		}
-
-		foreach ($columns as $i => $name) {
-			$columns[$i] = $this->db->quoteColumnName($name);
-		}
-
-		$values = [];
-		foreach ($rows as $row) {
-			$vs = [];
-			foreach ($row as $i => $value) {
-				if (!is_array($value) && isset($columnSchemas[$columns[$i]])) {
-					$value = $columnSchemas[$columns[$i]]->typecast($value);
-				}
-				$vs[] = is_string($value) ? $this->db->quoteValue($value) : $value;
-			}
-			$values[] = '(' . implode(', ', $vs) . ')';
-		}
-
-		return 'INSERT INTO ' . $this->db->quoteTableName($table)
-			. ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
-	}
 }