From 5f74042ff97a9f941d28870c8781ea3528b285aa Mon Sep 17 00:00:00 2001
From: ysnglee2000 <ysnglee2000@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Mon, 14 Sep 2009 21:32:33 +0000
Subject: [PATCH] =?UTF-8?q?1.=20r6784=EC=97=90=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.(#18298617=20=EA=B4=80=EB=A0=A8)=202.=20DBCu?=
 =?UTF-8?q?brid::=5FexecuteSelect=20=EC=9D=98=20order=20by=20=EC=A0=88=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=A0=84=EC=B2=98=EB=A6=AC=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=EB=AC=B8=20=EB=B0=8F=20=EC=9E=98=EB=AA=BB=EB=90=9C=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EA=B0=84=EC=86=8C=ED=99=94/?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6787 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DBCubrid.class.php | 48 ++++++++++++++---------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index fd964496b..470586420 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -619,19 +619,15 @@
 
                 if ($output->order) {
                   foreach($output->order as $key => $val) {
-                      if ($val[0] != 'count') {
-                        if (strpos ($val[0], '.')) {
-                          $tmpval = explode ('.', $val[0]);
-                          $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                          $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                          $val[0] = implode ('.', $tmpval);
-                        }
-                        elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                        else {
-                          $val[0] = sprintf ('"%s"', $val[0]);
-                        }
-                      }
-                      $index_list[] = sprintf('%s %s', $val[0]=='count'?'"count"':$val[0], $val[1]);
+                    if (strpos ($val[0], '.')) {
+                      $tmpval = explode ('.', $val[0]);
+                      $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
+                      $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
+                      $val[0] = implode ('.', $tmpval);
+                    }
+                    elseif (strpos ($val[0], '(')) $val[0] = $val[0];
+                    else $val[0] = sprintf ('"%s"', $val[0]);
+                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
                   }
                   if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
                   $query = sprintf('%s for orderby_num() between %d and %d', $query, $start_count + 1, $list_count + $start_count);
@@ -651,19 +647,15 @@
 
                 if($output->order) {
                     foreach($output->order as $key => $val) {
-                        if ($val[0] != 'count') {
-                          if (strpos ($val[0], '.')) {
-                            $tmpval = explode ('.', $val[0]);
-                            $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                            $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                            $val[0] = implode ('.', $tmpval);
-                          }
-                          elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                          else {
-                            $val[0] = sprintf ('"%s"', $val[0]);
-                          }
-                        }
-                        $index_list[] = sprintf('%s %s', $val[0]=='count'?'"count"':$val[0], $val[1]);
+                      if (strpos ($val[0], '.')) {
+                        $tmpval = explode ('.', $val[0]);
+                        $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
+                        $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
+                        $val[0] = implode ('.', $tmpval);
+                      }
+                      elseif (strpos ($val[0], '(')) $val[0] = $val[0];
+                      else $val[0] = sprintf ('"%s"', $val[0]);
+                      $index_list[] = sprintf('%s %s', $val[0], $val[1]);
                     }
                     if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
                 }
@@ -794,9 +786,7 @@
                   $val[0] = implode ('.', $tmpval);
                 }
                 elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                else {
-                  $val[0] = sprintf ('"%s"', $val[0]);
-                }
+                else $val[0] = sprintf ('"%s"', $val[0]);
                 $index_list[] = sprintf('%s %s', $val[0], $val[1]);
               }
               if(count($index_list)) $query .= ' order by '.implode(',',$index_list);