[Svn-src-all:1459] [version-2_5-dev 20351] viewイラネ、メールテンプレートのムダカラムイラネ。( ゜д゜)、ペッ

fukuda admin @ mail.ec-cube.net
2011年 2月 23日 (水) 19:43:30 JST


Subversion committed to /home/svn/open 20351
http://svn.ec-cube.net/open_trac/changeset/20351
┌────────────────────────────┐
│更新者 :  fukuda                                       │
│更新日時:  2011-02-23 19:43:29 +0900 (水, 23  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
viewイラネ、メールテンプレートのムダカラムイラネ。( ゜д゜)、ペッ


Changed:                      [U:修正,A:追加,D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/html/install/index.php
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
D   branches/version-2_5-dev/html/install/sql/create_view.sql
D   branches/version-2_5-dev/html/install/sql/drop_view.sql

変更: branches/version-2_5-dev/html/install/index.php
===================================================================
--- branches/version-2_5-dev/html/install/index.php	2011-02-23 10:29:07 UTC (rev 20350)
+++ branches/version-2_5-dev/html/install/index.php	2011-02-23 10:43:29 UTC (rev 20351)
@@ -150,17 +150,6 @@
         $objPage->tpl_message.="×:テーブルの作成に失敗しました。<br>";
     }
 
-    // ビューの作成
-    if(count($objPage->arrErr) == 0 and $arrRet['db_type'] == 'pgsql') {
-        // ビューの作成
-        $objPage->arrErr = lfExecuteSQL("./sql/create_view.sql", $dsn);
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="○:ビューの作成に成功しました。<br>";
-        } else {
-            $objPage->tpl_message.="×:ビューの作成に失敗しました。<br>";
-        }
-    }
-
     // 初期データの作成
     if(count($objPage->arrErr) == 0) {
         $objPage->arrErr = lfExecuteSQL("./sql/insert_data.sql", $dsn);
@@ -201,16 +190,6 @@
     }
     $dsn = $arrRet['db_type']."://".$arrRet['db_user'].":".$arrRet['db_password']."@".$arrRet['db_server'].":".$arrRet['db_port']."/".$arrRet['db_name'];
 
-    if ($arrRet['db_type'] == 'pgsql'){
-        // ビューの削除
-        $objPage->arrErr = lfExecuteSQL("./sql/drop_view.sql", $dsn, false);
-        if(count($objPage->arrErr) == 0) {
-            $objPage->tpl_message.="○:ビューの削除に成功しました。<br>";
-        } else {
-            $objPage->tpl_message.="×:ビューの削除に失敗しました。<br>";
-        }
-    }
-
     // テーブルの削除
     if(count($objPage->arrErr) == 0) {
         $objPage->arrErr = lfExecuteSQL("./sql/drop_table.sql", $dsn, false);

変更: 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-23 10:29:07 UTC (rev 20350)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	2011-02-23 10:43:29 UTC (rev 20351)
@@ -239,25 +239,7 @@
     template_id int NOT NULL,
     subject text,
     mail_method int,
-    header text,
     body text,
-    main_title text,
-    main_comment text,
-    main_product_id int,
-    sub_title text,
-    sub_comment text,
-    sub_product_id01 int,
-    sub_product_id02 int,
-    sub_product_id03 int,
-    sub_product_id04 int,
-    sub_product_id05 int,
-    sub_product_id06 int,
-    sub_product_id07 int,
-    sub_product_id08 int,
-    sub_product_id09 int,
-    sub_product_id10 int,
-    sub_product_id11 int,
-    sub_product_id12 int,
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

変更: 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-23 10:29:07 UTC (rev 20350)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	2011-02-23 10:43:29 UTC (rev 20351)
@@ -239,25 +239,7 @@
     template_id int NOT NULL,
     subject text,
     mail_method int,
-    header text,
     body text,
-    main_title text,
-    main_comment text,
-    main_product_id int,
-    sub_title text,
-    sub_comment text,
-    sub_product_id01 int,
-    sub_product_id02 int,
-    sub_product_id03 int,
-    sub_product_id04 int,
-    sub_product_id05 int,
-    sub_product_id06 int,
-    sub_product_id07 int,
-    sub_product_id08 int,
-    sub_product_id09 int,
-    sub_product_id10 int,
-    sub_product_id11 int,
-    sub_product_id12 int,
     del_flg smallint NOT NULL DEFAULT 0,
     creator_id int NOT NULL,
     create_date timestamp NOT NULL DEFAULT now(),

削除: branches/version-2_5-dev/html/install/sql/create_view.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_view.sql	2011-02-23 10:29:07 UTC (rev 20350)
+++ branches/version-2_5-dev/html/install/sql/create_view.sql	2011-02-23 10:43:29 UTC (rev 20351)
@@ -1,96 +0,0 @@
-CREATE VIEW vw_products_allclass_detail AS
-    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
-        LEFT 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
-;
-
-CREATE VIEW vw_products_allclass AS
-    SELECT
-        alldtl.*,
-        dtb_category.rank AS category_rank,
-        T2.category_id,
-        T2.rank AS product_rank
-    FROM
-        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
-;

削除: branches/version-2_5-dev/html/install/sql/drop_view.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/drop_view.sql	2011-02-23 10:29:07 UTC (rev 20350)
+++ branches/version-2_5-dev/html/install/sql/drop_view.sql	2011-02-23 10:43:29 UTC (rev 20351)
@@ -1,2 +0,0 @@
-DROP VIEW vw_products_allclass;
-DROP VIEW vw_products_allclass_detail;




Svn-src-all メーリングリストの案内