fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-22 04:39:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge 1.5.2.3 (~r10623)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-26 09:17:29 +00:00
parent 79fdf10866
commit e4306a789f
915 changed files with 71076 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/db/DBCubrid.class.php
View file

@ -525,6 +525,10 @@
$query = sprintf ("alter class \"%s\" add attribute ", $table_name);
$primary_list = array();
$unique_list = array();
$index_list = array();
foreach ($columns as $column) {
$name = $column->attrs->name;
$type = $column->attrs->type;
@ -676,7 +680,9 @@
}
$limit = $queryObject->getLimit();
if ($limit && $limit->isPageHandler())
{
return $this->queryPageLimit($queryObject, $connection, $with_values);
}
else {
$query = $this->getSelectSql($queryObject, $with_values);
if (is_a($query, 'Object'))
@ -719,11 +725,11 @@
if ($queryObject->getGroupByString() != '') {
$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
}
$count_query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
$result = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result);
$total_count = (int)$count_output->count;
$total_count = (int)(isset($count_output->count) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20;
@ -773,8 +779,9 @@
return $buff;
}
function getParser(){
return new DBParser('"', '"', $this->prefix);
function &getParser($force = FALSE){
$dbParser = new DBParser('"', '"', $this->prefix);
return $dbParser;
}
function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {