resolved sonar violations

jgebal · jgebal · commit c2d52ae8ca99 · 2019-01-05T13:17:51.000Z
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -491,12 +491,9 @@ create or replace package body ut_compound_data_helper is
    )
    order by final_order,]';
    
-   if a_enforce_column_order then
+   if a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then
      l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end,
      case when final_order = 1 then rnk else rn end ]';
-   elsif not(a_enforce_column_order) and not(a_unordered) then
-     l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end,
-     case when final_order = 1 then rnk else rn end ]';    
    elsif a_unordered then
      l_sql := l_sql ||q'[case when final_order = 1 then col_name else to_char(rnk) end,
      case when final_order = 1 then to_char(rn) else col_name end,
diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb
@@ -144,7 +144,6 @@ create or replace type body ut_expectation_refcursor as
   end;
 
   member function uc return ut_expectation_refcursor is
-    l_result ut_expectation_refcursor;
   begin
     return unordered_columns;
   end;
