Changeset 21832 for branches/version-2_12-dev/data/class/SC_Query.php

Timestamp:

2012/05/14 02:38:11 (14 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/SC_SelectSql.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_SelectSql.php
data/class/helper/SC_Helper_Customer.php 19864@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Customer.php
data/class/pages/admin/system/LC_Page_Admin_System.php 15585@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System.php
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

4500

bzr:revprop:branch-nick:

branches/version-2_12-dev

bzr:root:

branches/version-2_12-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: [email protected]
sha1: 30955b6741e635d275aa0244123a27bbdc87996f

bzr:timestamp:

2012-05-14 02:38:04.782999992 +0900

bzr:user-agent:

bzr2.4.2+bzr-svn1.1.2

Message:

#1752 (LIMIT, OFFSET をベタ書きしない)

• SC_Query::setLimitOffset() は MDB2::setLimit() のラッパーに修正
• SC_SelectSql::setLimitOffset() は SC_Query::setLimitOffset() を使用するよう修正

File:

• branches/version-2_12-dev/data/class/SC_Query.php (modified) (4 diffs)

branches/version-2_12-dev/data/class/SC_Query.php

@@ -348 +348 @@
      *
      * この関数で設定した値は SC_Query::getSql() で使用されます.
-     * TODO MDB2::setLimit() を使用する
      *
      * @param integer $limit LIMIT 句に付与する値
@@ -356 +355 @@
     function setLimitOffset($limit, $offset = 0) {
         if (is_numeric($limit) && is_numeric($offset)) {
-
-            $option = ' LIMIT ' . $limit;
-            $option.= ' OFFSET ' . $offset;
-            $this->option .= $option;
+            $this->conn->setLimit($limit, $offset);
         }
         return $this;
@@ -457 +453 @@
     function setLimit($limit) {
         if (is_numeric($limit)) {
-            $this->option = ' LIMIT ' .$limit;
+            $this->conn->setLimit($limit);
         }
         return $this;
@@ -467 +463 @@
      * この関数で設定した値は SC_Query::getSql() で使用されます.
      *
-     * @param integer $offset LIMIT 句に設定する値
+     * @param integer $offset OFFSET 句に設定する値
      * @return SC_Query 自分自身のインスタンス
      */
     function setOffset($offset) {
         if (is_numeric($offset)) {
-            $this->offset = ' OFFSET ' .$offset;
+            $this->conn->setLimit($this->conn->limit, $offset);
         }
         return $this;