From a4b3a914a5fd81babb23c8878f7f8a23fa65fc7f Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Thu, 17 May 2012 06:12:20 +0000
Subject: [PATCH] reverse merge from 1.6.0 (r10563)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10716 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DB.class.php                                    | 2 +-
 classes/db/DBCubrid.class.php                              | 7 +++----
 classes/db/DBMssql.class.php                               | 7 +++----
 classes/xml/XmlQueryParser.150.class.php                   | 2 +-
 classes/xml/xmlquery/tags/column/SelectColumnTag.class.php | 1 +
 classes/xml/xmlquery/tags/table/TablesTag.class.php        | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 37d1db059..6cdca6313 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -854,4 +854,4 @@
         }
 
     }
-?>
+?>
\ No newline at end of file
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index a40ef697c..bc2356128 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -784,7 +784,7 @@
 			$count_query .= (__DEBUG_QUERY__&1 && $queryObject->queryID)?sprintf (' '.$this->comment_syntax, $queryObject->queryID):'';
 			$result = $this->_query($count_query, $connection);
 			$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();
 			if (!$list_count) $list_count = 20;
@@ -834,9 +834,8 @@
 			return $buff;
 		}
 
-		function &getParser($force = FALSE){
-			$dbParser = new DBParser('"', '"', $this->prefix);
-			return $dbParser;
+		function getParser($force = FALSE){
+			return new DBParser('"', '"', $this->prefix);
 		}
 
                 function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {
diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 520e134a9..d11c96094 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -540,9 +540,8 @@
 			else return $this->queryPageLimit($queryObject, $result, $connection);
         }
 
-        function &getParser($force = FALSE){
-		$dbParser = new DBParser("[", "]", $this->prefix);
-        	return $dbParser;
+        function getParser($force = FALSE){
+        	return new DBParser("[", "]", $this->prefix);
         }
 
     	function queryError($queryObject){
@@ -615,7 +614,7 @@
 					$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
 					return $buff;
 				}
-				
+
 				$start_count = ($page - 1) * $list_count;
 				$this->param = $queryObject->getArguments();
 				$virtual_no = $total_count - $start_count;
diff --git a/classes/xml/XmlQueryParser.150.class.php b/classes/xml/XmlQueryParser.150.class.php
index 63a861aec..4c167cab8 100644
--- a/classes/xml/XmlQueryParser.150.class.php
+++ b/classes/xml/XmlQueryParser.150.class.php
@@ -76,7 +76,7 @@
 
         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){
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
index 22153d346..8193c9ca3 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
@@ -26,6 +26,7 @@
 				$this->alias = $column->attrs->alias;
 				$this->click_count = $column->attrs->click_count;
 			}
+			}
 		}
 		
 		function getExpressionString(){
diff --git a/classes/xml/xmlquery/tags/table/TablesTag.class.php b/classes/xml/xmlquery/tags/table/TablesTag.class.php
index b52121e47..8c484e2e7 100644
--- a/classes/xml/xmlquery/tags/table/TablesTag.class.php
+++ b/classes/xml/xmlquery/tags/table/TablesTag.class.php
@@ -42,7 +42,7 @@
                             $this->tables[] = new QueryTag($tag, true);
                         }
                         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]);
                             else
                                 $this->tables[] = new TableTag($tag);