summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorbrian978 <dbrian89@yahoo.com>2012-12-18 12:23:14 +0100
committerbrian978 <dbrian89@yahoo.com>2012-12-18 12:23:14 +0100
commit0fb101849e53593fdceb7064f32ea5176e6eed16 (patch)
treee33629f2352da2715d559364af955d6dda59d203 /system/database
parent07ccbe59cf9d78d944551f810a14064e979840a3 (diff)
parentd8dba5d3ecbe1ff4502b04a9cf3086908db140d1 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php4
-rw-r--r--system/database/DB_query_builder.php68
-rw-r--r--system/database/drivers/cubrid/cubrid_forge.php2
3 files changed, 37 insertions, 37 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 59c3baf8b..5c782f875 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -229,7 +229,7 @@ abstract class CI_DB_forge {
*
* @param string $key
* @param bool $primary
- * @return object
+ * @return CI_DB_forge
*/
public function add_key($key = '', $primary = FALSE)
{
@@ -266,7 +266,7 @@ abstract class CI_DB_forge {
* Add Field
*
* @param array $field
- * @return object
+ * @return CI_DB_forge
*/
public function add_field($field = '')
{
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index b0e86ed2c..1aa73baab 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -254,7 +254,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string
* @param mixed
- * @return object
+ * @return CI_DB_query_builder
*/
public function select($select = '*', $escape = NULL)
{
@@ -296,7 +296,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_max($select = '', $alias = '')
{
@@ -312,7 +312,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_min($select = '', $alias = '')
{
@@ -328,7 +328,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_avg($select = '', $alias = '')
{
@@ -344,7 +344,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
- * @return object
+ * @return CI_DB_query_builder
*/
public function select_sum($select = '', $alias = '')
{
@@ -364,7 +364,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $select Field name
* @param string $alias
* @param string $type
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX')
{
@@ -426,7 +426,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Sets a flag which tells the query string compiler to add DISTINCT
*
* @param bool $val
- * @return object
+ * @return CI_DB_query_builder
*/
public function distinct($val = TRUE)
{
@@ -442,7 +442,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Generates the FROM portion of the query
*
* @param mixed $from can be a string or array
- * @return object
+ * @return CI_DB_query_builder
*/
public function from($from)
{
@@ -496,7 +496,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string the join condition
* @param string the type of join
* @param string whether not to try to escape identifiers
- * @return object
+ * @return CI_DB_query_builder
*/
public function join($table, $cond, $type = '', $escape = NULL)
{
@@ -584,7 +584,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function where($key, $value = NULL, $escape = NULL)
{
@@ -602,7 +602,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where($key, $value = NULL, $escape = NULL)
{
@@ -624,7 +624,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed $value
* @param string $type
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = NULL)
{
@@ -685,7 +685,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function where_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -703,7 +703,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -721,7 +721,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -739,7 +739,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key The field to search
* @param array $values The values searched on
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@@ -761,7 +761,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param bool $not If the statement would be IN or NOT IN
* @param string $type
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ', $escape = NULL)
{
@@ -813,7 +813,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -832,7 +832,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -851,7 +851,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -870,7 +870,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@@ -893,7 +893,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $side
* @param string $not
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '', $escape = NULL)
{
@@ -952,7 +952,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $not (Internal use only)
* @param string $type (Internal use only)
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_start($not = '', $type = 'AND ')
{
@@ -979,7 +979,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but ORs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_group_start()
{
@@ -991,7 +991,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but NOTs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function not_group_start()
{
@@ -1003,7 +1003,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but OR NOTs the group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function or_not_group_start()
{
@@ -1015,7 +1015,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Ends a query group
*
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_end()
{
@@ -1065,7 +1065,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $by
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function group_by($by, $escape = NULL)
{
@@ -1140,7 +1140,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $orderby
* @param string $direction ASC or DESC
* @param bool $escape
- * @return object
+ * @return CI_DB_query_builder
*/
public function order_by($orderby, $direction = '', $escape = NULL)
{
@@ -1198,7 +1198,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param int $value LIMIT value
* @param int $offset OFFSET value
- * @return object
+ * @return CI_DB_query_builder
*/
public function limit($value, $offset = FALSE)
{
@@ -1214,7 +1214,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Sets the OFFSET value
*
* @param int $offset OFFSET value
- * @return object
+ * @return CI_DB_query_builder
*/
public function offset($offset)
{
@@ -1247,7 +1247,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set($key, $value = '', $escape = NULL)
{
@@ -1469,7 +1469,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set_insert_batch($key, $value = '', $escape = NULL)
{
@@ -1860,7 +1860,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param array
* @param string
* @param bool
- * @return object
+ * @return CI_DB_query_builder
*/
public function set_update_batch($key, $index = '', $escape = NULL)
{
diff --git a/system/database/drivers/cubrid/cubrid_forge.php b/system/database/drivers/cubrid/cubrid_forge.php
index 2a737c5ed..db1ce5f70 100644
--- a/system/database/drivers/cubrid/cubrid_forge.php
+++ b/system/database/drivers/cubrid/cubrid_forge.php
@@ -109,7 +109,7 @@ class CI_DB_cubrid_forge extends CI_DB_forge {
else
{
$alter_type = empty($field[$i]['new_name']) ? ' MODIFY ' : ' CHANGE ';
- $sqls[] = $sql.$alter_type$this->_process_column($field[$i]);
+ $sqls[] = $sql.$alter_type.$this->_process_column($field[$i]);
}
}