Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add optional parameter to like(), or_like(), not_like() and or_not_like() methods. #5643

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Add optional parameter to like(), or_like(), not_like() and or_not_like() methods. #5643

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a6050a
Add optional parameter called $clause to like(), or_like(), not_like(…
nalakapws Nov 27, 2018
32f4d44
Introduce new having_like(), or_having_like(), not_having_like() and …
nalakapws Dec 13, 2018
da0e2b6
Trim trailing whitespaces and convert indentation to spaces(4).
nalakapws Dec 17, 2018
42e5834
Cleanup whitespaces(Spaces and Tabs) according to Codeigniter's style…
nalakapws Dec 17, 2018
d4f969c
Introduce new having_group_start(), or_having_group_start(), not_havi…
nalakapws Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 202 additions & 12 deletions system/database/DB_query_builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @var array
*/
protected $qb_cache_aliased_tables = array();
protected $qb_cache_aliased_tables = array();

/**
* QB Cache WHERE data
Expand Down Expand Up @@ -999,24 +999,105 @@ public function or_not_like($field, $match = '', $side = 'both', $escape = NULL)

// --------------------------------------------------------------------

/**
* LIKE with HAVING clause
*
* Generates a %LIKE% portion of the query.
* Separates multiple calls with 'AND'.
*
* @param mixed $field
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
*/
public function having_like($field, $match = '', $side = 'both', $escape = NULL)
narfbg marked this conversation as resolved.
Show resolved Hide resolved
{
return $this->_like($field, $match, 'AND ', $side, '', $escape, 'having');
}

// --------------------------------------------------------------------
narfbg marked this conversation as resolved.
Show resolved Hide resolved

/**
* NOT LIKE with HAVING clause
*
* Generates a NOT LIKE portion of the query.
* Separates multiple calls with 'AND'.
*
* @param mixed $field
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
*/
public function not_having_like($field, $match = '', $side = 'both', $escape = NULL)
narfbg marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be having_not_like instead.
Same thing applies to all other methods below - not should always be after having in the name.

{
return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, 'having');
}

// --------------------------------------------------------------------

/**
* OR LIKE with HAVING clause
*
* Generates a %LIKE% portion of the query.
* Separates multiple calls with 'OR'.
*
* @param mixed $field
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
*/
public function or_having_like($field, $match = '', $side = 'both', $escape = NULL)
narfbg marked this conversation as resolved.
Show resolved Hide resolved
{
return $this->_like($field, $match, 'OR ', $side, '', $escape, 'having');
}

// --------------------------------------------------------------------

/**
* OR NOT LIKE with HAVING clause
*
* Generates a NOT LIKE portion of the query.
* Separates multiple calls with 'OR'.
*
* @param mixed $field
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
*/
public function or_not_having_like($field, $match = '', $side = 'both', $escape = NULL)
narfbg marked this conversation as resolved.
Show resolved Hide resolved
{
return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, 'having');
}

// --------------------------------------------------------------------

/**
* Internal LIKE
*
* @used-by like()
* @used-by or_like()
* @used-by not_like()
* @used-by or_not_like()
* @used-by having_like()
* @used-by or_having_like()
* @used-by not_having_like()
* @used-by or_not_having_like()
*
* @param mixed $field
* @param string $match
* @param string $type
* @param string $side
* @param string $not
* @param bool $escape
* @param string $clause
* @return CI_DB_query_builder
*/
protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '', $escape = NULL)
{
protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '', $escape = NULL, $clause = 'where')
{
if ( ! is_array($field))
{
$field = array($field => $match);
Expand All @@ -1028,9 +1109,6 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n

foreach ($field as $k => $v)
{
$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0)
? $this->_group_get_type('') : $this->_group_get_type($type);

if ($escape === TRUE)
{
$v = $this->escape_like_str($v);
Expand Down Expand Up @@ -1059,17 +1137,38 @@ protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $n
$v .= sprintf($this->_like_escape_str, $this->_like_escape_chr);
}

$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE {$v}", 'value' => NULL, 'escape' => $escape);
$this->qb_where[] = $qb_where;
if ($this->qb_caching === TRUE)
switch ($clause)
{
$this->qb_cache_where[] = $qb_where;
$this->qb_cache_exists[] = 'where';
case 'having':
$prefix = (count($this->qb_having) === 0 && count($this->qb_cache_having) === 0)
? $this->_group_get_type('') : $this->_group_get_type($type);

$qb_having = array('condition' => "{$prefix} {$k} {$not} LIKE {$v}", 'value' => NULL, 'escape' => $escape);
$this->qb_having[] = $qb_having;
if ($this->qb_caching === TRUE)
{
$this->qb_cache_having[] = $qb_having;
$this->qb_cache_exists[] = 'having';
}
break;
case 'where':
default:
$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0)
? $this->_group_get_type('') : $this->_group_get_type($type);

$qb_where = array('condition' => "{$prefix} {$k} {$not} LIKE {$v}", 'value' => NULL, 'escape' => $escape);
$this->qb_where[] = $qb_where;
if ($this->qb_caching === TRUE)
{
$this->qb_cache_where[] = $qb_where;
$this->qb_cache_exists[] = 'where';
}
break;
}
}

return $this;
}
}

// --------------------------------------------------------------------

Expand Down Expand Up @@ -1164,6 +1263,97 @@ public function group_end()

// --------------------------------------------------------------------

/**
* Starts a query group for HAVING clause.
*
* @param string $not (Internal use only)
* @param string $type (Internal use only)
* @return CI_DB_query_builder
*/
public function having_group_start($not = '', $type = 'AND ')
narfbg marked this conversation as resolved.
Show resolved Hide resolved
{
$type = $this->_group_get_type($type);

$this->qb_where_group_started = TRUE;
$prefix = (count($this->qb_having) === 0 && count($this->qb_cache_having) === 0) ? '' : $type;
$having = array(
narfbg marked this conversation as resolved.
Show resolved Hide resolved
'condition' => $prefix.$not.str_repeat(' ', ++$this->qb_where_group_count).' (',
'value' => NULL,
'escape' => FALSE
);

$this->qb_having[] = $having;
if ($this->qb_caching)
{
$this->qb_cache_having[] = $having;
}

return $this;
}

// --------------------------------------------------------------------

/**
* Starts a query group for HAVING clause, but ORs the group.
*
* @return CI_DB_query_builder
*/
public function or_having_group_start()
{
return $this->having_group_start('', 'OR ');
}

// --------------------------------------------------------------------

/**
* Starts a query group for HAVING clause, but NOTs the group.
*
* @return CI_DB_query_builder
*/
public function not_having_group_start()
{
return $this->having_group_start('NOT ', 'AND ');
}

// --------------------------------------------------------------------

/**
* Starts a query group for HAVING clause, but OR NOTs the group.
*
* @return CI_DB_query_builder
*/
public function or_not_having_group_start()
{
return $this->having_group_start('NOT ', 'OR ');
}

// --------------------------------------------------------------------

/**
* Ends a query group for HAVING clause.
*
* @return CI_DB_query_builder
*/
public function having_group_end()
{
$this->qb_where_group_started = FALSE;
$having = array(
'condition' => str_repeat(' ', $this->qb_where_group_count--).')',
'value' => NULL,
'escape' => FALSE
);

$this->qb_having[] = $having;
if ($this->qb_caching)
{
$this->qb_cache_having[] = $having;
}

return $this;
}

// --------------------------------------------------------------------

/**
* Group_get_type
*
Expand Down