procs/matrix_guidance.pg.sql

@@ -97,11 +97,7 @@ BEGIN
         SELECT
             q.ctid,
             CASE SUBSTRING(bc.cclass, 2, 3)
-                WHEN 'DIS' THEN 
-                    CASE SUBSTRING(sc.cclass, 2, 3) 
-                        WHEN 'DIS' THEN 'WHS' 
-                        ELSE 'DRP' 
-                    END
+                WHEN 'DIS' THEN CASE SUBSTRING(sc.cclass, 2, 3) WHEN 'DIS' THEN 'WHS' ELSE 'DRP' END
                 ELSE 'DIR'
             END AS chan,
             CASE SUBSTRING(bc.cclass, 2, 3)
@@ -109,20 +105,12 @@ BEGIN
                 ELSE COALESCE(sc.tier, bc.tier)
             END AS tier,
             CASE SUBSTRING(bc.cclass, 2, 3)
-                WHEN 'DIS' THEN 
-                    CASE SUBSTRING(sc.cclass, 2, 3) 
-                        WHEN 'DIS' THEN bc.dba 
-                        ELSE sc.dba 
-                    END
+                WHEN 'DIS' THEN CASE SUBSTRING(sc.cclass, 2, 3) WHEN 'DIS' THEN bc.dba ELSE sc.dba END
                 ELSE bc.dba
             END AS cust,
             i.mpck AS pltq,
             CASE SUBSTRING(bc.cclass, 2, 3)
-                WHEN 'DIS' THEN 
-                    CASE SUBSTRING(sc.cclass, 2, 3) 
-						WHEN 'DIS' THEN COALESCE(sc.plevel,bc.plevel)
-                        ELSE bc.plevel 
-                    END 
+                WHEN 'DIS' THEN CASE SUBSTRING(sc.cclass, 2, 3) WHEN 'DIS' THEN sc.plevel ELSE bc.plevel END
                 ELSE bc.plevel
             END AS plevel,
             i.partgroup AS partgroup,

procs/single_price_call.ms.sql

@@ -182,7 +182,7 @@ BEGIN
 			CASE SUBSTRING(bc.cclass, 2, 3)
 				WHEN 'DIS' THEN 
 					CASE SUBSTRING(sc.cclass, 2, 3)
-						WHEN 'DIS' THEN COALESCE(sc.plevel,bc.plevel)
+						WHEN 'DIS' THEN sc.plevel
 						ELSE bc.plevel
 					END
 				ELSE bc.plevel

procs/single_price_call.pg.sql

@@ -184,7 +184,7 @@ BEGIN
         CASE SUBSTRING(bc.cclass, 2, 3)
             WHEN 'DIS' THEN 
                 CASE SUBSTRING(sc.cclass, 2, 3)
-                    WHEN 'DIS' THEN COALESCE(sc.plevel,bc.plevel)
+                    WHEN 'DIS' THEN sc.plevel
                     ELSE bc.plevel
                 END
             ELSE bc.plevel

procs/single_price_call_func.ms.sql

@@ -78,7 +78,7 @@ BEGIN
 			CASE SUBSTRING(bc.cclass, 2, 3)
 				WHEN 'DIS' THEN 
 					CASE SUBSTRING(sc.cclass, 2, 3)
-						WHEN 'DIS' THEN COALESCE(sc.plevel,bc.plevel)
+						WHEN 'DIS' THEN sc.plevel
 						ELSE bc.plevel
 					END
 				ELSE bc.plevel