From c6ef7ec9d5acd00720cb306018960244dcd08938 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Fri, 6 Sep 2013 11:40:29 +0200
Subject: [PATCH] moved Command::getPdoType() to Schema

this allows different implementation in different DBMS

CUBRID does not supprt PDO::TYPE_BOOL, so we use STRING here which will
be casted by the DBMS
---
 framework/yii/db/Command.php             | 25 +++----------------------
 framework/yii/db/Schema.php              | 19 +++++++++++++++++++
 framework/yii/db/cubrid/QueryBuilder.php |  2 +-
 framework/yii/db/cubrid/Schema.php       | 19 +++++++++++++++++++
 4 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/framework/yii/db/Command.php b/framework/yii/db/Command.php
index c439775..7f2d81d 100644
--- a/framework/yii/db/Command.php
+++ b/framework/yii/db/Command.php
@@ -181,7 +181,7 @@ class Command extends \yii\base\Component
 	{
 		$this->prepare();
 		if ($dataType === null) {
-			$this->pdoStatement->bindParam($name, $value, $this->getPdoType($value));
+			$this->pdoStatement->bindParam($name, $value, $this->db->schema->getPdoType($value));
 		} elseif ($length === null) {
 			$this->pdoStatement->bindParam($name, $value, $dataType);
 		} elseif ($driverOptions === null) {
@@ -208,7 +208,7 @@ class Command extends \yii\base\Component
 	{
 		$this->prepare();
 		if ($dataType === null) {
-			$this->pdoStatement->bindValue($name, $value, $this->getPdoType($value));
+			$this->pdoStatement->bindValue($name, $value, $this->db->schema->getPdoType($value));
 		} else {
 			$this->pdoStatement->bindValue($name, $value, $dataType);
 		}
@@ -236,7 +236,7 @@ class Command extends \yii\base\Component
 					$type = $value[1];
 					$value = $value[0];
 				} else {
-					$type = $this->getPdoType($value);
+					$type = $this->db->schema->getPdoType($value);
 				}
 				$this->pdoStatement->bindValue($name, $value, $type);
 				$this->_params[$name] = $value;
@@ -246,25 +246,6 @@ class Command extends \yii\base\Component
 	}
 
 	/**
-	 * Determines the PDO type for the give PHP data value.
-	 * @param mixed $data the data whose PDO type is to be determined
-	 * @return integer the PDO type
-	 * @see http://www.php.net/manual/en/pdo.constants.php
-	 */
-	private function getPdoType($data)
-	{
-		static $typeMap = array(
-			'boolean' => \PDO::PARAM_BOOL,
-			'integer' => \PDO::PARAM_INT,
-			'string' => \PDO::PARAM_STR,
-			'resource' => \PDO::PARAM_LOB,
-			'NULL' => \PDO::PARAM_NULL,
-		);
-		$type = gettype($data);
-		return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
-	}
-
-	/**
 	 * Executes the SQL statement.
 	 * This method should only be used for executing non-query SQL statement, such as `INSERT`, `DELETE`, `UPDATE` SQLs.
 	 * No result set will be returned.
diff --git a/framework/yii/db/Schema.php b/framework/yii/db/Schema.php
index 4fd1cd1..9839144 100644
--- a/framework/yii/db/Schema.php
+++ b/framework/yii/db/Schema.php
@@ -376,4 +376,23 @@ abstract class Schema extends Object
 			return 'string';
 		}
 	}
+
+	/**
+	 * Determines the PDO type for the give PHP data value.
+	 * @param mixed $data the data whose PDO type is to be determined
+	 * @return integer the PDO type
+	 * @see http://www.php.net/manual/en/pdo.constants.php
+	 */
+	public function getPdoType($data)
+	{
+		static $typeMap = array( // php type => PDO type
+			'boolean' => \PDO::PARAM_BOOL,
+			'integer' => \PDO::PARAM_INT,
+			'string' => \PDO::PARAM_STR,
+			'resource' => \PDO::PARAM_LOB,
+			'NULL' => \PDO::PARAM_NULL,
+		);
+		$type = gettype($data);
+		return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
+	}
 }
diff --git a/framework/yii/db/cubrid/QueryBuilder.php b/framework/yii/db/cubrid/QueryBuilder.php
index 2132b58..4e5121a 100644
--- a/framework/yii/db/cubrid/QueryBuilder.php
+++ b/framework/yii/db/cubrid/QueryBuilder.php
@@ -10,7 +10,7 @@ namespace yii\db\cubrid;
 use yii\base\InvalidParamException;
 
 /**
- * QueryBuilder is the query builder for CUBRID databases.
+ * QueryBuilder is the query builder for CUBRID databases (version 9.1.x and higher).
  *
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
diff --git a/framework/yii/db/cubrid/Schema.php b/framework/yii/db/cubrid/Schema.php
index f0b909b..a423296 100644
--- a/framework/yii/db/cubrid/Schema.php
+++ b/framework/yii/db/cubrid/Schema.php
@@ -243,4 +243,23 @@ class Schema extends \yii\db\Schema
 		}
 		return $tableNames;
 	}
+
+	/**
+	 * Determines the PDO type for the give PHP data value.
+	 * @param mixed $data the data whose PDO type is to be determined
+	 * @return integer the PDO type
+	 * @see http://www.php.net/manual/en/pdo.constants.php
+	 */
+	public function getPdoType($data)
+	{
+		static $typeMap = array(
+			'boolean' => \PDO::PARAM_STR, // CUBRID PDO does not support PARAM_BOOL
+			'integer' => \PDO::PARAM_INT,
+			'string' => \PDO::PARAM_STR,
+			'resource' => \PDO::PARAM_LOB,
+			'NULL' => \PDO::PARAM_NULL,
+		);
+		$type = gettype($data);
+		return isset($typeMap[$type]) ? $typeMap[$type] : \PDO::PARAM_STR;
+	}
 }