diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index 8fa85b48f..2074e4c97 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -1029,8 +1029,14 @@
             {
                 $columns = array();
                 foreach($output->arg_columns as $col){
-                    if(strpos($col,'"')===false && strpos($col,' ')===false) $columns[] = '"'.$col.'"';
-                    else $columns[] = $col;
+					unset($tmpCol);
+					$tmpCol = explode('.', $col);
+					if(isset($tmpCol[1])) $col = $tmpCol[1];
+
+					if(strpos($col,'"')===false && strpos($col,' ')==false) $col = '"'.$col.'"'; 
+					if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
+
+					$columns[] = $col;
                 }
 
                 $columns = join(',',$columns);
@@ -1207,8 +1213,14 @@
             {
                 $columns = array();
                 foreach($output->arg_columns as $col){
-                    if(strpos($col,'"')===false) $columns[] = '"'.$col.'"';
-                    else $columns[] = $col;
+					unset($tmpCol);
+					$tmpCol = explode('.', $col);
+					if(isset($tmpCol[1])) $col = $tmpCol[1];
+
+					if(strpos($col,'"')===false && strpos($col,' ')==false) $col = '"'.$col.'"'; 
+					if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
+
+					$columns[] = $col;
                 }
 
                 $columns = join(',',$columns);
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index e00004a88..75bbed52f 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -624,8 +624,14 @@
 			{
 				$columns = array();
 				foreach($output->arg_columns as $col){
-					if(strpos($col,'`')===false && strpos($col,' ')==false) $columns[] = '`'.$col.'`'; 
-					else $columns[] = $col;
+					unset($tmpCol);
+					$tmpCol = explode('.', $col);
+					if(isset($tmpCol[1])) $col = $tmpCol[1];
+
+					if(strpos($col,'`')===false && strpos($col,' ')==false) $col = '`'.$col.'`'; 
+					if(isset($tmpCol[1])) $col = $tmpCol[0].'.'.$col;
+
+					$columns[] = $col;
 				}
 				
 				$columns = join(',',$columns);