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

Timestamp:

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

Author:

nanasess

bzr:base-revision:

nanasess@fsm.ne.jp-20120513161702-kk78khnxu1sfsw5s

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

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:

nanasess@fsm.ne.jp-20120513173417-27p8tawv1k1wnthe

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20120513173804-r2alhhlv9wbg9pzn

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: nanasess@fsm.ne.jp-20120513173804-r2alhhlv9wbg9pzn
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_SelectSql.php (modified) (4 diffs)

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

@@ -31 +31 @@
     var $order;
     var $group;
-    var $limit;
-    var $offset;
     var $arrSql;
     var $arrVal;
@@ -47 +45 @@
         $this->sql = $this->select .' '. $this->where .' '. $this->group .' ';
 
-        // $mode == 1 は limit & offset無し
         if ($mode == 2) {
             $this->sql .= $this->order;
-        } elseif ($mode != 1) {
-            $this->sql .= $this->order . ' ' .$this->limit .' '. $this->offset;
         }
 
@@ -240 +235 @@
     }
 
-    function setLimitOffset($limit, $offset) {
-
-        if (is_numeric($limit) and is_numeric($offset)) {
-
-            $this->limit = ' LIMIT ' .$limit;
-            $this->offset = ' OFFSET ' .$offset;
-        }
-    }
-
     function clearSql() {
         $this->select = '';
@@ -254 +240 @@
         $this->group = '';
         $this->order = '';
-        $this->limit = '';
-        $this->offset = '';
     }