Changeset 18818 for branches/version-2_5-dev

Timestamp:

2010/09/22 01:39:44 (16 years ago)

Author:

Seasoft

Message:

#781(規格のデータベースを木構造に)

• r18815 で発生していた商品を新規登録できない不具合を改修。

Location:

branches/version-2_5-dev

Files:

• data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (modified) (2 diffs)
• html/install/sql/create_table_mysql.sql (modified) (1 diff)
• html/install/sql/create_table_pgsql.sql (modified) (1 diff)
• html/install/sql/insert_data.sql (modified) (1 diff)
• test/class/page/LC_Page_Admin_Products_ProductClass_Test.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -361 +361 @@
                               stock_unlimited,
                               sale_limit,
-                              sale_unlimited,
                               point_rate
                          FROM dtb_products_class
@@ -855 +854 @@
 
         // 配列の添字を定義
-        $checkArray = array('product_class_id', 'product_id', 'product_code', 'stock', 'stock_unlimited', 'price01', 'price02', 'sale_limit', 'sale_unlimited', 'deliv_fee', 'point_rate', 'del_flg');
+        $checkArray = array('product_class_id', 'product_id', 'product_code', 'stock', 'stock_unlimited', 'price01', 'price02', 'sale_limit', 'deliv_fee', 'point_rate');
         $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $checkArray);
         $sqlval = SC_Utils_Ex::arrayDefineIndexes($sqlval, $checkArray);

branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

@@ -321 +321 @@
     stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
-    sale_unlimited smallint NOT NULL DEFAULT 0,
     price01 numeric,
     price02 numeric,

branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

@@ -321 +321 @@
     stock_unlimited smallint NOT NULL DEFAULT 0,
     sale_limit numeric,
-    sale_unlimited smallint NOT NULL DEFAULT 0,
     price01 numeric,
     price02 numeric,

branches/version-2_5-dev/html/install/sql/insert_data.sql

@@ -395 +395 @@
 INSERT INTO dtb_products (product_id, name, maker_id, rank, status, comment1, comment2, comment3, comment4, comment5, comment6, note, file1, file2, file3, file4, file5, file6, main_list_comment, main_list_image, main_comment, main_image, main_large_image, sub_title1, sub_comment1, sub_image1, sub_large_image1, sub_title2, sub_comment2, sub_image2, sub_large_image2, sub_title3, sub_comment3, sub_image3, sub_large_image3, sub_title4, sub_comment4, sub_image4, sub_large_image4, sub_title5, sub_comment5, sub_image5, sub_large_image5, sub_title6, sub_comment6, sub_image6, sub_large_image6, del_flg, creator_id, create_date, update_date, deliv_date_id) VALUES (2, 'おなべ', NULL, 1, 1, NULL, NULL, '鍋,なべ,ナベ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '一人用からあります。', '08311311_44f661811fec0.jpg', 'たまには鍋でもどうでしょう。', '08311313_44f661dc649fb.jpg', '08311313_44f661e5698a6.jpg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 3);
 
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(1, 1, 10, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(2, 1, 11, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, 5, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(3, 1, 12, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(4, 1, 13, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(5, 1, 14, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(6, 1, 15, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(7, 1, 16, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(8, 1, 17, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(9, 1, 18, 'ice-01', NULL, 1, NULL, 0, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
-INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, sale_unlimited, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(10, 2, NULL, 'nabe-01', 100, 0, 5, 0, 1700, 1650, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(1, 1, 10, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(2, 1, 11, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 5, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(3, 1, 12, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(4, 1, 13, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(5, 1, 14, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(6, 1, 15, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(7, 1, 16, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(8, 1, 17, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(9, 1, 18, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
+INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg) VALUES(10, 2, NULL, 'nabe-01', 100, 0, 5, 1700, 1650, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0);
 
 INSERT INTO dtb_class_combination (class_combination_id, parent_class_combination_id, classcategory_id, level) VALUES(1, NULL, 3, 1);

branches/version-2_5-dev/test/class/page/LC_Page_Admin_Products_ProductClass_Test.php

@@ -126 +126 @@
                                 'stock' => null,
                                 'stock_unlimited' => 0,
-                                'sale_unlimited' => 0,
                                 'sale_limit' => null,
                                 'price01' => 10000,