From d2a13b36c9a0aed229a3c9d252c217185b8c801a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 23 Aug 2007 03:32:07 +0000
Subject: [PATCH] =?UTF-8?q?list=5Forder,=20update=5Forder=20=EC=BB=AC?=
 =?UTF-8?q?=EB=9F=BC=EC=9D=98=20=EC=A0=95=EB=A0=AC=EC=8B=9C=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=EB=AC=B8=EC=97=90=20=EA=B0=95=EC=A0=9C=EB=A1=9C=20<?=
 =?UTF-8?q?=200=20=EB=AC=B8=EC=9D=84=20=EB=84=A3=EC=96=B4=EC=84=9C=20?=
 =?UTF-8?q?=EC=9D=B8=EB=8D=B1=EC=8A=A4=EB=A5=BC=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20mysql=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=20=EC=BD=94=EB=93=9C=20=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@2382 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DBMysql.class.php        | 20 ++++++++++++++++++++
 classes/db/DBMysql_innodb.class.php | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index e1e9485d3..5481e7dfc 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -472,6 +472,16 @@
 
             if($output->list_count) return $this->_getNavigationData($table_list, $columns, $condition, $output);
 
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $col = $val[0];
+                    if(!in_array($col, array('list_order','update_order'))) continue;
+                    if($condition) $condition .= sprintf(' and %s < 0 ', $col);
+                    else $condition = sprintf(' where %s < 0 ', $col);
+                }
+            }
+
             $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
 
             if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -521,6 +531,16 @@
             if($page > $total_page) $page = $total_page;
             $start_count = ($page-1)*$list_count;
 
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $col = $val[0];
+                    if(!in_array($col, array('list_order','update_order'))) continue;
+                    if($condition) $condition .= sprintf(' and %s < 0 ', $col);
+                    else $condition = sprintf(' where %s < 0 ', $col);
+                }
+            }
+
             $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
 
             if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index dd194c883..31c14633d 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -483,6 +483,16 @@
 
             if($output->list_count) return $this->_getNavigationData($table_list, $columns, $condition, $output);
 
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $col = $val[0];
+                    if(!in_array($col, array('list_order','update_order'))) continue;
+                    if($condition) $condition .= sprintf(' and %s < 0 ', $col);
+                    else $condition = sprintf(' where %s < 0 ', $col);
+                }
+            }
+
             $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
 
             if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -532,6 +542,16 @@
             if($page > $total_page) $page = $total_page;
             $start_count = ($page-1)*$list_count;
 
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $col = $val[0];
+                    if(!in_array($col, array('list_order','update_order'))) continue;
+                    if($condition) $condition .= sprintf(' and %s < 0 ', $col);
+                    else $condition = sprintf(' where %s < 0 ', $col);
+                }
+            }
+
             $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
             if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));