From 21014b40644fe165c451600d413800c2508bf9bf Mon Sep 17 00:00:00 2001 From: Panagiotis Moustafellos Date: Tue, 26 Nov 2013 04:56:07 +0200 Subject: [PATCH] swapped docs and Exception to type InvalidParamException --- extensions/sphinx/QueryBuilder.php | 5 +++-- framework/yii/db/QueryBuilder.php | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extensions/sphinx/QueryBuilder.php b/extensions/sphinx/QueryBuilder.php index e21e620..586b3a5 100644 --- a/extensions/sphinx/QueryBuilder.php +++ b/extensions/sphinx/QueryBuilder.php @@ -7,6 +7,7 @@ namespace yii\sphinx; +use yii\base\InvalidParamException; use yii\base\Object; use yii\db\Exception; use yii\db\Expression; @@ -760,12 +761,12 @@ class QueryBuilder extends Object * operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`. * @param array $params the binding parameters to be populated * @return string the generated SQL expression - * @throws Exception if wrong number of operands have been given. + * @throws InvalidParamException if wrong number of operands have been given. */ public function buildLikeCondition($indexes, $operator, $operands, &$params) { if (!isset($operands[0], $operands[1])) { - throw new Exception("Operator '$operator' requires two operands."); + throw new InvalidParamException("Operator '$operator' requires two operands."); } list($column, $values) = $operands; diff --git a/framework/yii/db/QueryBuilder.php b/framework/yii/db/QueryBuilder.php index 55f4ace..c4837fc 100644 --- a/framework/yii/db/QueryBuilder.php +++ b/framework/yii/db/QueryBuilder.php @@ -300,7 +300,7 @@ class QueryBuilder extends \yii\base\Object { return "DROP TABLE " . $this->db->quoteTableName($table); } - + /** * Builds a SQL statement for adding a primary key constraint to an existing table. * @param string $name the name of the primary key constraint. @@ -317,12 +317,12 @@ class QueryBuilder extends \yii\base\Object foreach ($columns as $i => $col) { $columns[$i] = $this->db->quoteColumnName($col); } - + return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' ADD CONSTRAINT ' . $this->db->quoteColumnName($name) . ' PRIMARY KEY (' . implode(', ', $columns). ' )'; } - + /** * Builds a SQL statement for removing a primary key constraint to an existing table. * @param string $name the name of the primary key constraint to be removed. @@ -999,7 +999,7 @@ class QueryBuilder extends \yii\base\Object * operator is `LIKE` or `OR LIKE` and empty if operator is `NOT LIKE` or `OR NOT LIKE`. * @param array $params the binding parameters to be populated * @return string the generated SQL expression - * @throws Exception if wrong number of operands have been given. + * @throws InvalidParamException if wrong number of operands have been given. */ public function buildLikeCondition($operator, $operands, &$params) {