Changeset 20381 for branches/version-2_5-dev/data/class

Timestamp:

2011/02/24 17:57:47 (15 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20380

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2Fdbfactory%2FSC_DB_DBFactory_MYSQL.php
data/class/pages/admin/total/LC_Page_Admin_Total.php 15600@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Ftotal%2FLC_Page_Admin_Total.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3109

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php [email protected]
data/class/pages/admin/total/LC_Page_Admin_Total.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/drop_table.sql [email protected]

bzr:timestamp:

2011-02-24 17:57:43.528000116 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-24T08:57:43.528000Z

Message:

#793 (非推奨機能の削除)

• dtb_bat_* テーブル削除
  • #962 に関連
• r20351 に関連して, MySQL の VIEW 置換関数の削除

Location:

branches/version-2_5-dev/data/class

Files:

• batch/SC_Batch_Daily.php (deleted)
• db/dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (3 diffs)
• pages/admin/total/LC_Page_Admin_Total.php (modified) (1 diff)

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -63 +63 @@
         // 改行、タブを1スペースに変換
         $sql = preg_replace("/[\r\n\t]/"," ",$sql);
-        // view表をインラインビューに変換する
-        $sql = $this->sfChangeView($sql);
         // ILIKE検索をLIKE検索に変換する
         $sql = $this->sfChangeILIKE($sql);
@@ -240 +238 @@
 
     /**
-     * View の WHERE 句を置換する.
-     *
-     * @param string $target 置換対象の文字列
-     * @param string $where 置換する文字列
-     * @param array $arrval WHERE 句の要素の配列
-     * @param string $option SQL 文の追加文字列
-     * @return string 置換後の SQL 文
-     */
-    function sfViewWhere($target, $where = "", $arrval = array(), $option = ""){
-
-        $arrWhere = split("[?]", $where);
-        $where_tmp = " WHERE " . $arrWhere[0];
-        for($i = 1; $i < count($arrWhere); $i++){
-            $where_tmp .= SC_Utils_Ex::sfQuoteSmart($arrval[$i - 1]) . $arrWhere[$i];
-        }
-        $arrWhere = $this->getWhereConverter();
-        $arrWhere[$target] = $where_tmp . " " . $option;
-        return $arrWhere[$target];
-    }
-
-    /**
-     * View をインラインビューに変換する.
-     *
-     * @access private
-     * @param string $sql SQL 文
-     * @return string インラインビューに変換した SQL 文
-     */
-    function sfChangeView($sql){
-
-        $arrViewTmp = $this->viewToSubQuery();
-
-            // viewのwhereを変換
-        foreach($arrViewTmp as $key => $val){
-            $arrViewTmp[$key] = strtr($arrViewTmp[$key], $this->getWhereConverter());
-        }
-
-            // viewを変換
-        $changesql = strtr($sql, $arrViewTmp);
-
-        return $changesql;
-    }
-
-    /**
      * ILIKE句 を LIKE句へ変換する.
      *
@@ -335 +290 @@
         }
         return $sql;
-    }
-
-    /**
-     * WHERE 句置換用の配列を返す.
-     *
-     * @access private
-     * @return array WHERE 句置換用の配列
-     */
-    function getWhereConverter() {
-        return array(
-            "&&crscls_where&&" => "",
-            "&&crsprdcls_where&&" =>"",
-            "&&noncls_where&&" => "",
-            "&&allcls_where&&" => "",
-            "&&allclsdtl_where&&" => "",
-            "&&prdcls_where&&" => "",
-            "&&catcnt_where&&" => ""
-        );
-    }
-
-    /**
-     * View をサブクエリに変換するための配列を返す.
-     *
-     * @access private
-     * @return array View をサブクエリに変換するための配列
-     */
-    function viewToSubQuery() {
-
-        static $sql = array();
-
-        if (empty($sql)) {
-
-
-            $sql['vw_products_allclass_detail'] = <<< __EOS__
-                (
-                    SELECT
-                        dtb_products.product_id,
-                        dtb_products.name,
-                        dtb_products.maker_id,
-                        dtb_products.status,
-                        dtb_products.comment1,
-                        dtb_products.comment2,
-                        dtb_products.comment3,
-                        dtb_products.comment4,
-                        dtb_products.comment5,
-                        dtb_products.comment6,
-                        dtb_products.note,
-                        dtb_products.main_list_comment,
-                        dtb_products.main_list_image,
-                        dtb_products.main_comment,
-                        dtb_products.main_image,
-                        dtb_products.main_large_image,
-                        dtb_products.sub_title1,
-                        dtb_products.sub_comment1,
-                        dtb_products.sub_image1,
-                        dtb_products.sub_large_image1,
-                        dtb_products.sub_title2,
-                        dtb_products.sub_comment2,
-                        dtb_products.sub_image2,
-                        dtb_products.sub_large_image2,
-                        dtb_products.sub_title3,
-                        dtb_products.sub_comment3,
-                        dtb_products.sub_image3,
-                        dtb_products.sub_large_image3,
-                        dtb_products.sub_title4,
-                        dtb_products.sub_comment4,
-                        dtb_products.sub_image4,
-                        dtb_products.sub_large_image4,
-                        dtb_products.sub_title5,
-                        dtb_products.sub_comment5,
-                        dtb_products.sub_image5,
-                        dtb_products.sub_large_image5,
-                        dtb_products.sub_title6,
-                        dtb_products.sub_comment6,
-                        dtb_products.sub_image6,
-                        dtb_products.sub_large_image6,
-                        dtb_products.del_flg,
-                        dtb_products.creator_id,
-                        dtb_products.create_date,
-                        dtb_products.update_date,
-                        dtb_products.deliv_date_id,
-                        T4.product_code_min,
-                        T4.product_code_max,
-                        T4.price01_min,
-                        T4.price01_max,
-                        T4.price02_min,
-                        T4.price02_max,
-                        T4.stock_min,
-                        T4.stock_max,
-                        T4.stock_unlimited_min,
-                        T4.stock_unlimited_max,
-                        T4.class_count
-                    FROM
-                        dtb_products
-                    JOIN
-                            (
-                                SELECT
-                                    product_id,
-                                    MIN(product_code) AS product_code_min,
-                                    MAX(product_code) AS product_code_max,
-                                    MIN(price01) AS price01_min,
-                                    MAX(price01) AS price01_max,
-                                    MIN(price02) AS price02_min,
-                                    MAX(price02) AS price02_max,
-                                    MIN(stock) AS stock_min,
-                                    MAX(stock) AS stock_max,
-                                    MIN(stock_unlimited) AS stock_unlimited_min,
-                                    MAX(stock_unlimited) AS stock_unlimited_max,
-                                    COUNT(*) as class_count
-                                FROM dtb_products_class
-                                GROUP BY product_id
-                            ) AS T4
-                            ON dtb_products.product_id = T4.product_id
-                )
-__EOS__;
-
-            $sql['vw_products_allclass'] = <<< __EOS__
-                (
-                    SELECT
-                        alldtl.*,
-                        dtb_category.rank AS category_rank,
-                        T2.category_id,
-                        T2.rank AS product_rank
-                    FROM
-                        {$sql['vw_products_allclass_detail']} AS alldtl
-                        LEFT JOIN
-                            dtb_product_categories AS T2
-                            ON alldtl.product_id = T2.product_id
-                        LEFT JOIN
-                            dtb_category
-                            ON T2.category_id = dtb_category.category_id
-                )
-__EOS__;
-        }
-
-        return $sql;
-
     }
 

branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php

@@ -23 +23 @@
 // {{{ requires
 require_once(CLASS_EX_REALDIR . "page_extends/admin/LC_Page_Admin_Ex.php");
-require_once(CLASS_EX_REALDIR . "batch_extends/SC_Batch_Daily_Ex.php");
 require_once(CLASS_REALDIR . "graph/SC_GraphPie.php");
 require_once(CLASS_REALDIR . "graph/SC_GraphLine.php");