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

reverse merge from 1.6.0 (r10563)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10716 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:12:20 +00:00
parent 57a0cc59b1
commit a4b3a914a5
6 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/db/DB.class.php
View file

@ -854,4 +854,4 @@
} }
} }
?> ?>

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

@ -784,7 +784,7 @@
$count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):''; $count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):'';
$result = $this->_query($count_query, $connection); $result = $this->_query($count_query, $connection);
$count_output = $this->_fetch($result); $count_output = $this->_fetch($result);
$total_count = (int)(isset($count_output->count) ? $count_output->count : NULL); $total_count = (int)(isset($count_output->output) ? $count_output->count : NULL);
$list_count = $limit->list_count->getValue(); $list_count = $limit->list_count->getValue();
if (!$list_count) $list_count = 20; if (!$list_count) $list_count = 20;
@ -834,9 +834,8 @@
return $buff; return $buff;
} }
function &getParser($force = FALSE){ function getParser($force = FALSE){
$dbParser = new DBParser('"', '"', $this->prefix); return new DBParser('"', '"', $this->prefix);
return $dbParser;
} }
function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) { function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {

7
classes/db/DBMssql.class.php
View file

@ -540,9 +540,8 @@
else return $this->queryPageLimit($queryObject, $result, $connection); else return $this->queryPageLimit($queryObject, $result, $connection);
} }
function &getParser($force = FALSE){ function getParser($force = FALSE){
$dbParser = new DBParser("[", "]", $this->prefix); return new DBParser("[", "]", $this->prefix);
return $dbParser;
} }
function queryError($queryObject){ function queryError($queryObject){
@ -615,7 +614,7 @@
$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count); $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
return $buff; return $buff;
} }
$start_count = ($page - 1) * $list_count; $start_count = ($page - 1) * $list_count;
$this->param = $queryObject->getArguments(); $this->param = $queryObject->getArguments();
$virtual_no = $total_count - $start_count; $virtual_no = $total_count - $start_count;

2
classes/xml/XmlQueryParser.150.class.php
View file

@ -76,7 +76,7 @@
function parse($query_id = NULL, $xml_file = NULL, $cache_file = NULL) function parse($query_id = NULL, $xml_file = NULL, $cache_file = NULL)
{ {
$query_parser = &$this->parse_xml_query($query_id, $xml_file, $cache_file); $this->parse_xml_query($query_id, $xml_file, $cache_file);
} }
function getXmlFileContent($xml_file){ function getXmlFileContent($xml_file){

1
classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
View file

@ -26,6 +26,7 @@
$this->alias = $column->attrs->alias; $this->alias = $column->attrs->alias;
$this->click_count = $column->attrs->click_count; $this->click_count = $column->attrs->click_count;
} }
}
} }
function getExpressionString(){ function getExpressionString(){

2
classes/xml/xmlquery/tags/table/TablesTag.class.php
View file

@ -42,7 +42,7 @@
$this->tables[] = new QueryTag($tag, true); $this->tables[] = new QueryTag($tag, true);
} }
else { else {
if(isset($indexes) && $indexes && isset($indexes[$tag->attrs->name])) if(isset($indexes[$tag->attrs->name]) && $indexes[$tag->attrs->name])
$this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]); $this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);
else else
$this->tables[] = new TableTag($tag); $this->tables[] = new TableTag($tag);