FuzeWorks/Core
FuzeWorks
/
Core
1
0
Fork 0
Code Issues 9 Pull Requests Packages Releases Activity

Changed classnames to FuzeWorks prefix.

This commit is contained in:
Abel Hoogeveen 2016-05-20 21:59:28 +02:00
parent aa35631719
commit d3391ddaa0
80 changed files with 249 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/Database/DB.php
View File

@ -149,25 +149,25 @@ function &DB($params = '', $query_builder_override = NULL)
if ( ! isset($query_builder) OR $query_builder === TRUE)
{
require_once('Core'.DS.'Database'.DS.'DB_query_builder.php');
if ( ! class_exists('CI_DB', FALSE))
if ( ! class_exists('FW_DB', FALSE))
{
/**
* CI_DB
* FW_DB
*
* Acts as an alias for both CI_DB_driver and CI_DB_query_builder.
* Acts as an alias for both FW_DB_driver and FW_DB_query_builder.
*
* @see CI_DB_query_builder
* @see CI_DB_driver
* @see FW_DB_query_builder
* @see FW_DB_driver
*/
class CI_DB extends CI_DB_query_builder { }
class FW_DB extends FW_DB_query_builder { }
}
}
elseif ( ! class_exists('CI_DB', FALSE))
elseif ( ! class_exists('FW_DB', FALSE))
{
/**
* @ignore
*/
class CI_DB extends CI_DB_driver { }
class FW_DB extends FW_DB_driver { }
}
// Load the DB driver
@ -181,7 +181,7 @@ function &DB($params = '', $query_builder_override = NULL)
require_once($driver_file);
// Instantiate the DB adapter
$driver = 'CI_DB_'.$params['dbdriver'].'_driver';
$driver = 'FW_DB_'.$params['dbdriver'].'_driver';
$DB = new $driver($params);
// Check for a subdriver
@ -192,7 +192,7 @@ function &DB($params = '', $query_builder_override = NULL)
if (file_exists($driver_file))
{
require_once($driver_file);
$driver = 'CI_DB_'.$DB->dbdriver.'_'.$DB->subdriver.'_driver';
$driver = 'FW_DB_'.$DB->dbdriver.'_'.$DB->subdriver.'_driver';
$DB = new $driver($params);
}
}

2
Core/Database/DB_cache.php
View File

