Update order by to be done before max row nums are pulled

lwasylow · lwasylow · commit 0fc68d19f85d · 2018-05-05T10:12:31.000+01:00
diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql
@@ -16,7 +16,7 @@ create global temporary table ut_compound_data_diff_tmp(
   item_no    integer,
   item_hash  raw(128),
   duplicate_no integer,
-  --constraint ut_compound_data_diff_tmp_uk1 unique (diff_id, item_no, item_hash, duplicate_no),
+  constraint ut_compound_data_diff_tmp_uk1 unique (diff_id, item_no, item_hash, duplicate_no),
   constraint ut_compound_data_diff_tmp_chk check(
    item_no is not null and item_hash is null and duplicate_no is null
    or item_no is null and item_hash is not null and duplicate_no is not null
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -178,6 +178,9 @@ create or replace package body ut_compound_data_helper is
     execute immediate q'[
       with diff_info as (select item_hash from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid)
       select rn,diff_type,diffed_row
+      from
+      (
+      select rn,diff_type,diffed_row
       from
         (select dense_rank() over (order by pk_hash) as rn, diff_type,data_item diffed_row
          from
@@ -231,8 +234,10 @@ create or replace package body ut_compound_data_helper is
             unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:'
                       ,miss_item as 'Missing:', ext_item as 'Extra:') )
          )
+      order by 1, 2
+      )
       where rownum <= :max_rows
-      order by 1, 2]'
+      ]'
     bulk collect into l_results
     using a_diff_id,
     a_join_by_xpath,a_exclude_xpath, a_include_xpath, a_expected_dataset_guid,
diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql
@@ -16,7 +16,6 @@ create global temporary table ut_compound_data_tmp(
   item_no          integer,
   item_data        xmltype,
   item_hash        raw(128),
-  duplicate_no     integer
-  --constraint ut_cmp_data_tmp_item_ak unique (data_id, item_no),
-  --constraint ut_cmp_data_tmp_hash_pk unique (data_id, item_hash , duplicate_no)
+  duplicate_no     integer,
+  constraint ut_cmp_data_tmp_hash_pk unique (data_id,item_no, item_hash , duplicate_no)
 ) on commit preserve rows;
