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

@ -494,7 +494,7 @@ class DBMssql 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)
{
@ -774,7 +774,7 @@ class DBMssql extends DB
/**
* Handles insertAct
* @todo Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
* @param Object $queryObject
* @param BaseObject $queryObject
* @return resource
*/
function _executeInsertAct($queryObject)
@ -786,7 +786,7 @@ class DBMssql extends DB
/**
* Handles updateAct
* @param Object $queryObject
* @param BaseObject $queryObject
* @return resource
*/
function _executeUpdateAct($queryObject)
@ -808,13 +808,13 @@ class DBMssql extends DB
$columnsList = $query->getUpdateString($with_values);
if($columnsList == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
$from = $query->getFromString($with_values);
if($from == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
$tables = $query->getTables();
@ -838,7 +838,7 @@ class DBMssql extends DB
/**
* Handles deleteAct
* @param Object $queryObject
* @param BaseObject $queryObject
* @return resource
*/
function _executeDeleteAct($queryObject)
@ -876,7 +876,7 @@ class DBMssql extends DB
$select = $query->getSelectString($with_values);
if($select == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
if($limit != '')
{
@ -890,7 +890,7 @@ class DBMssql extends DB
$from = $query->getFromString($with_values);
if($from == '')
{
return new Object(-1, "Invalid query");
return new BaseObject(-1, "Invalid query");
}
$from = ' FROM ' . $from;
@ -961,9 +961,9 @@ class DBMssql extends DB
* Handle selectAct
* In order to get a list of pages easily when selecting \n
* it supports a method as navigation
* @param Object $queryObject
* @param BaseObject $queryObject
* @param resource $connection
* @return Object
* @return BaseObject
*/
function _executeSelectAct($queryObject, $connection = null)
{
@ -1000,15 +1000,15 @@ class DBMssql 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;
@ -1024,10 +1024,10 @@ class DBMssql extends DB
/**
* If select query execute, return page info
* @param Object $queryObject
* @param BaseObject $queryObject
* @param resource $result
* @param resource $connection
* @return Object Object with page info containing
* @return BaseObject Object with page info containing
*/
function queryPageLimit($queryObject, $result, $connection)
{
@ -1090,7 +1090,7 @@ class DBMssql 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;
@ -1110,7 +1110,7 @@ class DBMssql extends DB
$virtual_no = $total_count - $start_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;
@ -1120,7 +1120,7 @@ class DBMssql extends DB
else
{
$data = $this->_fetch($result);
$buff = new Object ();
$buff = new BaseObject;
$buff->data = $data;
}
return $buff;