@ -45,7 +45,7 @@ use FuzeWorks\Logger;
* @license http://opensource.org/licenses/MIT MIT License
* @todo Fix URI
*/
class CI_DB_Cache {
class FW_DB_Cache {
/**
* CI Singleton

20
Core/Database/DB_driver.php
View File

@ -50,7 +50,7 @@ use FuzeWorks\Helpers;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
abstract class CI_DB_driver {
abstract class FW_DB_driver {
/**
* Data Source Name / Connect string
@ -97,7 +97,7 @@ abstract class CI_DB_driver {
/**
* Sub-driver
*
* @used-by CI_DB_pdo_driver
* @used-by FW_DB_pdo_driver
* @var string
*/
public $subdriver;
@ -209,7 +209,7 @@ abstract class CI_DB_driver {
/**
* Queries list
*
* @see CI_DB_driver::$save_queries
* @see FW_DB_driver::$save_queries
* @var string[]
*/
public $queries = array();
@ -295,7 +295,7 @@ abstract class CI_DB_driver {
/**
* DB Cache object
*
* @see CI_DB_cache
* @see FW_DB_cache
* @var object
*/
public $CACHE;
@ -347,8 +347,8 @@ abstract class CI_DB_driver {
/**
* COUNT string
*
* @used-by CI_DB_driver::count_all()
* @used-by CI_DB_query_builder::count_all_results()
* @used-by FW_DB_driver::count_all()
* @used-by FW_DB_query_builder::count_all_results()
*
* @var string
*/
@ -732,7 +732,7 @@ abstract class CI_DB_driver {
// resource ID won't be any good once we've cached the
// result object, so we'll have to compile the data
// and save it)
$CR = new CI_DB_result($this);
$CR = new FW_DB_result($this);
$CR->result_object = $RES->result_object();
$CR->result_array = $RES->result_array();
$CR->num_rows = $RES->num_rows();
@ -756,7 +756,7 @@ abstract class CI_DB_driver {
*/
public function load_rdriver()
{
$driver = 'CI_DB_'.$this->dbdriver.'_result';
$driver = 'FW_DB_'.$this->dbdriver.'_result';
if ( ! class_exists($driver, FALSE))
{
@ -1685,7 +1685,7 @@ abstract class CI_DB_driver {
*/
protected function _cache_init()
{
if ( ! class_exists('CI_DB_Cache', FALSE))
if ( ! class_exists('FW_DB_Cache', FALSE))
{
require_once('Core'.DS.'Database'.DS.'DB_cache.php');
}
@ -1694,7 +1694,7 @@ abstract class CI_DB_driver {
return TRUE;
}
$this->CACHE = new CI_DB_Cache($this); // pass db object to support multiple db connections and returned db objects
$this->CACHE = new FW_DB_Cache($this); // pass db object to support multiple db connections and returned db objects
return TRUE;
}

6
Core/Database/DB_forge.php
View File

@ -44,7 +44,7 @@ use FuzeWorks\DatabaseException;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
abstract class CI_DB_forge {
abstract class FW_DB_forge {
/**
* Database object
@ -235,7 +235,7 @@ abstract class CI_DB_forge {
*
* @param string $key
* @param bool $primary
* @return CI_DB_forge
* @return FW_DB_forge
*/
public function add_key($key, $primary = FALSE)
{
@ -273,7 +273,7 @@ abstract class CI_DB_forge {
* Add Field
*
* @param array $field
* @return CI_DB_forge
* @return FW_DB_forge
*/
public function add_field($field)
{

88
Core/Database/DB_query_builder.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\DatabaseException;
* @license http://opensource.org/licenses/MIT MIT License
*/
abstract class CI_DB_query_builder extends CI_DB_driver {
abstract class FW_DB_query_builder extends FW_DB_driver {
/**
* Return DELETE SQL flag
@ -264,7 +264,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string
* @param mixed
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function select($select = '*', $escape = NULL)
{
@ -306,7 +306,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function select_max($select = '', $alias = '')
{
@ -322,7 +322,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function select_min($select = '', $alias = '')
{
@ -338,7 +338,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function select_avg($select = '', $alias = '')
{
@ -354,7 +354,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string the field
* @param string an alias
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function select_sum($select = '', $alias = '')
{
@ -374,7 +374,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $select Field name
* @param string $alias
* @param string $type
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
protected function _max_min_avg_sum($select = '', $alias = '', $type = 'MAX')
{
@ -436,7 +436,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function distinct($val = TRUE)
{
@ -452,7 +452,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function from($from)
{
@ -506,7 +506,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function join($table, $cond, $type = '', $escape = NULL)
{
@ -601,7 +601,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function where($key, $value = NULL, $escape = NULL)
{
@ -619,7 +619,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param mixed
* @param bool
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_where($key, $value = NULL, $escape = NULL)
{
@ -641,7 +641,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed $value
* @param string $type
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
protected function _wh($qb_key, $key, $value = NULL, $type = 'AND ', $escape = NULL)
{
@ -706,7 +706,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function where_in($key = NULL, $values = NULL, $escape = NULL)
{
@ -724,7 +724,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_where_in($key = NULL, $values = NULL, $escape = NULL)
{
@ -742,7 +742,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@ -760,7 +760,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_where_not_in($key = NULL, $values = NULL, $escape = NULL)
{
@ -782,7 +782,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 CI_DB_query_builder
* @return FW_DB_query_builder
*/
protected function _where_in($key = NULL, $values = NULL, $not = FALSE, $type = 'AND ', $escape = NULL)
{
@ -844,7 +844,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function like($field, $match = '', $side = 'both', $escape = NULL)
{
@ -863,7 +863,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@ -882,7 +882,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_like($field, $match = '', $side = 'both', $escape = NULL)
{
@ -901,7 +901,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $match
* @param string $side
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_not_like($field, $match = '', $side = 'both', $escape = NULL)
{
@ -924,7 +924,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $side
* @param string $not
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
protected function _like($field, $match = '', $type = 'AND ', $side = 'both', $not = '', $escape = NULL)
{
@ -988,7 +988,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $not (Internal use only)
* @param string $type (Internal use only)
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function group_start($not = '', $type = 'AND ')
{
@ -1015,7 +1015,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but ORs the group
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_group_start()
{
@ -1027,7 +1027,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but NOTs the group
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function not_group_start()
{
@ -1039,7 +1039,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Starts a query group, but OR NOTs the group
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_not_group_start()
{
@ -1051,7 +1051,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
/**
* Ends a query group
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function group_end()
{
@ -1101,7 +1101,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param string $by
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function group_by($by, $escape = NULL)
{
@ -1144,7 +1144,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key
* @param string $value
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function having($key, $value = NULL, $escape = NULL)
{
@ -1161,7 +1161,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $key
* @param string $value
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function or_having($key, $value = NULL, $escape = NULL)
{
@ -1176,7 +1176,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $orderby
* @param string $direction ASC, DESC or RANDOM
* @param bool $escape
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function order_by($orderby, $direction = '', $escape = NULL)
{
@ -1234,7 +1234,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* @param int $value LIMIT value
* @param int $offset OFFSET value
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function limit($value, $offset = 0)
{
@ -1250,7 +1250,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Sets the OFFSET value
*
* @param int $offset OFFSET value
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function offset($offset)
{
@ -1283,7 +1283,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function set($key, $value = '', $escape = NULL)
{
@ -1345,7 +1345,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string the table
* @param string the limit clause
* @param string the offset clause
* @return CI_DB_result
* @return FW_DB_result
*/
public function get($table = '', $limit = NULL, $offset = NULL)
{
@ -1395,7 +1395,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
}
$result = ($this->qb_distinct === TRUE)
? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results")
? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) FW_count_all_results")
: $this->query($this->_compile_select($this->_count_string.$this->protect_identifiers('numrows')));
if ($reset === TRUE)
@ -1428,7 +1428,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param string $where
* @param int $limit
* @param int $offset
* @return CI_DB_result
* @return FW_DB_result
*/
public function get_where($table = '', $where = NULL, $limit = NULL, $offset = NULL)
{
@ -1530,7 +1530,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param mixed
* @param string
* @param bool
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function set_insert_batch($key, $value = '', $escape = NULL)
{
@ -1970,7 +1970,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* @param array
* @param string
* @param bool
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function set_update_batch($key, $index = '', $escape = NULL)
{
@ -2565,7 +2565,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* Starts QB caching
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function start_cache()
{
@ -2580,7 +2580,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* Stops QB caching
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function stop_cache()
{
@ -2595,7 +2595,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* Empties the QB cache
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function flush_cache()
{
@ -2706,7 +2706,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* Publicly-visible method to reset the QB values.
*
* @return CI_DB_query_builder
* @return FW_DB_query_builder
*/
public function reset_query()
{

2
Core/Database/DB_result.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\DatabaseException;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_result {
class FW_DB_result {
/**
* Connection ID

2
Core/Database/DB_utility.php
View File

@ -46,7 +46,7 @@ use FuzeWorks\DatabaseException;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
abstract class CI_DB_utility {
abstract class FW_DB_utility {
/**
* Database object

2
Core/Database/drivers/cubrid/cubrid_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_cubrid_driver extends CI_DB {
class FW_DB_cubrid_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/cubrid/cubrid_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_cubrid_forge extends CI_DB_forge {
class FW_DB_cubrid_forge extends FW_DB_forge {
/**
* CREATE DATABASE statement

4
Core/Database/drivers/cubrid/cubrid_result.php
View File

@ -33,7 +33,7 @@
/**
* CUBRID Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_cubrid_result extends CI_DB_result {
class FW_DB_cubrid_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/cubrid/cubrid_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_cubrid_utility extends CI_DB_utility {
class FW_DB_cubrid_utility extends FW_DB_utility {
/**
* List databases

2
Core/Database/drivers/ibase/ibase_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_ibase_driver extends CI_DB {
class FW_DB_ibase_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/ibase/ibase_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_ibase_forge extends CI_DB_forge {
class FW_DB_ibase_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/ibase/ibase_result.php
View File

@ -33,7 +33,7 @@
/**
* Interbase/Firebird Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_ibase_result extends CI_DB_result {
class FW_DB_ibase_result extends FW_DB_result {
/**
* Number of fields in the result set

2
Core/Database/drivers/ibase/ibase_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_ibase_utility extends CI_DB_utility {
class FW_DB_ibase_utility extends FW_DB_utility {
/**
* Export

12
Core/Database/drivers/mssql/mssql_driver.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\Logger;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mssql_driver extends CI_DB {
class FW_DB_mssql_driver extends FW_DB {
/**
* Database driver
@ -420,7 +420,7 @@ class CI_DB_mssql_driver extends CI_DB {
{
if ($this->qb_limit)
{
return 'WITH ci_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM ci_delete';
return 'WITH fw_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM fw_delete';
}
return parent::_delete($table);
@ -449,7 +449,7 @@ class CI_DB_mssql_driver extends CI_DB {
// We have to strip the ORDER BY clause
$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
// Get the fields to select from our subquery, so that we can avoid FW_rownum appearing in the actual results
if (count($this->qb_select) === 0)
{
$select = '*'; // Inevitable
@ -469,9 +469,9 @@ class CI_DB_mssql_driver extends CI_DB {
}
return 'SELECT '.$select." FROM (\n\n"
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('CI_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('CI_subquery')
."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('FW_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('FW_subquery')
."\nWHERE ".$this->escape_identifiers('FW_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
}
return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql);

2
Core/Database/drivers/mssql/mssql_forge.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mssql_forge extends CI_DB_forge {
class FW_DB_mssql_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/mssql/mssql_result.php
View File

@ -33,7 +33,7 @@
/**
* MSSQL Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -44,7 +44,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mssql_result extends CI_DB_result {
class FW_DB_mssql_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/mssql/mssql_utility.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mssql_utility extends CI_DB_utility {
class FW_DB_mssql_utility extends FW_DB_utility {
/**
* List databases statement

2
Core/Database/drivers/mysql/mysql_driver.php
View File

@ -49,7 +49,7 @@ use FuzeWorks\DatabaseException;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysql_driver extends CI_DB {
class FW_DB_mysql_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/mysql/mysql_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysql_forge extends CI_DB_forge {
class FW_DB_mysql_forge extends FW_DB_forge {
/**
* CREATE DATABASE statement

4
Core/Database/drivers/mysql/mysql_result.php
View File

@ -33,7 +33,7 @@
/**
* MySQL Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysql_result extends CI_DB_result {
class FW_DB_mysql_result extends FW_DB_result {
/**
* Class constructor

2
Core/Database/drivers/mysql/mysql_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysql_utility extends CI_DB_utility {
class FW_DB_mysql_utility extends FW_DB_utility {
/**
* List databases statement

2
Core/Database/drivers/mysqli/mysqli_driver.php
View File

@ -49,7 +49,7 @@ use FuzeWorks\Core;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysqli_driver extends CI_DB {
class FW_DB_mysqli_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/mysqli/mysqli_forge.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysqli_forge extends CI_DB_forge {
class FW_DB_mysqli_forge extends FW_DB_forge {
/**
* CREATE DATABASE statement

4
Core/Database/drivers/mysqli/mysqli_result.php
View File

@ -33,7 +33,7 @@
/**
* MySQLi Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -44,7 +44,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysqli_result extends CI_DB_result {
class FW_DB_mysqli_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/mysqli/mysqli_utility.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_mysqli_utility extends CI_DB_utility {
class FW_DB_mysqli_utility extends FW_DB_utility {
/**
* List databases statement

7
Core/Database/drivers/oci8/oci8_driver.php
View File

@ -58,7 +58,7 @@ use FuzeWorks\Core;
*
* @author Kelly McArdle
*/
class CI_DB_oci8_driver extends CI_DB {
class FW_DB_oci8_driver extends FW_DB {
/**
* Database driver
@ -86,7 +86,6 @@ class CI_DB_oci8_driver extends CI_DB {
*
* @var int
*/
public $commit_mode = OCI_COMMIT_ON_SUCCESS;
/**
* Limit used flag
@ -127,8 +126,8 @@ class CI_DB_oci8_driver extends CI_DB {
/**
* COUNT string
*
* @used-by CI_DB_driver::count_all()
* @used-by CI_DB_query_builder::count_all_results()
* @used-by FW_DB_driver::count_all()
* @used-by FW_DB_query_builder::count_all_results()
*
* @var string
*/

2
Core/Database/drivers/oci8/oci8_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_oci8_forge extends CI_DB_forge {
class FW_DB_oci8_forge extends FW_DB_forge {
/**
* CREATE DATABASE statement

4
Core/Database/drivers/oci8/oci8_result.php
View File

@ -33,7 +33,7 @@
/**
* oci8 Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_oci8_result extends CI_DB_result {
class FW_DB_oci8_result extends FW_DB_result {
/**
* Statement ID

2
Core/Database/drivers/oci8/oci8_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_oci8_utility extends CI_DB_utility {
class FW_DB_oci8_utility extends FW_DB_utility {
/**
* List databases statement

2
Core/Database/drivers/odbc/odbc_driver.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\Helpers;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_odbc_driver extends CI_DB {
class FW_DB_odbc_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/odbc/odbc_forge.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_odbc_forge extends CI_DB_forge {
class FW_DB_odbc_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/odbc/odbc_result.php
View File

@ -33,7 +33,7 @@
/**
* ODBC Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -44,7 +44,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_odbc_result extends CI_DB_result {
class FW_DB_odbc_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/odbc/odbc_utility.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_odbc_utility extends CI_DB_utility {
class FW_DB_odbc_utility extends FW_DB_utility {
/**
* Export

2
Core/Database/drivers/pdo/pdo_driver.php
View File

@ -50,7 +50,7 @@ use PDOException;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_driver extends CI_DB {
class FW_DB_pdo_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/pdo/pdo_forge.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_forge extends CI_DB_forge {
class FW_DB_pdo_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/pdo/pdo_result.php
View File

@ -33,7 +33,7 @@
/**
* PDO Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -44,7 +44,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_result extends CI_DB_result {
class FW_DB_pdo_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/pdo/pdo_utility.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_utility extends CI_DB_utility {
class FW_DB_pdo_utility extends FW_DB_utility {
/**
* Export

2
Core/Database/drivers/pdo/subdrivers/pdo_4d_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_4d_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_4d_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_4d_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_4d_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_4d_forge extends FW_DB_pdo_forge {
/**
* CREATE DATABASE statement

2
Core/Database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_cubrid_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_cubrid_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_cubrid_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_cubrid_forge extends FW_DB_pdo_forge {
/**
* CREATE DATABASE statement

12
Core/Database/drivers/pdo/subdrivers/pdo_dblib_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_dblib_driver extends FW_DB_pdo_driver {
/**
* Sub-driver
@ -245,7 +245,7 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
{
if ($this->qb_limit)
{
return 'WITH ci_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM ci_delete';
return 'WITH fw_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM fw_delete';
}
return parent::_delete($table);
@ -274,7 +274,7 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
// We have to strip the ORDER BY clause
$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
// Get the fields to select from our subquery, so that we can avoid FW_rownum appearing in the actual results
if (count($this->qb_select) === 0)
{
$select = '*'; // Inevitable
@ -294,9 +294,9 @@ class CI_DB_pdo_dblib_driver extends CI_DB_pdo_driver {
}
return 'SELECT '.$select." FROM (\n\n"
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('CI_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('CI_subquery')
."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('FW_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('FW_subquery')
."\nWHERE ".$this->escape_identifiers('FW_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
}
return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql);

2
Core/Database/drivers/pdo/subdrivers/pdo_dblib_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_dblib_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_dblib_forge extends FW_DB_pdo_forge {
/**
* CREATE TABLE IF statement

2
Core/Database/drivers/pdo/subdrivers/pdo_firebird_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_firebird_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_firebird_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_firebird_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_firebird_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_firebird_forge extends FW_DB_pdo_forge {
/**
* RENAME TABLE statement

2
Core/Database/drivers/pdo/subdrivers/pdo_ibm_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_ibm_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_ibm_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_ibm_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_ibm_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_ibm_forge extends FW_DB_pdo_forge {
/**
* RENAME TABLE IF statement

2
Core/Database/drivers/pdo/subdrivers/pdo_informix_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_informix_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_informix_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_informix_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_informix_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_informix_forge extends FW_DB_pdo_forge {
/**
* RENAME TABLE statement

2
Core/Database/drivers/pdo/subdrivers/pdo_mysql_driver.php
View File

@ -49,7 +49,7 @@ use FuzeWorks\Core;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_mysql_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_mysql_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_mysql_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_mysql_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_mysql_forge extends FW_DB_pdo_forge {
/**
* CREATE DATABASE statement

6
Core/Database/drivers/pdo/subdrivers/pdo_oci_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_oci_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_oci_driver extends FW_DB_pdo_driver {
/**
* Sub-driver
@ -76,8 +76,8 @@ class CI_DB_pdo_oci_driver extends CI_DB_pdo_driver {
/**
* COUNT string
*
* @used-by CI_DB_driver::count_all()
* @used-by CI_DB_query_builder::count_all_results()
* @used-by FW_DB_driver::count_all()
* @used-by FW_DB_query_builder::count_all_results()
*
* @var string
*/

2
Core/Database/drivers/pdo/subdrivers/pdo_oci_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_oci_forge extends FW_DB_pdo_forge {
/**
* CREATE DATABASE statement

2
Core/Database/drivers/pdo/subdrivers/pdo_odbc_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_odbc_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_odbc_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_odbc_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_odbc_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_odbc_forge extends FW_DB_pdo_forge {
/**
* UNSIGNED support

2
Core/Database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_pgsql_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_pgsql_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_pgsql_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_pgsql_forge extends FW_DB_pdo_forge {
/**
* DROP TABLE IF statement

2
Core/Database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_sqlite_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_sqlite_driver extends FW_DB_pdo_driver {
/**
* Sub-driver

2
Core/Database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_sqlite_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_sqlite_forge extends FW_DB_pdo_forge {
/**
* CREATE TABLE IF statement

12
Core/Database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
class FW_DB_pdo_sqlsrv_driver extends FW_DB_pdo_driver {
/**
* Sub-driver
@ -274,7 +274,7 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
{
if ($this->qb_limit)
{
return 'WITH ci_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM ci_delete';
return 'WITH fw_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM fw_delete';
}
return parent::_delete($table);
@ -311,7 +311,7 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
// We have to strip the ORDER BY clause
$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
// Get the fields to select from our subquery, so that we can avoid FW_rownum appearing in the actual results
if (count($this->qb_select) === 0)
{
$select = '*'; // Inevitable
@ -331,9 +331,9 @@ class CI_DB_pdo_sqlsrv_driver extends CI_DB_pdo_driver {
}
return 'SELECT '.$select." FROM (\n\n"
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('CI_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('CI_subquery')
."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('FW_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('FW_subquery')
."\nWHERE ".$this->escape_identifiers('FW_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
}
return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql);

2
Core/Database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_pdo_sqlsrv_forge extends CI_DB_pdo_forge {
class FW_DB_pdo_sqlsrv_forge extends FW_DB_pdo_forge {
/**
* CREATE TABLE IF statement

2
Core/Database/drivers/postgre/postgre_driver.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\Core;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_postgre_driver extends CI_DB {
class FW_DB_postgre_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/postgre/postgre_forge.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_postgre_forge extends CI_DB_forge {
class FW_DB_postgre_forge extends FW_DB_forge {
/**
* UNSIGNED support

4
Core/Database/drivers/postgre/postgre_result.php
View File

@ -33,7 +33,7 @@
/**
* Postgres Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -44,7 +44,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_postgre_result extends CI_DB_result {
class FW_DB_postgre_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/postgre/postgre_utility.php
View File

@ -42,7 +42,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_postgre_utility extends CI_DB_utility {
class FW_DB_postgre_utility extends FW_DB_utility {
/**
* List databases statement

2
Core/Database/drivers/sqlite/sqlite_driver.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\Logger;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite_driver extends CI_DB {
class FW_DB_sqlite_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/sqlite/sqlite_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite_forge extends CI_DB_forge {
class FW_DB_sqlite_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/sqlite/sqlite_result.php
View File

@ -33,7 +33,7 @@
/**
* SQLite Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite_result extends CI_DB_result {
class FW_DB_sqlite_result extends FW_DB_result {
/**
* Number of rows in the result set

2
Core/Database/drivers/sqlite/sqlite_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite_utility extends CI_DB_utility {
class FW_DB_sqlite_utility extends FW_DB_utility {
/**
* Export

2
Core/Database/drivers/sqlite3/sqlite3_driver.php
View File

@ -48,7 +48,7 @@ use FuzeWorks\Logger;
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite3_driver extends CI_DB {
class FW_DB_sqlite3_driver extends FW_DB {
/**
* Database driver

2
Core/Database/drivers/sqlite3/sqlite3_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite3_forge extends CI_DB_forge {
class FW_DB_sqlite3_forge extends FW_DB_forge {
/**
* UNSIGNED support

4
Core/Database/drivers/sqlite3/sqlite3_result.php
View File

@ -33,7 +33,7 @@
/**
* SQLite3 Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite3_result extends CI_DB_result {
class FW_DB_sqlite3_result extends FW_DB_result {
/**
* Number of fields in the result set

2
Core/Database/drivers/sqlite3/sqlite3_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlite3_utility extends CI_DB_utility {
class FW_DB_sqlite3_utility extends FW_DB_utility {
/**
* Export

12
Core/Database/drivers/sqlsrv/sqlsrv_driver.php
View File

@ -46,7 +46,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlsrv_driver extends CI_DB {
class FW_DB_sqlsrv_driver extends FW_DB {
/**
* Database driver
@ -435,7 +435,7 @@ class CI_DB_sqlsrv_driver extends CI_DB {
{
if ($this->qb_limit)
{
return 'WITH ci_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM ci_delete';
return 'WITH fw_delete AS (SELECT TOP '.$this->qb_limit.' * FROM '.$table.$this->_compile_wh('qb_where').') DELETE FROM fw_delete';
}
return parent::_delete($table);
@ -472,7 +472,7 @@ class CI_DB_sqlsrv_driver extends CI_DB {
// We have to strip the ORDER BY clause
$sql = trim(substr($sql, 0, strrpos($sql, $orderby)));
// Get the fields to select from our subquery, so that we can avoid CI_rownum appearing in the actual results
// Get the fields to select from our subquery, so that we can avoid FW_rownum appearing in the actual results
if (count($this->qb_select) === 0)
{
$select = '*'; // Inevitable
@ -492,9 +492,9 @@ class CI_DB_sqlsrv_driver extends CI_DB {
}
return 'SELECT '.$select." FROM (\n\n"
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('CI_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('CI_subquery')
."\nWHERE ".$this->escape_identifiers('CI_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
.preg_replace('/^(SELECT( DISTINCT)?)/i', '\\1 ROW_NUMBER() OVER('.trim($orderby).') AS '.$this->escape_identifiers('FW_rownum').', ', $sql)
."\n\n) ".$this->escape_identifiers('FW_subquery')
."\nWHERE ".$this->escape_identifiers('FW_rownum').' BETWEEN '.($this->qb_offset + 1).' AND '.$limit;
}
return preg_replace('/(^\SELECT (DISTINCT)?)/i','\\1 TOP '.$limit.' ', $sql);

2
Core/Database/drivers/sqlsrv/sqlsrv_forge.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlsrv_forge extends CI_DB_forge {
class FW_DB_sqlsrv_forge extends FW_DB_forge {
/**
* CREATE TABLE IF statement

4
Core/Database/drivers/sqlsrv/sqlsrv_result.php
View File

@ -33,7 +33,7 @@
/**
* SQLSRV Result Class
*
* This class extends the parent result class: CI_DB_result
* This class extends the parent result class: FW_DB_result
*
* Converted from CodeIgniter.
*
@ -43,7 +43,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlsrv_result extends CI_DB_result {
class FW_DB_sqlsrv_result extends FW_DB_result {
/**
* Scrollable flag

2
Core/Database/drivers/sqlsrv/sqlsrv_utility.php
View File

@ -41,7 +41,7 @@
* @link https://codeigniter.com/user_guide/database/
* @license http://opensource.org/licenses/MIT MIT License
*/
class CI_DB_sqlsrv_utility extends CI_DB_utility {
class FW_DB_sqlsrv_utility extends FW_DB_utility {
/**
* List databases statement

76
Core/System/class.database.php
View File

@ -31,11 +31,13 @@
*/
namespace FuzeWorks;
use FW_DB;
/**
* Database Class.
*
* @todo Add documentation
* @todo Implement Logger
*
* @author Abel Hoogeveen <abel@techfuze.net>
* @copyright Copyright (c) 2013 - 2016, Techfuze. (http://techfuze.net)
@ -43,11 +45,13 @@ namespace FuzeWorks;
class Database
{
protected static $defaultDB = null;
public static $defaultDB = null;
public static $defaultForge = null;
public static $defaultUtil = null;
protected static $databasePaths = array('Application'.DS.'Database', 'Core'.DS.'Database');
public static $databasePaths = array('Application'.DS.'Database', 'Core'.DS.'Database');
public static function get($parameters = '', $newInstance = true, $queryBuilder = null)
public static function get($parameters = '', $newInstance = false, $queryBuilder = null)
{
if (!$newInstance && is_object(self::$defaultDB) && ! empty(self::$defaultDB->conn_id))
{
@ -66,14 +70,76 @@ class Database
}
}
public static function getForge($database = null, $newInstance = null)
public static function getForge($database = null, $newInstance = false)
{
// First check if we're talking about the default forge and that one is already set
if (is_object($database) && $database === self::$defaultDB && is_object(self::$defaultForge))
{
return $reference = self::$defaultForge;
}
if ( ! is_object($database) OR ! ($database instanceof FW_DB))
{
isset(self::$defaultDB) OR self::get('', false);
$database =& self::$defaultDB;
}
require_once ('Core'.DS.'Database'.DS.'DB_forge.php');
require_once('Core'.DS.'Database'.DS.'drivers'.DS.$database->dbdriver.DS.$database->dbdriver.'_forge.php');
if ( ! empty($database->subdriver))
{
$driver_path = 'Core'.DS.'Database'.DS.'drivers'.DS.$database->dbdriver.DS.'subdrivers'.DS.$database->dbdriver.'_'.$database->subdriver.'_forge.php';
if (file_exists($driver_path))
{
require_once($driver_path);
$class = 'FW_DB_'.$database->dbdriver.'_'.$database->subdriver.'_forge';
}
}
else
{
$class = 'FW_DB_'.$database->dbdriver.'_forge';
}
// Create a new instance of set the default database
if ($newInstance)
{
return new $class($database);
}
else
{
return self::$defaultForge = new $class($database);
}
}
public static function getUtil($database = null, $newInstance = null)
public static function getUtil($database = null, $newInstance = false)
{
// First check if we're talking about the default util and that one is already set
if (is_object($database) && $database === self::$defaultDB && is_object(self::$defaultUtil))
{
echo "CALLED";
return $reference = self::$defaultUtil;
}
if ( ! is_object($database) OR ! ($database instanceof FW_DB))
{
isset(self::$defaultDB) OR self::get('', false);
$database = & self::$defaultDB;
}
require_once ('Core'.DS.'Database'.DS.'DB_utility.php');
require_once('Core'.DS.'Database'.DS.'drivers'.DS.$database->dbdriver.DS.$database->dbdriver.'_utility.php');
$class = 'FW_DB_'.$database->dbdriver.'_utility';
if ($newInstance)
{
return new $class($database);
}
else
{
return self::$defaultUtil = new $class($database);
}
}
public static function addDatabasePath($directory)