Skip to content

Fix some side issue #1950

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

Merged
merged 3 commits into from
Apr 19, 2019
Merged

Fix some side issue #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe90c7e
Fix some side issue
vibbow Apr 17, 2019
be7ce77
Fix _like_statement from private to protected
vibbow Apr 17, 2019
904cc34
fix side issue
vibbow Apr 18, 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
2 changes: 1 addition & 1 deletion system/Database/BaseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
*
* @return string $like_statement
*/
public function _like_statement(string $prefix = null, string $column, string $not = null, string $bind, bool $insensitiveSearch = false): string
protected function _like_statement(string $prefix = null, string $column, string $not = null, string $bind, bool $insensitiveSearch = false): string
{
$like_statement = "{$prefix} {$column} {$not} LIKE :{$bind}:";

Expand Down
16 changes: 8 additions & 8 deletions system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, bool $prot
*
* This function escapes column and table names
*
* @param mixed
* @param mixed $item
*
* @return mixed
*/
Expand Down Expand Up @@ -1442,7 +1442,7 @@ public function escapeString($str, bool $like = false)
* specific escaping for LIKE conditions
*
* @param string|string[]
* @return mixed
* @return string|string[]
*/
public function escapeLikeString($str)
{
Expand Down Expand Up @@ -1507,19 +1507,19 @@ public function callFunction(string $functionName, ...$params): bool
/**
* Returns an array of table names
*
* @param boolean $constrain_by_prefix = FALSE
* @param boolean $constrainByPrefix = FALSE
* @return boolean|array
* @throws \CodeIgniter\Database\Exceptions\DatabaseException
*/
public function listTables(bool $constrain_by_prefix = false)
public function listTables(bool $constrainByPrefix = false)
{
// Is there a cached result?
if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
{
return $this->dataCache['table_names'];
}

if (false === ($sql = $this->_listTables($constrain_by_prefix)))
if (false === ($sql = $this->_listTables($constrainByPrefix)))
{
if ($this->DBDebug)
{
Expand Down Expand Up @@ -1567,12 +1567,12 @@ public function listTables(bool $constrain_by_prefix = false)
/**
* Determine if a particular table exists
*
* @param string $table_name
* @param string $tableName
* @return boolean
*/
public function tableExists(string $table_name): bool
public function tableExists(string $tableName): bool
{
return in_array($this->protectIdentifiers($table_name, true, false, false), $this->listTables());
return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables());
}

//--------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions system/Entity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

use CodeIgniter\I18n\Time;
use CodeIgniter\Exceptions\CastException;
use CodeIgniter\Exceptions\EntityException;

/**
* Entity encapsulation, for use with CodeIgniter\Model
Expand Down