[Svn-src-all:1489] [version-2_5-dev 20381] #793 (非推奨機能の削除)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 24日 (木) 17:57:47 JST
Subversion committed to /home/svn/open 20381
http://svn.ec-cube.net/open_trac/changeset/20381
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-24 17:57:47 +0900 (木, 24 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#793 (非推奨機能の削除)
* dtb_bat_* テーブル削除
* #962 に関連
* r20351 に関連して, MySQL の VIEW 置換関数の削除
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
D branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php
U branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
U branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
D branches/version-2_5-dev/data/class_extends/batch_extends/
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
U branches/version-2_5-dev/html/install/sql/drop_table.sql
削除: branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php
===================================================================
--- branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/data/class/batch/SC_Batch_Daily.php 2011-02-24 08:57:47 UTC (rev 20381)
@@ -1,363 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-// {{{ requires
-require_once(CLASS_REALDIR . "batch/SC_Batch.php");
-
-/**
- * 日次バッチクラス.
- *
- * XXX Singleton にするべき...
- *
- * @package Batch
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class SC_Batch_Daily extends SC_Batch {
-
-
- /**
- * コンストラクタ.
- *
- * @param array $argv コマンドライン用引数.
- * 指定しない場合は, 内部関数が実行されない.
- */
- function SC_Batch_Daily($argv = "") {
- // 実行時間を制限しない
- set_time_limit(0);
-
- if (!empty($argv)) {
- $this->execute($argv);
- }
- }
-
- /**
- * バッチ処理を実行する.
- *
- * @param mixed $argv コマンドライン引数
- * @return void
- */
- function execute($argv = "") {
- $term = 0;
- $start = 1; // 集計期間は、$start~$termの間となる。通常前日分から。
- $command = false;
-
- // 集計対象期間の取得（指定日分さかのぼる)
- if (SC_Utils_Ex::sfIsInt($argv[1]) && $argv[1] <= 365) {
- $term = $argv[1];
- $command = true;
- }
-
- // 集計開始日
- if (SC_Utils_Ex::sfIsInt($argv[2]) && $argv[2] <= 365) {
- $start = $argv[2];
- $command = true;
- }
-
- if($term > 0) {
- // 集計の開始
- $this->lfStartDailyTotal($term, $start, $command);
- }
- }
-
- // 集計の開始
- function lfStartDailyTotal($term, $start, $command = false) {
-
- $now_time = time();
-
- // グラフ画像の削除
- $path = GRAPH_REALDIR . "*.png";
- system ("rm -rf $path");
-
- // 削除された受注データの受注詳細情報の削除
- $objQuery = new SC_Query();
- $where = "order_id IN (SELECT order_id FROM dtb_order WHERE del_flg = 1)";
- $objQuery->delete("dtb_order_detail", $where);
-
- // 最後に更新された日付を取得
- $ret = $objQuery->max("create_date", "dtb_bat_order_daily");
- list($batch_last) = split("\.", $ret);
- $pass = $now_time - strtotime($batch_last);
-
- // 最後のバッチ実行からLOAD_BATCH_PASS秒経過していないと実行しない。
- if($pass < LOAD_BATCH_PASS) {
- GC_Utils_Ex::gfPrintLog("LAST BATCH " . $arrRet[0]['create_date'] . " > " . $batch_pass . " -> EXIT BATCH $batch_date");
- return;
- }
-
- // 集計
- for ($i = $start; $i < $term; $i++) {
- // 基本時間から$i日分さかのぼる
- $tmp_time = $now_time - ($i * 24 * 3600);
-
- $batch_date = date("Y/m/d", $tmp_time);
- GC_Utils_Ex::gfPrintLog("LOADING BATCH $batch_date");
-
- $this->lfBatOrderDaily($tmp_time);
- $this->lfBatOrderDailyHour($tmp_time);
- $this->lfBatOrderAge($tmp_time);
-
- // タイムアウトを防ぐ
- SC_Utils_Ex::sfFlush();
- }
- }
-
- // リアルタイムで集計を実施する。集計が終了しているレコードは実施しない。
- /*
- $sdate:YYYY-MM-DD hh:mm:ss形式の日付
- $edate:YYYY-MM-DD hh:mm:ss形式の日付
- */
- function lfRealTimeDailyTotal($sdate, $edate) {
- $pass = strtotime($edate) - strtotime($sdate);
- $loop = intval($pass / 86400);
-
- for($i = 0; $i <= $loop; $i++) {
- $tmp_time = strtotime($sdate) + ($i * 86400);
- $batch_date = date("Y/m/d H:i:s", $tmp_time);
- $objQuery = new SC_Query();
- $arrRet = $objQuery->select("order_date, create_date", "dtb_bat_order_daily", "order_date = ?", array($batch_date));
- // すでにバッチ処理が終了しているかチェックする。
- if(count($arrRet) > 0) {
- list($create_date) = split("\.", $arrRet[0]['create_date']);
- list($order_date) = split("\.", $arrRet[0]['order_date']);
- $create_time = strtotime($create_date);
- $order_time = strtotime($order_date);
- // オーダー開始日より一日以上後に集計されている場合は集計しなおさない
- if($order_time + 86400 < $create_time || $tmp_time > time()) {
- GC_Utils_Ex::gfPrintLog("EXIT BATCH $batch_date $tmp_time" . " " . time());
- continue;
- }
- }
- GC_Utils_Ex::gfPrintLog("LOADING BATCH $batch_date");
- $this->lfBatOrderDaily($tmp_time);
- $this->lfBatOrderDailyHour($tmp_time);
- $this->lfBatOrderAge($tmp_time);
- }
- }
-
- // バッチ集計用のSQL文を取得する。
- function lfGetOrderDailySQL($start, $end) {
- $from = " FROM dtb_order AS T1 LEFT JOIN dtb_customer AS T2 USING ( customer_id ) ";
- $where = " WHERE T1.del_flg = 0 AND T1.status <> " . ORDER_CANCEL . " AND T1.create_date BETWEEN '$start' AND '$end' ";
-
- /* mysqlでも問題ないように修正
- $sql = "SELECT ";
- $sql.= "COUNT(*) AS total_order, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE customer_id = 0)) AS nonmember, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE customer_id <> 0 GROUP BY customer_id)) AS member, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 1)) AS men, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 2)) AS women, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 1 AND customer_id <> 0)) AS men_member, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 1 AND customer_id = 0)) AS men_nonmember, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 2 AND customer_id <> 0)) AS women_member, ";
- $sql.= "SUM((SELECT COUNT(*) WHERE order_sex = 2 AND customer_id = 0)) AS women_nonmember, ";
- $sql.= "SUM(total) AS total, ";
- $sql.= "int8(AVG(total)) AS total_average ";
- $sql.= $from;
- $sql.= $where; // 受注作成日で検索する
- */
- $sql = "SELECT ";
- $sql.= "COUNT(*) AS total_order, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.customer_id = 0) AS nonmember ) AS nonmember, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.customer_id <> 0) AS member ) AS member, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1) AS men ) AS men, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2) AS women ) AS women, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1 AND T2.customer_id <> 0) AS men_member ) AS men_member, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1 AND T1.customer_id = 0) AS men_nonmember ) AS men_nonmember, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2 AND T2.customer_id <> 0) AS women_member ) AS women_member, ";
- $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2 AND T1.customer_id = 0) AS women_nonmember ) AS women_nonmember, ";
- $sql.= "SUM(total) AS total, ";
- $sql.= "(AVG(total)) AS total_average ";
- $sql.= $from;
- $sql.= $where; // 受注作成日で検索する
-
- return $sql;
- }
-
- // 売上げ集計バッチ処理(日別)
- function lfBatOrderDaily($time) {
- $masterData = new SC_DB_MasterData_Ex();
- $arrWDAY = $masterData->getMasterData("mtb_wday");
- // 集計対象日を取得する
- $date = date("Y-m-d", $time);
-
- $start = $date . " 00:00:00";
- $end = $date . " 23:59:59";
-
- $sql = $this->lfGetOrderDailySQL($start,$end);
-
- $objQuery = new SC_Query();
- $arrRet = $objQuery->getAll($sql);
-
- $sqlval = $arrRet[0];
-
- // 空文字を"0"に変換
- foreach($sqlval as $key => $val) {
- if ($val == "") {
- $sqlval[$key] = "0";
- }
- }
-
- $sqlval['create_date'] = 'now()';
- $sqlval['order_date'] = $start;
- $sqlval['year'] = date("Y", $time);
- $sqlval['month'] = date("m", $time);
- $sqlval['day'] = date("d", $time);
- $sqlval['wday'] = date("w", $time);
- $sqlval['key_day'] = sprintf("%02d/%02d/%02d", substr($sqlval['year'],2), $sqlval['month'], $sqlval['day']);
- $sqlval['key_month'] = sprintf("%02d/%02d", substr($sqlval['year'],2), $sqlval['month']);
- $sqlval['key_year'] = sprintf("%d", $sqlval['year']);
- $sqlval['key_wday'] = sprintf("%s", $arrWDAY[$sqlval['wday']]);
-
- $objQuery->delete("dtb_bat_order_daily", "order_date = ?", array($start));
- $objQuery->insert("dtb_bat_order_daily", $sqlval);
- }
-
- // 売上げ集計バッチ処理(時間別)
- function lfBatOrderDailyHour($time) {
-
- // 集計対象日を取得する
- $date = date("Y-m-d", $time);
- $objQuery = new SC_Query();
-
- $start = $date . " 00:00:00";
- $objQuery->delete("dtb_bat_order_daily_hour", "order_date = ?", array($start));
-
- // 1時間毎に集計する。
- for($i = 0; $i < 24; $i++) {
- $sdate = sprintf("%s %02d:00:00", $date, $i);
- $edate = sprintf("%s %02d:59:59", $date, $i);
- $sql = $this->lfGetOrderDailySQL($sdate, $edate);
- $arrRet = $objQuery->getAll($sql);
- $sqlval = $arrRet[0];
- // 空文字を"0"に変換
- foreach($sqlval as $key => $val) {
- if ($val == "") {
- $sqlval[$key] = "0";
- }
- }
- $sqlval['create_date'] = "now()";
- $sqlval['order_date'] = $start;
- $sqlval['hour'] = "$i";
- $objQuery->insert("dtb_bat_order_daily_hour", $sqlval);
- }
- }
-
- // 売上げ集計バッチ処理(年齢別)
- function lfBatOrderAge($time) {
-
- $age_loop = intval(BAT_ORDER_AGE / 10);
-
- // 年齢の範囲を指定してデータ抽出
- $sql = "SELECT COUNT(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average ";
- $sql.= "FROM dtb_order ";
-
- // 集計対象日を取得する
- $date = date("Y-m-d", $time);
-
- $start = $date . " 00:00:00";
- $end = $date . " 23:59:59";
-
- $objQuery = new SC_Query();
- $objQuery->delete("dtb_bat_order_daily_age", "order_date = ?", array($start));
-
- /* 会員集計 */
-
- $base_where = "WHERE (create_date BETWEEN ? AND ?) AND customer_id <> 0 AND del_flg = 0 AND status <> " . ORDER_CANCEL;
-
- $end_date = date("Y/m/d", time());
- $start_date = date("Y/m/d",strtotime("-10 year" ,strtotime($end_date)));
- $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($end_date)));
- // 年齢毎に集計する。
- for($i = 0; $i <= $age_loop; $i++) {
- $where = $base_where . " AND order_birth >= cast('$start_date' as date)";
- $start_age = $i * 10;
- if($i < $age_loop) {
- $end_age = $start_age+9;
- $where = $where . " AND order_birth < cast('$end_date' as date)";
- }else{
- $where = $base_where . " AND order_birth < cast('$end_date' as date)";
- $end_age = 999;
- }
- $this->lfBatOrderAgeSub($sql . $where, $start, $end, $start_age, $end_age, 1);
- $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($start_date)));
- $start_date = date("Y/m/d",strtotime("-10 year",strtotime($start_date)));
- }
-
- // 誕生日入力なし
- $where = $base_where . " AND order_birth IS NULL ";
- $this->lfBatOrderAgeSub($sql . $where, $start, $end, NULL, NULL, 1);
-
- /* 非会員集計 */
-
- $base_where = "WHERE (create_date BETWEEN ? AND ?) AND customer_id = 0 AND del_flg = 0 AND status <> " . ORDER_CANCEL;
- $where = $base_where . " AND (to_number(to_char(age(current_timestamp, order_birth), 'YYY'), 999) BETWEEN ? AND ?) ";
-
- $end_date = date("Y/m/d", time());
- $start_date = date("Y/m/d",strtotime("-10 year" ,strtotime($end_date)));
- $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($end_date)));
- // 年齢毎に集計する。
- for($i = 0; $i <= $age_loop; $i++) {
- $where = $base_where . " AND order_birth >= cast('$start_date' as date)";
- $start_age = $i * 10;
- if($i < $age_loop) {
- $end_age = $start_age+9;
- $where = $where . " AND order_birth < cast('$end_date' as date)";
- }else{
- $where = $base_where . " AND order_birth < cast('$end_date' as date)";
- $end_age = 999;
- }
- $this->lfBatOrderAgeSub($sql . $where, $start, $end, $start_age, $end_age, 0);
- $end_date = date("Y/m/d",strtotime("1 day" ,strtotime($start_date)));
- $start_date = date("Y/m/d",strtotime("-10 year",strtotime($start_date)));
- }
-
- // 誕生日入力なし
- $where = $base_where . " AND order_birth IS NULL AND del_flg = 0";
- $this->lfBatOrderAgeSub($sql . $where, $start, $end, NULL, NULL, 0);
- }
-
- // 売上げ集計バッチ処理(年齢別) 登録部分
- function lfBatOrderAgeSub($sql, $start, $end, $start_age, $end_age, $member) {
- $objQuery = new SC_Query();
-
- $arrRet = $objQuery->getAll($sql, array($start, $end));
- $sqlval = $arrRet[0];
-
- // 空文字を"0"に変換
- foreach($sqlval as $key => $val) {
- if ($val == "") {
- $sqlval[$key] = "0";
- }
- }
-
- $sqlval['create_date'] = "now()";
- $sqlval['order_date'] = $start;
- $sqlval['start_age'] = "$start_age";
- $sqlval['end_age'] = "$end_age";
- $sqlval['member'] = "$member";
-
- $objQuery->insert("dtb_bat_order_daily_age", $sqlval);
- }
-}
-?>
変更: branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2011-02-24 08:57:47 UTC (rev 20381)
@@ -62,8 +62,6 @@
function sfChangeMySQL($sql){
// 改行、タブを1スペースに変換
$sql = preg_replace("/[\r\n\t]/"," ",$sql);
- // view表をインラインビューに変換する
- $sql = $this->sfChangeView($sql);
// ILIKE検索をLIKE検索に変換する
$sql = $this->sfChangeILIKE($sql);
// RANDOM()をRAND()に変換する
@@ -239,49 +237,6 @@
}
/**
- * 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句へ変換する.
*
* @access private
@@ -337,143 +292,6 @@
}
/**
- * 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
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php 2011-02-24 08:57:47 UTC (rev 20381)
@@ -22,7 +22,6 @@
*/
// {{{ 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");
require_once(CLASS_REALDIR . "graph/SC_GraphBar.php");
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-24 08:57:47 UTC (rev 20381)
@@ -57,17 +57,6 @@
flg6 text
) ENGINE=InnoDB;
-CREATE TABLE dtb_bat_order_daily_age (
- order_count numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- start_age smallint,
- end_age smallint,
- member smallint,
- order_date datetime,
- create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=InnoDB;
-
CREATE TABLE dtb_update (
module_id int NOT NULL,
module_name text NOT NULL,
@@ -405,47 +394,6 @@
PRIMARY KEY(product_status_id, product_id)
) ENGINE=InnoDB;
-CREATE TABLE dtb_bat_order_daily (
- total_order numeric NOT NULL DEFAULT 0,
- member numeric NOT NULL DEFAULT 0,
- nonmember numeric NOT NULL DEFAULT 0,
- men numeric NOT NULL DEFAULT 0,
- women numeric NOT NULL DEFAULT 0,
- men_member numeric NOT NULL DEFAULT 0,
- men_nonmember numeric NOT NULL DEFAULT 0,
- women_member numeric NOT NULL DEFAULT 0,
- women_nonmember numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- order_date datetime NOT NULL,
- create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- year smallint NOT NULL,
- month smallint NOT NULL,
- day smallint NOT NULL,
- wday smallint NOT NULL,
- key_day text NOT NULL,
- key_month text NOT NULL,
- key_year text NOT NULL,
- key_wday text NOT NULL
-) ENGINE=InnoDB;
-
-CREATE TABLE dtb_bat_order_daily_hour (
- total_order numeric NOT NULL DEFAULT 0,
- member numeric NOT NULL DEFAULT 0,
- nonmember numeric NOT NULL DEFAULT 0,
- men numeric NOT NULL DEFAULT 0,
- women numeric NOT NULL DEFAULT 0,
- men_member numeric NOT NULL DEFAULT 0,
- men_nonmember numeric NOT NULL DEFAULT 0,
- women_member numeric NOT NULL DEFAULT 0,
- women_nonmember numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- hour smallint NOT NULL DEFAULT 0,
- order_date datetime,
- create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=InnoDB;
-
CREATE TABLE dtb_recommend_products (
product_id int NOT NULL,
recommend_product_id int NOT NULL,
@@ -788,13 +736,6 @@
PRIMARY KEY (member_id)
) ENGINE=InnoDB;
-CREATE TABLE dtb_bat_relate_products (
- product_id int,
- relate_product_id int,
- customer_id int,
- create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) ENGINE=InnoDB;
-
CREATE TABLE dtb_pagelayout (
device_type_id int NOT NULL,
page_id int NOT NULL,
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-24 08:57:47 UTC (rev 20381)
@@ -57,17 +57,6 @@
flg6 text
);
-CREATE TABLE dtb_bat_order_daily_age (
- order_count numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- start_age smallint,
- end_age smallint,
- member smallint,
- order_date timestamp,
- create_date timestamp NOT NULL DEFAULT now()
-);
-
CREATE TABLE dtb_update (
module_id int NOT NULL,
module_name text NOT NULL,
@@ -405,47 +394,6 @@
PRIMARY KEY (product_status_id, product_id)
);
-CREATE TABLE dtb_bat_order_daily (
- total_order numeric NOT NULL DEFAULT 0,
- member numeric NOT NULL DEFAULT 0,
- nonmember numeric NOT NULL DEFAULT 0,
- men numeric NOT NULL DEFAULT 0,
- women numeric NOT NULL DEFAULT 0,
- men_member numeric NOT NULL DEFAULT 0,
- men_nonmember numeric NOT NULL DEFAULT 0,
- women_member numeric NOT NULL DEFAULT 0,
- women_nonmember numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- order_date timestamp NOT NULL,
- create_date timestamp NOT NULL DEFAULT now(),
- year smallint NOT NULL,
- month smallint NOT NULL,
- day smallint NOT NULL,
- wday smallint NOT NULL,
- key_day text NOT NULL,
- key_month text NOT NULL,
- key_year text NOT NULL,
- key_wday text NOT NULL
-);
-
-CREATE TABLE dtb_bat_order_daily_hour (
- total_order numeric NOT NULL DEFAULT 0,
- member numeric NOT NULL DEFAULT 0,
- nonmember numeric NOT NULL DEFAULT 0,
- men numeric NOT NULL DEFAULT 0,
- women numeric NOT NULL DEFAULT 0,
- men_member numeric NOT NULL DEFAULT 0,
- men_nonmember numeric NOT NULL DEFAULT 0,
- women_member numeric NOT NULL DEFAULT 0,
- women_nonmember numeric NOT NULL DEFAULT 0,
- total numeric NOT NULL DEFAULT 0,
- total_average numeric NOT NULL DEFAULT 0,
- hour smallint NOT NULL DEFAULT 0,
- order_date timestamp,
- create_date timestamp NOT NULL DEFAULT now()
-);
-
CREATE TABLE dtb_recommend_products (
product_id int NOT NULL,
recommend_product_id int NOT NULL,
@@ -788,13 +736,6 @@
PRIMARY KEY (member_id)
);
-CREATE TABLE dtb_bat_relate_products (
- product_id int,
- relate_product_id int,
- customer_id int,
- create_date timestamp NOT NULL DEFAULT now()
-);
-
CREATE TABLE dtb_pagelayout (
device_type_id int NOT NULL,
page_id int NOT NULL,
変更: branches/version-2_5-dev/html/install/sql/drop_table.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_table.sql 2011-02-24 08:49:36 UTC (rev 20380)
+++ branches/version-2_5-dev/html/install/sql/drop_table.sql 2011-02-24 08:57:47 UTC (rev 20381)
@@ -1,6 +1,5 @@
DROP TABLE dtb_kiyaku;
DROP TABLE mtb_zip;
-DROP TABLE dtb_bat_order_daily_age;
DROP TABLE dtb_update;
DROP TABLE dtb_baseinfo;
DROP TABLE dtb_deliv;
@@ -18,8 +17,6 @@
DROP TABLE dtb_class_combination;
DROP TABLE dtb_category;
DROP TABLE dtb_product_categories;
-DROP TABLE dtb_bat_order_daily;
-DROP TABLE dtb_bat_order_daily_hour;
DROP TABLE dtb_recommend_products;
DROP TABLE dtb_review;
DROP TABLE dtb_category_count;
@@ -38,7 +35,6 @@
DROP TABLE dtb_order_detail;
DROP TABLE mtb_pref;
DROP TABLE dtb_member;
-DROP TABLE dtb_bat_relate_products;
DROP TABLE dtb_pagelayout;
DROP TABLE dtb_bloc;
DROP TABLE dtb_blocposition;
Svn-src-all メーリングリストの案内