Changeset 21809 for branches/version-2_12-dev/data/class/pages/admin

Timestamp:

2012/05/07 00:21:54 (14 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/api/operations/ItemSearch.php 21713@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_12-dev%2Fdata%2Fclass%2Fapi%2Foperations%2FItemSearch.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 15660@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Recommend.php
data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php 21782@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_12-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fownersstore%2FLC_Page_Admin_OwnersStore.php
data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php 16411@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fownersstore%2FLC_Page_Admin_OwnersStore_Log.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php 15526@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductRank.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
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Category.php
data/class/pages/mypage/LC_Page_Mypage_MailView.php 17922@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_MailView.php
data/class/pages/mypage/LC_Page_Mypage_Order.php 16238@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Order.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

4477

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: [email protected]
sha1: bef21b70135260bbb8f95ba265b120aa53acb518

bzr:timestamp:

2012-05-07 00:21:47.828999996 +0900

bzr:user-agent:

bzr2.4.2+bzr-svn1.1.2

Message:

#1753 (SQL の USING 句を使用しない)

• USING を ON に修正

Location:

branches/version-2_12-dev/data/class/pages/admin

Files:

• contents/LC_Page_Admin_Contents_Recommend.php (modified) (1 diff)
• ownersstore/LC_Page_Admin_OwnersStore.php (modified) (1 diff)
• ownersstore/LC_Page_Admin_OwnersStore_Log.php (modified) (2 diffs)
• products/LC_Page_Admin_Products_ProductRank.php (modified) (1 diff)
• total/LC_Page_Admin_Total.php (modified) (2 diffs)

branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php

@@ -176 +176 @@
         $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*';
-        $table = 'dtb_best_products INNER JOIN dtb_products USING (product_id)';
+        $table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
         $where = 'dtb_best_products.del_flg = 0';
         $order = 'rank';

branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php

@@ -902 +902 @@
         foreach ($hookPoints as $hookPoint) {
             // 競合するプラグインを取得する,
-            $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 USING(plugin_id)';
+            $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 ON T1.plugin_id = T2.plugin_id';
             $where = 'T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = ' . PLUGIN_ENABLE_TRUE;
             $objQuery->setGroupBy('T1.plugin_id, T2.plugin_name');

branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php

@@ -106 +106 @@
     FROM
         dtb_module
-    ) AS modules USING(module_id)
+    ) AS modules ON dtb_module_update_logs.module_id = modules.module_id
 ORDER BY update_date DESC
 END;
@@ -132 +132 @@
     FROM
         dtb_module
-    ) AS modules USING(module_id)
+    ) AS modules ON dtb_module_update_logs.module_id = modules.module_id
 WHERE
     log_id = ?

branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php

@@ -121 +121 @@
         // FIXME SC_Product クラスを使用した実装
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'product_id, name, main_list_image, product_code_min, product_code_max, status';
+        $col = 'alldtl.product_id, name, main_list_image, product_code_min, product_code_max, status';
         $objProduct = new SC_Product();
         $table = $objProduct->alldtlSQL();
-        $table.= ' LEFT JOIN dtb_product_categories AS T5 USING(product_id)';
+        $table.= ' LEFT JOIN dtb_product_categories AS T5 ON alldtl.product_id = T5.product_id';
         $where = 'del_flg = 0 AND category_id = ?';
 

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

@@ -556 +556 @@
                 product_name,
                 SUM(quantity) AS products_count,
-                COUNT(order_id) AS order_count,
+                COUNT(dtb_order_detail.order_id) AS order_count,
                 price,
                 (price * SUM(quantity)) AS total
 __EOS__;
 
-        $from = 'dtb_order_detail JOIN dtb_order USING(order_id)';
+        $from = 'dtb_order_detail JOIN dtb_order ON dtb_order_detail.order_id = dtb_order.order_id';
 
         /*
@@ -591 +591 @@
 __EOS__;
 
-        $from   = 'dtb_order JOIN dtb_customer USING ( customer_id)';
+        $from   = 'dtb_order JOIN dtb_customer ON dtb_order.customer_id = dtb_customer.customer_id';
 
         $where .= ' AND dtb_order.del_flg = 0 AND dtb_order.status <> ?';