A bit of code cleanup

jgebal · jgebal · commit 470bb32883f9 · 2019-01-03T23:46:15.000Z
diff --git a/source/check_object_grants.sql b/source/check_object_grants.sql
@@ -6,7 +6,7 @@ declare
   l_owner_column   varchar2(128);
 
   function get_view(a_dba_view_name varchar2) return varchar2 is
-      l_invalid_object_name exception;
+    l_invalid_object_name exception;
     l_result              varchar2(128) := lower(a_dba_view_name);
     pragma exception_init(l_invalid_object_name,-44002);
     begin
diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb
@@ -189,6 +189,5 @@ create or replace package body ut_metadata as
     return l_cnt > 0;
   end;
 
-
 end;
 /
diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb
@@ -210,10 +210,6 @@ create or replace type body ut_compound_data_value as
   begin
     l_other         := treat(a_other as ut_compound_data_value);
     l_diff_id       := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id);
---     dbms_output.put_line(ut_compound_data_helper.gen_compare_sql(
---                            a_inclusion_compare, a_is_negated, a_unordered,
---                            treat(a_other as ut_data_value_refcursor), a_join_by_list
---                            ));
     open l_loop_curs for
       ut_compound_data_helper.gen_compare_sql(
         a_inclusion_compare, a_is_negated, a_unordered,
diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb
@@ -40,8 +40,8 @@ create or replace type body ut_cursor_details as
       null;
     end;
     return l_anytype;
-  end;   
-  
+  end;
+
   member procedure desc_compound_data(
     self in out nocopy ut_cursor_details, a_compound_data anytype,
     a_parent_name in varchar2, a_level in integer, a_access_path in varchar2
@@ -161,24 +161,6 @@ create or replace type body ut_cursor_details as
     return;
   end;
 
-  member function get_anytype_from_name(
-    a_owner in varchar2, a_type_name in varchar2
-  ) return anytype is
-    l_result anytype;
-  begin
-    begin
-      $if dbms_db_version.version <= 12 $then
-        l_result := anytype.getpersistent( a_owner, a_type_name );
-      $else
-        l_result := getanytypefrompersistent( a_owner, a_type_name );
-      $end
-    exception
-    when others then
-      null;
-    end;
-    return l_result;
-  end;
-
   member function is_collection (a_anytype_code in integer) return boolean is
   begin
     return coalesce(a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection),false);
@@ -188,7 +170,7 @@ create or replace type body ut_cursor_details as
   begin
     return is_collection(
       ut_compound_data_helper.get_anytype_members_info(
-        get_anytype_from_name(a_owner, a_type_name)
+        get_user_defined_type(a_owner, a_type_name)
       ).type_code
     );
   end;
diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps
@@ -28,9 +28,6 @@ create or replace type ut_cursor_details force authid current_user as object (
      a_parent_name in varchar2, a_level in integer, a_access_path in varchar2
    ),
    member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype,
-   member function get_anytype_from_name(
-    a_owner in varchar2, a_type_name in varchar2
-    ) return anytype,
    member function is_collection(a_anytype_code in integer) return boolean,
    member function is_collection(a_owner varchar2, a_type_name varchar2) return boolean,
    member procedure ordered_columns(self in out nocopy ut_cursor_details, a_ordered_columns boolean := false)

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,5 @@ create or replace package body ut_metadata as`
`189`	`189`	`return l_cnt > 0;`
`190`	`190`	`end;`
`191`	`191`
`192`		`-`
`193`	`192`	`end;`
`194`	`193`	`/`