Ticket #2547: #2547.patch

data/class/api/operations/ItemSearch.php

@@ -151 +151 @@
                 $from = "$dtb_product_categories T2 JOIN dtb_category T3 ON T2.category_id = T3.category_id";
                 $where = 'T2.product_id = alldtl.product_id';
                 $objQuery->setOrder('T3.rank DESC, T2.rank DESC');
-                $objQuery->setLimit(1);
-                $sub_sql = $objQuery->getSqlWithLimitOffset($col, $from, $where);
+                $sub_sql = $objQuery->getSql($col, $from, $where);
+                $sub_sql = $objQuery->dbFactory->addLimitOffset($sub_sql, 1);
 
                 $objQuery->setOrder("($sub_sql) DESC ,product_id DESC");
                 break;

data/class/pages/admin/LC_Page_Admin_Home.php

@@ -251 +251 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
         $objQuery->setOrder('order_detail_id');
-        $objQuery->setLimit(1);
-        $sql_product_name = $objQuery->getSqlWithLimitOffset('product_name', 'dtb_order_detail', 'order_id = dtb_order.order_id');
+        $sql_product_name = $objQuery->getSql('product_name', 'dtb_order_detail', 'order_id = dtb_order.order_id');
+        $sql_product_name = $objQuery->dbFactory->addLimitOffset($sql_product_name, 1);
 
         $cols = <<< __EOS__
             dtb_order.order_id,

data/class/pages/products/LC_Page_Products_List.php

@@ -239 +239 @@
                 $from = "$dtb_product_categories T2 JOIN dtb_category T3 ON T2.category_id = T3.category_id";
                 $where = 'T2.product_id = alldtl.product_id';
                 $objQuery->setOrder('T3.rank DESC, T2.rank DESC');
-                $objQuery->setLimit(1);
-                $sub_sql = $objQuery->getSqlWithLimitOffset($col, $from, $where);
+                $sub_sql = $objQuery->getSql($col, $from, $where);
+                $sub_sql = $objQuery->dbFactory->addLimitOffset($sub_sql, 1);
 
                 $objQuery->setOrder("($sub_sql) DESC ,product_id DESC");
                 break;

data/class/SC_Product.php

@@ -82 +82 @@
             $o_table = $this->arrOrderData['table'];
             $o_order = $this->arrOrderData['order'];
             $objQuery->setOrder("T2.$o_col $o_order");
-            $objQuery->setLimit(1);
-            $sub_sql = $objQuery->getSqlWithLimitOffset($o_col, "$o_table AS T2", 'T2.product_id = alldtl.product_id');
+            $sub_sql = $objQuery->getSql($o_col, "$o_table AS T2", 'T2.product_id = alldtl.product_id');
+            $sub_sql = $objQuery->dbFactory->addLimitOffset($sub_sql, 1);
 
             $objQuery->setOrder("($sub_sql) $o_order, product_id");
         }

data/class/SC_Query.php

@@ -1215 +1215 @@
             return SC_Query_Ex::$arrPoolInstance[$key_str];
         }
     }
-
-    /**
-     * 構築した SELECT 文を LIMIT OFFSET も含め取得する.
-     *
-     * @param  string SELECT 文に含めるカラム名
-     * @param  string SELECT 文に含めるテーブル名
-     * @param  string SELECT 文に含める WHERE 句
-     * @return string 構築済みの SELECT 文
-     */
-    function getSqlWithLimitOffset($cols, $from = '', $where = '')
-    {
-        $sql = $this->getSql($cols, $from, $where);
-        $offset = $this->conn->offset;
-        $limit = $this->conn->limit;
-        $this->setLimitOffset(0, 0);
-
-        return $this->dbFactory->addLimitOffset($sql, $limit, $offset);
-    }
 }