Convert Object class to BaseObject in core classes

This commit is contained in:
Kijin Sung 2017-11-27 22:34:28 +09:00
parent 5bdf95932f
commit 1a81fd43f3
16 changed files with 129 additions and 120 deletions

View file

@ -624,7 +624,7 @@ class DBCubrid extends DB
* Get information about a column
* @param string $table_name table name
* @param string $column_name column name
* @return object
* @return BaseObject
*/
function getColumnInfo($table_name, $column_name)
{
@ -982,7 +982,7 @@ class DBCubrid extends DB
/**
* Handles insertAct
* @param Object $queryObject
* @param BaseObject $queryObject
* @param boolean $with_values
* @return resource
*/
@ -994,7 +994,7 @@ class DBCubrid extends DB
$with_values = FALSE;
}
$query = $this->getInsertSql($queryObject, $with_values);
if(is_a($query, 'Object'))
if($query instanceof BaseObject)
{
unset($this->param);
return;
@ -1011,7 +1011,7 @@ class DBCubrid extends DB
/**
* Handles updateAct
* @param Object $queryObject
* @param BaseObject $queryObject
* @param boolean $with_values
* @return resource
*/
@ -1023,7 +1023,7 @@ class DBCubrid extends DB
$with_values = FALSE;
}
$query = $this->getUpdateSql($queryObject, $with_values);
if(is_a($query, 'Object'))
if($query instanceof BaseObject)
{
unset($this->param);
return;
@ -1041,7 +1041,7 @@ class DBCubrid extends DB
/**
* Handles deleteAct
* @param Object $queryObject
* @param BaseObject $queryObject
* @param boolean $with_values
* @return resource
*/
@ -1053,7 +1053,7 @@ class DBCubrid extends DB
$with_values = FALSE;
}
$query = $this->getDeleteSql($queryObject, $with_values);
if(is_a($query, 'Object'))
if($query instanceof BaseObject)
{
unset($this->param);
return;
@ -1074,10 +1074,10 @@ class DBCubrid extends DB
* Handle selectAct
* To get a specific page list easily in select statement,
* a method, navigation, is used
* @param Object $queryObject
* @param BaseObject $queryObject
* @param resource $connection
* @param boolean $with_values
* @return Object
* @return BaseObject
*/
function _executeSelectAct($queryObject, $connection = NULL, $with_values = TRUE)
{
@ -1094,7 +1094,7 @@ class DBCubrid extends DB
else
{
$query = $this->getSelectSql($queryObject, $with_values);
if(is_a($query, 'Object'))
if($query instanceof BaseObject)
{
unset($this->param);
return;
@ -1109,7 +1109,7 @@ class DBCubrid extends DB
}
$data = $this->_fetch($result);
$buff = new Object ();
$buff = new BaseObject;
$buff->data = $data;
unset($this->param);
@ -1119,15 +1119,15 @@ class DBCubrid extends DB
/**
* If have a error, return error object
* @param Object $queryObject
* @return Object
* @param BaseObject $queryObject
* @return BaseObject
*/
function queryError($queryObject)
{
$limit = $queryObject->getLimit();
if($limit && $limit->isPageHandler())
{
$buff = new Object ();
$buff = new BaseObject;
$buff->total_count = 0;
$buff->total_page = 0;
$buff->page = 1;
@ -1140,10 +1140,10 @@ class DBCubrid extends DB
/**
* If select query execute, return page info
* @param Object $queryObject
* @param BaseObject $queryObject
* @param resource $connection
* @param boolean $with_values
* @return Object Object with page info containing
* @return BaseObject Object with page info containing
*/
function queryPageLimit($queryObject, $connection, $with_values)
{
@ -1204,7 +1204,7 @@ class DBCubrid extends DB
{
// If requested page is bigger than total number of pages, return empty list
$buff = new Object ();
$buff = new BaseObject;
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $page;
@ -1226,7 +1226,7 @@ class DBCubrid extends DB
$virtual_no = $total_count - ($page - 1) * $list_count;
$data = $this->_fetch($result, $virtual_no);
$buff = new Object ();
$buff = new BaseObject;
$buff->total_count = $total_count;
$buff->total_page = $total_page;
$buff->page = $page;
@ -1260,14 +1260,14 @@ class DBCubrid extends DB
$select = $query->getSelectString($with_values);
if($select == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
$select = 'SELECT ' . $select;
$from = $query->getFromString($with_values);
if($from == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
$from = ' FROM ' . $from;