Index: openacs-4/packages/ecommerce/www/checkout-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/checkout-2.xql 10 Jul 2001 20:42:02 -0000 1.1
+++ openacs-4/packages/ecommerce/www/checkout-2.xql 11 Jul 2001 04:52:04 -0000 1.2
@@ -44,25 +44,23 @@
- FIX ME OUTER JOIN
select p.no_shipping_avail_p, p.product_name, p.one_line_description, p.product_id,
count(*) as quantity,
u.offer_code,
i.color_choice, i.size_choice, i.style_choice
from ec_orders o
- JOIN ec_items i on (o.order_id=i.order_id)
- JOIN ec_products p on (i.product_id=p.product_id),
- (select offer_code, product_id
+ JOIN ec_items i on (o.order_id=i.order_id)
+ JOIN ec_products p on (i.product_id=p.product_id)
+ LEFT JOIN (select offer_code, product_id
from ec_user_session_offer_codes usoc
where usoc.user_session_id=:user_session_id) u
- where i.product_id=p.product_id
- and o.order_id=i.order_id
- and p.product_id= u.product_id(+)
- and o.user_session_id=:user_session_id and o.order_state='in_basket'
+ on (p.product_id = u.product_id)
+ where o.user_session_id=:user_session_id and o.order_state='in_basket'
group by p.no_shipping_avail_p, p.product_name, p.one_line_description, p.product_id,
u.offer_code,
i.color_choice, i.size_choice, i.style_choice
+
Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.xql 10 Jul 2001 20:42:02 -0000 1.1
+++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.xql 11 Jul 2001 04:52:05 -0000 1.2
@@ -76,12 +76,14 @@
- FIX ME OUTER JOIN
+
select i.item_id, i.product_id, u.offer_code
-from ec_items i,
+from ec_items i
+ LEFT JOIN
(select * from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u
-where i.product_id=u.product_id(+)
-and i.order_id=:order_id
+ on (i.product_id=u.product_id)
+where i.order_id=:order_id
+
Index: openacs-4/packages/ecommerce/www/product-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/product-postgresql.xql 10 Jul 2001 20:42:02 -0000 1.1
+++ openacs-4/packages/ecommerce/www/product-postgresql.xql 11 Jul 2001 04:52:05 -0000 1.2
@@ -5,7 +5,6 @@
- FIX ME ROWNUM
select * from
(select category_id,
@@ -18,7 +17,7 @@
from ec_category_product_map m
where product_id = :product_id
order by subcount, subsubcount, category_id)
- where rownum = 1
+ limit 1
Index: openacs-4/packages/ecommerce/www/product.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/product.xql 10 Jul 2001 20:42:02 -0000 1.1
+++ openacs-4/packages/ecommerce/www/product.xql 11 Jul 2001 04:52:05 -0000 1.2
@@ -38,12 +38,11 @@
- FIX ME OUTER JOIN
select *
- from ec_products p, ec_custom_product_field_values v
+ from ec_products p
+ LEFT JOIN ec_custom_product_field_values v on (p.product_id = v.product_id)
where p.product_id = :product_id
- and p.product_id = v.product_id(+)
Index: openacs-4/packages/ecommerce/www/shopping-cart.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart.xql 10 Jul 2001 20:42:02 -0000 1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart.xql 11 Jul 2001 04:52:05 -0000 1.2
@@ -13,15 +13,16 @@
- FIX ME OUTER JOIN
+
select p.product_name, p.one_line_description, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice
-from ec_orders o, ec_items i, ec_products p,
-(select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u
-where i.product_id=p.product_id
-and o.order_id=i.order_id
-and p.product_id=u.product_id(+)
-and o.user_session_id=:user_session_id and o.order_state='in_basket'
+from ec_orders o
+ JOIN ec_items i on (o.order_id=i.order_id)
+ JOIN ec_products p on (i.product_id=p.product_id)
+ LEFT JOIN (select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u
+ on (p.product_id=u.product_id)
+where o.user_session_id=:user_session_id and o.order_state='in_basket'
group by p.product_name, p.one_line_description, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice
+