diff --git a/.mvn/maven.config b/.mvn/maven.config index c04b490e..ad7b391d 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1 @@ --Drevision=1.1.0-SNAPSHOT +-Drevision=1.1.0 diff --git a/apex/pom.xml b/apex/pom.xml index 19e82762..ee134cd5 100644 --- a/apex/pom.xml +++ b/apex/pom.xml @@ -105,7 +105,7 @@ The following property should be set: - application --> - + diff --git a/conf/pom.xml b/conf/pom.xml index cd25814a..b8b2081a 100644 --- a/conf/pom.xml +++ b/conf/pom.xml @@ -98,6 +98,21 @@ provided + + com.oracle.ojdbc + ojdbc8 + ${ojdbc8.version} + + + com.oracle.database.ha + simplefan + + + com.oracle.database.ha + ons + + + @@ -105,17 +120,6 @@ com.oracle.ojdbc ojdbc8 - ${ojdbc8.version} - - - com.oracle.database.ha - simplefan - - - com.oracle.database.ha - ons - - @@ -149,14 +153,16 @@ conf-debug-before ${conf.phase.init} + true + - + @@ -189,6 +195,9 @@ This reduces the need for duplicate folders/files. --> + + + @@ -242,7 +251,7 @@ 1) read the file env.properties (file may not exist) 2) the file should set db and maybe db.prev (for backwards compability we also check db.source and db.target) --> - + @@ -264,7 +273,7 @@ - + + + + + + @@ -296,7 +310,7 @@ - + + * After calling GET_LINE or GET_LINES, any lines not retrieved before the next call to + * PUT, PUT_LINE, or NEW_LINE are discarded to avoid confusing them with the next + * message. + * + * + * So this means that a single call to get_line is enough. + * + * @param p_db_link The database link. + */ +procedure dbms_output_clear +( p_db_link in varchar2 +); + +/** + * Flush the DBMS_OUTPUT buffer for a database link session. + * + * Usefull while debugging a remote session using dbms_output. + * + * The general idea is to invoke dbms_output_enable and dbms_output_clear before the + * remote call and to invoke dbms_output_flush after the call. + * + * This procedure will issue: + * + * execute immediate + * utl_lms.format_message + * ( 'declare + * l_line varchar2(32767 char); + * l_status integer; + * begin + * loop + * dbms_output.get_line@%s(line => l_line, status => l_status); + * exit when l_status != 0; + * dbms_output.put_line(l_line); + * end loop; + * end;' + * , p_db_link + * ) + * + * @param p_db_link The database link. + */ +procedure dbms_output_flush +( p_db_link in varchar2 +); + $if cfg_pkg.c_testing $then +--%suitepath(API) --%suite -- for unit testing diff --git a/db/app/api/src/full/R__14.PACKAGE_BODY.API_PKG.sql b/db/app/api/src/full/R__14.PACKAGE_BODY.API_PKG.sql index 33174295..793c44ea 100644 --- a/db/app/api/src/full/R__14.PACKAGE_BODY.API_PKG.sql +++ b/db/app/api/src/full/R__14.PACKAGE_BODY.API_PKG.sql @@ -1,8 +1,6 @@ CREATE OR REPLACE PACKAGE BODY "API_PKG" -- -*-coding: utf-8-*- is --- LOCAL - $if cfg_pkg.c_testing $then function called_by_utplsql @@ -41,9 +39,11 @@ procedure ut_setup , p_insert_procedure in all_procedures.object_name%type ) is +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then l_dynamic_depth pls_integer := utl_call_stack.dynamic_depth; +$end begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.UT_SETUP'); for i_idx in 1 .. l_dynamic_depth @@ -67,7 +67,7 @@ $end execute immediate 'begin ' || p_insert_procedure || '; end;'; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.leave; exception when others @@ -134,7 +134,7 @@ is l_limit constant pls_integer := 100; l_tab t_tab; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.SHOW_CURSOR'); $end @@ -151,7 +151,7 @@ $end exit when p_cursor%notfound; end loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.leave; $end @@ -170,7 +170,7 @@ is l_error_code varchar2(2000 char) := null; l_error_message varchar2(2000 char) := null; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.TRANSLATE_ERROR'); dbug.print ( dbug."input" @@ -182,7 +182,7 @@ $end if l_sqlerrm like l_generic_exception then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."info", 'Generic exception; l_separator_expr: %s; first txt: %s', l_separator_expr, regexp_substr(l_sqlerrm, l_separator_expr, 1, 1)); $end @@ -194,7 +194,7 @@ $end regexp_substr(l_sqlerrm, l_separator_expr, 1, level) is not null ) loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."info", 'r.nr: %s; r.txt: %s', r.nr, r.txt); $end @@ -209,20 +209,20 @@ $end execute immediate 'begin :1 := ' || p_function || '(:2); end;' using out l_error_message, in l_error_code; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."info", 'l_error_code: %s; l_error_message: %s', l_error_code, l_error_message); $end else -- param 1, 2, 3, etcetera l_error_message := replace(l_error_message, '', r.txt); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."info", 'l_error_message: %s', l_error_message); $end end case; end loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then else dbug.print(dbug."info", 'Error does not match: %s', l_generic_exception); $end @@ -236,14 +236,14 @@ $end l_error_message := l_sqlerrm; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."output", 'return: %s', nvl(l_error_message, l_sqlerrm)); dbug.leave; $end return nvl(l_error_message, l_sqlerrm); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then exception when others then @@ -262,15 +262,15 @@ is l_collection sys.odcivarchar2list; l_max_pos constant integer := 32767; -- or 4000 begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.LIST2COLLECTION'); dbug.print(dbug."input", 'p_sep: %s; p_value_list: %s; p_ignore_null: %s', p_sep, p_value_list, p_ignore_null); $end - select t.value + select t.val bulk collect into l_collection - from ( select substr(str, pos + 1, lead(pos, 1, l_max_pos) over(order by pos) - pos - 1) value + from ( select substr(str, pos + 1, lead(pos, 1, l_max_pos) over(order by pos) - pos - 1) val from ( select str , instr(str, p_sep, 1, level) pos from ( select p_value_list as str @@ -281,9 +281,9 @@ $end level <= length(str) - nvl(length(replace(str, p_sep)), 0) /* number of separators */ + 1 ) ) t - where ( p_ignore_null = 0 or t.value is not null ); + where ( p_ignore_null = 0 or t.val is not null ); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.print(dbug."output", 'l_collection.count: %s', case when l_collection is not null then l_collection.count end); dbug.leave; $end @@ -317,7 +317,7 @@ procedure ut_expect_violation ) is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.UT_EXPECT_VIOLATION'); dbug.print ( dbug."input" @@ -356,7 +356,7 @@ $end raise_application_error(-20000, 'Unknown sqlcode: ' || p_sqlcode); end case; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.leave; exception when others @@ -366,6 +366,117 @@ exception $end end ut_expect_violation; +procedure dbms_output_enable +( p_db_link in varchar2 +, p_buffer_size in integer default null +) +is +begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT || '.DBMS_OUTPUT_ENABLE'); + dbug.print(dbug."input", 'p_db_link: %s; p_buffer_size: %s', p_db_link, p_buffer_size); +$end + + -- check SQL injection + if dbms_assert.simple_sql_name(p_db_link) is null + then + raise value_error; + end if; + + execute immediate + utl_lms.format_message('call dbms_output.enable@%s(:b1)', p_db_link) + using p_buffer_size; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.leave; +exception + when others + then + dbug.leave_on_error; + raise; +$end +end dbms_output_enable; + +procedure dbms_output_clear +( p_db_link in varchar2 +) +is +begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT || '.DBMS_OUTPUT_CLEAR'); + dbug.print(dbug."input", 'p_db_link: %s', p_db_link); +$end + + -- check SQL injection + if dbms_assert.simple_sql_name(p_db_link) is null + then + raise value_error; + end if; + + execute immediate + utl_lms.format_message + ( ' +declare + l_line varchar2(32767 char); + l_status integer; +begin + dbms_output.get_line@%s(l_line, l_status); +end;' + , p_db_link + ); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.leave; +exception + when others + then + dbug.leave_on_error; + raise; +$end +end dbms_output_clear; + +procedure dbms_output_flush +( p_db_link in varchar2 +) +is +begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT || '.DBMS_OUTPUT_FLUSH'); + dbug.print(dbug."input", 'p_db_link: %s', p_db_link); +$end + + -- check SQL injection + if dbms_assert.simple_sql_name(p_db_link) is null + then + raise value_error; + end if; + + execute immediate + utl_lms.format_message + ( ' +declare + l_line varchar2(32767 char); + l_status integer; +begin + loop + dbms_output.get_line@%s(line => l_line, status => l_status); + exit when l_status != 0; + dbms_output.put_line(l_line); + end loop; +end;' + , p_db_link + ); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then + dbug.leave; +exception + when others + then + dbug.leave_on_error; + raise; +$end +end dbms_output_flush; + $if cfg_pkg.c_testing $then procedure ut_setup @@ -376,7 +487,7 @@ procedure ut_setup ) is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.UT_SETUP'); dbug.print ( dbug."input" @@ -399,7 +510,7 @@ $end else ut_setup(p_br_package_tab, p_insert_procedure); end case; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.leave; exception when others @@ -417,7 +528,7 @@ procedure ut_teardown ) is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.enter($$PLSQL_UNIT || '.UT_TEARDOWN'); dbug.print ( dbug."input" @@ -442,7 +553,7 @@ $end else ut_teardown(p_br_package_tab, p_delete_procedure); end case; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.api_pkg.c_debugging >= 1 $then dbug.leave; exception when others diff --git a/db/app/api/src/full/uninstall.sql b/db/app/api/src/full/uninstall.sql index cac44816..dd8c0155 100644 --- a/db/app/api/src/full/uninstall.sql +++ b/db/app/api/src/full/uninstall.sql @@ -1,4 +1,4 @@ -/* perl generate_ddl.pl (version 2021-08-24) --nodynamic-sql --force-view --noremove-output-directory --skip-install-sql --nostrip-source-schema */ +/* perl generate_ddl.pl (version 2021-08-27) --nodynamic-sql --force-view --skip-install-sql --nostrip-source-schema */ /* -- JDBC url : jdbc:oracle:thin:ORACLE_TOOLS@//localhost:1521/orcl diff --git a/db/app/cfg/pom.xml b/db/app/cfg/pom.xml index 9a35c706..c3c1a2af 100644 --- a/db/app/cfg/pom.xml +++ b/db/app/cfg/pom.xml @@ -17,7 +17,7 @@ ${db.src.scripts}/callbacks schema_version_tools_cfg 1 - CFG_INSTALL_PKG,CFG_PKG + CFG_INSTALL_PKG,CFG_PKG,UT_CODE_CHECK_PKG diff --git a/db/app/cfg/src/callbacks/afterMigrate.sql b/db/app/cfg/src/callbacks/afterMigrate.sql index ca2f1c9d..281d0ea8 100644 --- a/db/app/cfg/src/callbacks/afterMigrate.sql +++ b/db/app/cfg/src/callbacks/afterMigrate.sql @@ -8,7 +8,10 @@ l_reuse_settings constant boolean := case when upper(substr('${reuse_settings}', -- This procedure must be in sync with the same procedure in ../full/R__14.PACKAGE_BODY.CFG_INSTALL_PKG.sql -- -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -procedure compile_objects(p_compile_all in boolean, p_reuse_settings in boolean) +procedure compile_objects +( p_compile_all in boolean +, p_reuse_settings in boolean +) is l_message varchar2(2047) := null; -- one less than the maximum for raise_application_error because a newline is added later on begin diff --git a/db/app/cfg/src/callbacks/beforeEachMigrate.sql b/db/app/cfg/src/callbacks/beforeEachMigrate.sql index 74123c90..ead8166e 100644 --- a/db/app/cfg/src/callbacks/beforeEachMigrate.sql +++ b/db/app/cfg/src/callbacks/beforeEachMigrate.sql @@ -6,9 +6,11 @@ declare -- -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! procedure setup_session +( p_plsql_warnings in varchar2 default 'DISABLE:ALL' +) is l_plsql_flags varchar2(4000) := null; - l_statement varchar2(2000); + l_statement varchar2(2000) := null; l_found pls_integer; begin -- does dbug.activate exists? @@ -51,7 +53,17 @@ begin then l_plsql_flags := ltrim(l_plsql_flags, ','); -- if so, alter the session PLSQL_CCFlags and compile with debug info - l_statement := q'[alter session set PLSQL_CCFlags = ']' || l_plsql_flags || q'[' PLSQL_WARNINGS = 'DISABLE:ALL']'; + l_statement := l_statement || q'[ PLSQL_CCFlags = ']' || l_plsql_flags || q'[']'; + end if; + + if p_plsql_warnings is not null + then + l_statement := l_statement || q'[ PLSQL_WARNINGS = ']' || p_plsql_warnings || q'[']'; + end if; + + if l_statement is not null + then + l_statement := 'alter session set ' || l_statement; execute immediate l_statement; end if; end setup_session; diff --git a/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_INSTALL_PKG.sql b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_INSTALL_PKG.sql index 8c98e39c..14ea0598 100644 --- a/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_INSTALL_PKG.sql +++ b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_INSTALL_PKG.sql @@ -1,9 +1,89 @@ CREATE OR REPLACE PACKAGE "CFG_INSTALL_PKG" authid current_user is -procedure setup_session; +type t_compiler_message_tab is table of all_errors%rowtype; -procedure compile_objects(p_compile_all in boolean, p_reuse_settings in boolean); +type t_message_tab is table of varchar2(4000 char); + +/** + * Setup a session. + * + * Used by Flyway to define PL/SQL flags (PLSQL_CCFlags), PL/SQL warnings (PLSQL_WARNINGS) and PL/Scope settings (PLSCOPE_SETTINGS). + * + * PLSQL_CCFlags: + *
    + *
  1. $$Debug (is package DBUG available)
    2. + *
  2. $$Testing (is utPLSQL package UT available)
    3. + *
+ * + * @param p_plsql_warnings For "alter session set PLSQL_WARNINGS = ''" + * @param p_plscope_settings For "alter session set PLSCOPE_SETTINGS = ''" + */ +procedure setup_session +( p_plsql_warnings in varchar2 default 'DISABLE:ALL' +, p_plscope_settings in varchar2 default null +); + +/** + * Compile objects in the current schema. + * + * @param p_compile_all Do we need to compile all? + * @param p_reuse_settings Do we reuse PL/SQL settings? + */ +procedure compile_objects +( p_compile_all in boolean +, p_reuse_settings in boolean +); + +/** + * Show compiler messages. + * + * @param p_object_schema The schema owner of the objects to show. + * @param p_object_type The object type (may be a DBMS_METADATA object type). + * @param p_object_names A comma separated list of object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_recompile Do we need to recompile the objects before showing the messages? 0 means no. + * @param p_plsql_warnings For "alter session set PLSQL_WARNINGS = ''". + * @param p_plscope_settings For "alter session set PLSCOPE_SETTINGS = ''". + * + * @return A list of USER_ERRORS rows ordered by name, type, sequence. + */ +function show_compiler_messages +( p_object_schema in varchar2 default user +, p_object_type in varchar2 default null +, p_object_names in varchar2 default null +, p_object_names_include in integer default null +, p_recompile in integer default 0 +, p_plsql_warnings in varchar2 default 'ENABLE:ALL' +, p_plscope_settings in varchar2 default 'IDENTIFIERS:ALL' +) +return t_compiler_message_tab +pipelined; + +/** + * Format compiler messages. + * + * @param p_object_schema The schema owner of the objects to show. + * @param p_object_type The object type (may be a DBMS_METADATA object type). + * @param p_object_names A comma separated list of object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_recompile Do we need to recompile the objects before showing the messages? 0 means no. + * @param p_plsql_warnings For "alter session set PLSQL_WARNINGS = ''". + * @param p_plscope_settings For "alter session set PLSCOPE_SETTINGS = ''". + * + * @return A list of USER_ERRORS rows ordered by name, type, sequence. + */ +function format_compiler_messages +( p_object_schema in varchar2 default user +, p_object_type in varchar2 default null +, p_object_names in varchar2 default null +, p_object_names_include in integer default null +, p_recompile in integer default 0 +, p_plsql_warnings in varchar2 default 'ENABLE:ALL' +, p_plscope_settings in varchar2 default 'IDENTIFIERS:ALL' +) +return t_message_tab +pipelined; end cfg_install_pkg; / diff --git a/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_PKG.sql b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_PKG.sql index 2bcc0fc3..845d8ee9 100644 --- a/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_PKG.sql +++ b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.CFG_PKG.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE PACKAGE "CFG_PKG" +CREATE OR REPLACE PACKAGE "CFG_PKG" AUTHID DEFINER is c_debugging constant boolean := $if $$Debugging $then true $else false $end; diff --git a/db/app/cfg/src/full/R__09.PACKAGE_SPEC.UT_CODE_CHECK_PKG.sql b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.UT_CODE_CHECK_PKG.sql new file mode 100644 index 00000000..fd892bf9 --- /dev/null +++ b/db/app/cfg/src/full/R__09.PACKAGE_SPEC.UT_CODE_CHECK_PKG.sql @@ -0,0 +1,13 @@ +create or replace package ut_code_check_pkg is + +"abcd" constant varchar2(4 char) := 'abcd'; + +-- Do not defined global public variables but use setters and getters +l_var varchar2(4 char); + +procedure ut_assign(p_str out nocopy varchar2); + +procedure ut_reference(p_str in varchar2); + +end ut_code_check_pkg; +/ diff --git a/db/app/cfg/src/full/R__14.PACKAGE_BODY.CFG_INSTALL_PKG.sql b/db/app/cfg/src/full/R__14.PACKAGE_BODY.CFG_INSTALL_PKG.sql index 4f684a5c..2987dfbc 100644 --- a/db/app/cfg/src/full/R__14.PACKAGE_BODY.CFG_INSTALL_PKG.sql +++ b/db/app/cfg/src/full/R__14.PACKAGE_BODY.CFG_INSTALL_PKG.sql @@ -1,15 +1,61 @@ CREATE OR REPLACE PACKAGE BODY "CFG_INSTALL_PKG" is +-- LOCAL + +function list2collection +( p_value_list in varchar2 +, p_sep in varchar2 +, p_ignore_null in naturaln +) +return sys.odcivarchar2list +is + l_collection sys.odcivarchar2list; + l_max_pos constant integer := 32767; -- or 4000 +begin +$if cfg_pkg.c_debugging $then + dbug.enter($$PLSQL_UNIT || '.LIST2COLLECTION'); + dbug.print(dbug."input", 'p_sep: %s; p_value_list: %s; p_ignore_null: %s', p_sep, p_value_list, p_ignore_null); +$end + + select t.value + bulk collect + into l_collection + from ( select substr(str, pos + 1, lead(pos, 1, l_max_pos) over(order by pos) - pos - 1) value + from ( select str + , instr(str, p_sep, 1, level) pos + from ( select p_value_list as str + from dual + where rownum <= 1 + ) + connect by + level <= length(str) - nvl(length(replace(str, p_sep)), 0) /* number of separators */ + 1 + ) + ) t + where ( p_ignore_null = 0 or t.value is not null ); + +$if cfg_pkg.c_debugging $then + dbug.print(dbug."output", 'l_collection.count: %s', case when l_collection is not null then l_collection.count end); + dbug.leave; +$end + + return l_collection; +end list2collection; + +-- GLOBAL + -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -- -- This procedure must be in sync with the same procedure in ../callbacks/beforeEachMigrate.sql -- -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! procedure setup_session +( p_plsql_warnings in varchar2 default 'DISABLE:ALL' +, p_plscope_settings in varchar2 default null +) is l_plsql_flags varchar2(4000) := null; - l_statement varchar2(2000); + l_statement varchar2(2000) := null; l_found pls_integer; begin -- does dbug.activate exists? @@ -52,7 +98,22 @@ begin then l_plsql_flags := ltrim(l_plsql_flags, ','); -- if so, alter the session PLSQL_CCFlags and compile with debug info - l_statement := q'[alter session set PLSQL_CCFlags = ']' || l_plsql_flags || q'[' PLSQL_WARNINGS = 'DISABLE:ALL']'; + l_statement := l_statement || q'[ PLSQL_CCFlags = ']' || l_plsql_flags || q'[']'; + end if; + + if p_plsql_warnings is not null + then + l_statement := l_statement || q'[ PLSQL_WARNINGS = ']' || p_plsql_warnings || q'[']'; + end if; + + if p_plscope_settings is not null + then + l_statement := l_statement || q'[ PLSCOPE_SETTINGS = ']' || p_plscope_settings || q'[']'; + end if; + + if l_statement is not null + then + l_statement := 'alter session set ' || l_statement; execute immediate l_statement; end if; end setup_session; @@ -62,7 +123,10 @@ end setup_session; -- This procedure must be in sync with the same procedure in ../callbacks/afterMigrate.sql -- -- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -procedure compile_objects(p_compile_all in boolean, p_reuse_settings in boolean) +procedure compile_objects +( p_compile_all in boolean +, p_reuse_settings in boolean +) is l_message varchar2(2047) := null; -- one less than the maximum for raise_application_error because a newline is added later on begin @@ -117,6 +181,533 @@ begin end if; end compile_objects; +function show_compiler_messages +( p_object_schema in varchar2 default user +, p_object_type in varchar2 default null +, p_object_names in varchar2 default null +, p_object_names_include in integer default null +, p_recompile in integer default 0 +, p_plsql_warnings in varchar2 default 'ENABLE:ALL' +, p_plscope_settings in varchar2 default 'IDENTIFIERS:ALL' +) +return t_compiler_message_tab +pipelined +is + pragma autonomous_transaction; -- DDL is issued + + l_object_type constant all_objects.object_type%type := + case + when p_object_type like '%\_SPEC' escape '\' -- meta + then replace(p_object_type, '_SPEC', null) + when p_object_type like '%\_BODY' escape '\' -- meta + then replace(p_object_type, '_', ' ') + else p_object_type + end; + + l_object_name_tab constant sys.odcivarchar2list := + list2collection + ( p_value_list => replace(replace(replace(p_object_names, chr(9)), chr(10)), chr(13)) + , p_sep => ',' + , p_ignore_null => 1 + ); + + cursor c_obj + ( b_object_schema in varchar2 + , b_object_type in varchar2 + , b_object_name_tab in sys.odcivarchar2list + , b_object_names_include in integer + , b_recompile in integer + ) + is + select o.owner + , o.object_name + , o.object_type + , case + when o.object_type in ('FUNCTION', 'PACKAGE', 'PROCEDURE', 'TRIGGER', 'TYPE', 'VIEW') + then 'ALTER ' || o.object_type || ' ' || o.object_name || ' COMPILE' + when o.object_type in ('JAVA CLASS', 'JAVA SOURCE') + then 'ALTER ' || o.object_type || ' "' || o.object_name || '" COMPILE' + when instr(o.object_type, ' BODY') > 0 + then 'ALTER ' || replace(o.object_type, ' BODY') || ' ' || o.object_name || ' COMPILE BODY' + end as command + , ( select count(*) from all_dependencies d where d.owner = o.owner and d.type = o.object_type and d.name = o.object_name ) as nr_deps + from all_objects o + where o.object_type in + ( 'VIEW' + , 'PROCEDURE' + , 'FUNCTION' + , 'PACKAGE' + , 'PACKAGE BODY' + , 'TRIGGER' + , 'TYPE' + , 'TYPE BODY' + , 'JAVA SOURCE' + , 'JAVA CLASS' + ) + and o.object_name not like 'BIN$%' -- Oracle 10g Recycle Bin + and o.owner = b_object_schema + and ( b_object_type is null or o.object_type = b_object_type ) + and ( b_object_names_include is null or + ( b_object_names_include = 0 and o.object_name not in ( select trim(t.column_value) from table(b_object_name_tab) t ) ) or + ( b_object_names_include != 0 and o.object_name in ( select trim(t.column_value) from table(b_object_name_tab) t ) ) + ) + order by + -- it is better to recompile first those objects that have the least number of dependencies, + -- i.e. that impact least their dependent objects + case when b_recompile != 0 then nr_deps end + , o.owner + , o.object_name + , o.object_type + ; + + type t_obj_tab is table of c_obj%rowtype; + + l_obj_tab t_obj_tab; + + r_obj c_obj%rowtype; + + cursor c_compiler_messages + ( b_owner in varchar2 + , b_object_name in varchar2 + , b_object_type in varchar2 + ) + is + with src0 as ( + select owner + , object_name + , object_type + , name + , type + , usage + , usage_context_id + , usage_id + , line + , col + from all_identifiers + where owner = b_owner + and object_name = b_object_name + and object_type = b_object_type + ), src1 as ( + select owner + , object_name + , object_type + , name + , type + , usage + -- Sometimes a usage_context_id does not exists as a usage_id, often when it refers to a context SYS object. + -- In such a case use the latest definition as usage context id. + , ( select nvl(max(p.usage_id), 0) + from src0 p + where p.owner = c.owner + and p.object_name = c.object_name + and p.object_type = c.object_type + and ( p.usage_id = c.usage_context_id or + ( p.usage_id < c.usage_context_id and p.usage = 'DEFINITION' ) + ) + ) as usage_context_id + , usage_id + , line + , col + from src0 c + ) + , src2 as ( + select src1.* + , rtrim(replace(sys_connect_by_path(case when usage = 'DEFINITION' then usage_id || '.' end, '|'), '|'), '.') as usage_id_scope + from src1 + start with + usage_id = 1 + connect by + usage_context_id = prior usage_id + ) + , src3 as ( + select owner + , object_name + , object_type + , name + , type + , usage + , usage_context_id + , usage_id + , line + , col + , usage_id_scope + , row_number() over (partition by owner, object_name, object_type, name, type, usage_id order by length(usage_id_scope) desc nulls last) as seq -- longest usage_id_scope first + from src2 + ), identifiers as ( + select owner + , object_name + , object_type + , name + , type + , usage + , usage_context_id + , usage_id + , line + , col + , usage_id_scope + from src3 + where seq = 1 + ) + , declarations as ( + select * + from identifiers + where usage = 'DECLARATION' + ) + , non_declarations as ( + select i.* + , di.usage_id_scope as declaration_usage_id_scope + from identifiers i + left outer join declarations di + on di.owner = i.owner and + di.object_name = i.object_name and + di.object_type = i.object_type and + di.name = i.name and + di.type = i.type and + i.usage_id_scope like di.usage_id_scope || '%' + where i.usage != 'DECLARATION' + ) + , unused_identifiers as ( + select d.* + , 1 as message_number + , 'is declared but never used' as text + from declarations d + left outer join non_declarations nd + on nd.owner = d.owner and + nd.object_name = d.object_name and + nd.object_type = d.object_type and + nd.name = d.name and + nd.type = d.type and + nd.declaration_usage_id_scope = d.usage_id_scope and + -- skip assignments to a variable/constant but not for instance to a parameter + not(nd.usage = 'ASSIGNMENT' and nd.type in ('VARIABLE', 'CONSTANT')) + where d.object_type not in ('PACKAGE', 'TYPE') + and d.type not in ('FUNCTION', 'PROCEDURE') -- skip unused functions/procedures + and nd.name is null + ) + , assignments as ( + select nd.* + , first_value(usage_id) over (partition by owner, object_name, object_type, name, type, usage, usage_context_id order by line desc) last_usage_id + from non_declarations nd + where nd.usage = 'ASSIGNMENT' + ) + , references as ( + select nd.* + , first_value(usage_id) over (partition by owner, object_name, object_type, name, type, usage, usage_context_id order by line asc) first_usage_id + from non_declarations nd + where nd.usage = 'REFERENCE' + ) + , unset_identifiers as ( + -- Variables that are referenced but never assigned a value (before that reference) + select r.* + , 2 as message_number + , 'is referenced but never assigned a value (before that reference)' as text + from declarations d + inner join non_declarations td -- type declaration via usage_context_id + on td.usage_context_id = d.usage_id and td.type != 'REFCURSOR' -- ignore REFCURSOR variables since they are not assigned a value + inner join references r + on r.owner = d.owner and + r.object_name = d.object_name and + r.object_type = d.object_type and + r.name = d.name and + r.type = d.type and + r.declaration_usage_id_scope = d.usage_id_scope and + r.usage_id = r.first_usage_id -- first reference + left outer join assignments a + on a.owner = d.owner and + a.object_name = d.object_name and + a.object_type = d.object_type and + a.name = d.name and + a.type = d.type and + a.declaration_usage_id_scope = d.usage_id_scope and + a.usage_id < r.usage_id -- the assignment is before the (first) reference + where d.type in ('CONSTANT', 'VARIABLE') + and d.object_type not in ('PACKAGE', 'TYPE') + and a.name is null -- there is nu such an assignment + ) + , assigned_unused_identifiers as ( + select a.* + , 3 as message_number + , 'is assigned a value but never used (after that assignment)' as text + from declarations d + inner join assignments a + on a.owner = d.owner and + a.object_name = d.object_name and + a.object_type = d.object_type and + a.name = d.name and + a.type = d.type and + a.declaration_usage_id_scope = d.usage_id_scope and + a.usage_id = a.last_usage_id and + a.usage_context_id != d.usage_id -- last assignment (but not initialization) + left outer join references r + on r.owner = d.owner and + r.object_name = d.object_name and + r.object_type = d.object_type and + r.name = d.name and + r.type = d.type and + r.declaration_usage_id_scope = d.usage_id_scope and + r.usage_id > a.usage_id -- after last assignment + where d.type in ('CONSTANT', 'VARIABLE') + and d.object_type not in ('PACKAGE', 'TYPE') + and r.name is null -- there is none + ) + , unset_output_parameters as ( + select d.* + , 4 as message_number + , '(' || replace(d.type, 'FORMAL ') || ') should be assigned a value' as text + from declarations d + left outer join assignments a + on a.owner = d.owner and + a.object_name = d.object_name and + a.object_type = d.object_type and + a.name = d.name and + a.type = d.type and + a.declaration_usage_id_scope = d.usage_id_scope + where d.type in ('FORMAL IN OUT', 'FORMAL OUT') + and d.object_type not in ('PACKAGE', 'TYPE') + and a.name is null -- there is none + ) + , function_output_parameters as ( + select d.* + , 5 as message_number + , '(' || replace(d.type, 'FORMAL ') || ') should not be used in a function' as text + from declarations d + inner join identifiers i + on i.owner = d.owner and + i.object_name = d.object_name and + i.object_type = d.object_type and + i.usage_id = d.usage_context_id and + i.type = 'FUNCTION' + where d.type in ('FORMAL IN OUT', 'FORMAL OUT') + ) + , shadowing_identifiers as ( + select d2.* + , 6 as message_number + , 'may shadow another identifier with the same name declared at (' || d1.line || ',' || d1.col || ')' as text + from declarations d1 + inner join declarations d2 + on d2.owner = d1.owner and + d2.object_name = d1.object_name and + d2.object_type = d1.object_type and + d2.name = d1.name and + d2.usage_context_id = d1.usage_context_id and + d2.usage_id > d1.usage_id + where d1.object_type not in ('PACKAGE', 'TYPE') + --and d1.type not in ('ITERATOR', 'RECORD ITERATOR') + and d2.object_type not in ('PACKAGE', 'TYPE') + ) + , checks as ( + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from unused_identifiers + union + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from unset_identifiers + union + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from assigned_unused_identifiers + union + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from unset_output_parameters + union + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from function_output_parameters + union + select owner + , object_name + , object_type + , line + , col + , name + , type + , usage + , usage_id + , usage_context_id + , message_number + , text + from shadowing_identifiers + order by + owner + , object_name + , object_type + , line + , col + , message_number + ) + -- turn it into all_errors + select owner + , object_name as name + , object_type as type + , rownum as sequence + , line + , col as position + , 'PLC-' || to_char(c.message_number, 'FM00000') || ': ' || case when c.type like 'FORMAL %' then 'parameter' else lower(c.type) end || ' "' || c.name || '" ' || c.text as text + , 'CHECK' as attribute + , message_number + from checks c + ; +begin + if p_recompile != 0 + then + setup_session(p_plsql_warnings => p_plsql_warnings, p_plscope_settings => p_plscope_settings); + end if; + + -- bulk fetch instead of loop because DDL is issued inside the loop which may impact the open cursor + open c_obj(p_object_schema, l_object_type, l_object_name_tab, nvl(p_object_names_include, 1), p_recompile); + fetch c_obj bulk collect into l_obj_tab; + close c_obj; + + if l_obj_tab.count > 0 + then + for i_idx in l_obj_tab.first .. l_obj_tab.last + loop + r_obj := l_obj_tab(i_idx); + + if p_recompile != 0 and r_obj.object_name != $$PLSQL_UNIT -- do not recompile this package (body) + then + begin + execute immediate r_obj.command; + exception + when others + then null; + end; + end if; + + for r_compiler_messages in + ( select e.owner + , e.name + , e.type + , e.sequence + , e.line + , e.position + , e.text + , e.attribute + , e.message_number + from all_errors e + where e.owner = r_obj.owner + and e.name = r_obj.object_name + and e.type = r_obj.object_type + order by + e.owner + , e.name + , e.type + , e.sequence + , e.line + , e.position + ) + loop + pipe row (r_compiler_messages); + end loop; + + for r_compiler_messages in c_compiler_messages(r_obj.owner, r_obj.object_name, r_obj.object_type) + loop + pipe row (r_compiler_messages); + end loop; + end loop; + end if; + + commit; + + return; -- essential +end show_compiler_messages; + +function format_compiler_messages +( p_object_schema in varchar2 default user +, p_object_type in varchar2 default null +, p_object_names in varchar2 default null +, p_object_names_include in integer default null +, p_recompile in integer default 0 +, p_plsql_warnings in varchar2 default 'ENABLE:ALL' +, p_plscope_settings in varchar2 default 'IDENTIFIERS:ALL' +) +return t_message_tab +pipelined +is +begin + for r_message in + ( select lower(t.type) || ' ' || t.owner || '.' || t.name || ' ' || + '(' || t.line || + case when t.position is not null then ',' || t.position end || + ') ' || + case + when t.sequence is not null + then 'PL/SQL' + else 'PL/SCOPE' + end || ' ' || + t.attribute || ' ' || + t.text as text + from table + ( oracle_tools.cfg_install_pkg.show_compiler_messages + ( p_object_schema => p_object_schema + , p_object_type => p_object_type + , p_object_names => p_object_names + , p_object_names_include => p_object_names_include + , p_recompile => p_recompile + , p_plsql_warnings => p_plsql_warnings + , p_plscope_settings => p_plscope_settings + ) + ) t + ) + loop + pipe row (r_message.text); + end loop; + + return; +end format_compiler_messages; + end cfg_install_pkg; / diff --git a/db/app/cfg/src/full/R__14.PACKAGE_BODY.UT_CODE_CHECK_PKG.sql b/db/app/cfg/src/full/R__14.PACKAGE_BODY.UT_CODE_CHECK_PKG.sql new file mode 100644 index 00000000..0d65ec3a --- /dev/null +++ b/db/app/cfg/src/full/R__14.PACKAGE_BODY.UT_CODE_CHECK_PKG.sql @@ -0,0 +1,93 @@ +create or replace package body ut_code_check_pkg is + +subtype t_var is varchar2(4 char); + +procedure ut_assign(p_str out nocopy varchar2) +is +begin + p_str := "abcd"; +end; + +procedure ut_reference(p_str in varchar2) +is +begin + if p_str is null + then + null; + end if; +end; + +procedure ut_var_not_used +is + l_var t_var; +begin + null; +end ut_var_not_used; + +procedure ut_var_assign_declaration +is + l_var t_var := "abcd"; +begin + null; +end ut_var_assign_declaration; + +procedure ut_var_assign_direct +is + l_var t_var; +begin + l_var := "abcd"; +end ut_var_assign_direct; + +procedure ut_var_assign_indirect +is + l_var t_var; +begin + ut_assign(l_var); +end ut_var_assign_indirect; + +procedure ut_var_assign_after_reference +is + l_var t_var; +begin + if l_var is null + then + l_var := "abcd"; + end if; +end ut_var_assign_after_reference; + +-- Output parameters should be assigned a value +-- Unused procedure and function parameters +procedure ut_output_parameters_not_set(p_i in varchar2, p_io in out varchar2, p_o out varchar2) +is +begin + null; +end; + +-- Functions should not have output parameters +-- Unused procedure and function parameters +function ut_function_output_parameters(p_i in varchar2, p_io in out varchar2, p_o out varchar2) +return varchar2 +is +begin + return null; +end; + +-- Identifiers shadowing another identifier +procedure ut_variables_out_of_scope +is + i_idx integer; +begin + for i_idx in 1..2 + loop + null; + end loop; + + declare + i_idx exception; + begin + null; + end; +end; + +end ut_code_check_pkg; +/ diff --git a/db/app/cfg/src/full/uninstall.sql b/db/app/cfg/src/full/uninstall.sql index 92297514..59139ab1 100644 --- a/db/app/cfg/src/full/uninstall.sql +++ b/db/app/cfg/src/full/uninstall.sql @@ -1,4 +1,4 @@ -/* perl generate_ddl.pl (version 2021-08-24) --nodynamic-sql --force-view --noremove-output-directory --skip-install-sql --nostrip-source-schema */ +/* perl generate_ddl.pl (version 2021-08-27) --nodynamic-sql --force-view --skip-install-sql --nostrip-source-schema */ /* -- JDBC url : jdbc:oracle:thin:ORACLE_TOOLS@//localhost:1521/orcl diff --git a/db/app/data/src/full/R__09.PACKAGE_SPEC.DATA_API_PKG.sql b/db/app/data/src/full/R__09.PACKAGE_SPEC.DATA_API_PKG.sql index 17e7c2fc..e5912039 100644 --- a/db/app/data/src/full/R__09.PACKAGE_SPEC.DATA_API_PKG.sql +++ b/db/app/data/src/full/R__09.PACKAGE_SPEC.DATA_API_PKG.sql @@ -132,6 +132,7 @@ pipelined; $if cfg_pkg.c_testing $then +--%suitepath(DATA) --%suite --%test diff --git a/db/app/data/src/full/uninstall.sql b/db/app/data/src/full/uninstall.sql index bbe50f8a..d949bb93 100644 --- a/db/app/data/src/full/uninstall.sql +++ b/db/app/data/src/full/uninstall.sql @@ -1,4 +1,4 @@ -/* perl generate_ddl.pl (version 2021-08-24) --nodynamic-sql --force-view --noremove-output-directory --skip-install-sql --nostrip-source-schema */ +/* perl generate_ddl.pl (version 2021-08-27) --nodynamic-sql --force-view --skip-install-sql --nostrip-source-schema */ /* -- JDBC url : jdbc:oracle:thin:ORACLE_TOOLS@//localhost:1521/orcl diff --git a/db/app/ddl/pom.xml b/db/app/ddl/pom.xml index b8bd7bfd..e05e5906 100644 --- a/db/app/ddl/pom.xml +++ b/db/app/ddl/pom.xml @@ -18,6 +18,7 @@ 0 1 F_GENERATE_DDL +,PKG_DDL_ERROR ,PKG_DDL_UTIL ,PKG_STR_UTIL ,P_GENERATE_DDL @@ -29,8 +30,6 @@ ,T_CONSTRAINT_DDL ,T_CONSTRAINT_OBJECT ,T_DDL -,T_DDL_INFO_REC -,T_DDL_INFO_TAB ,T_DDL_SEQUENCE ,T_DDL_TAB ,T_DEPENDENT_OR_GRANTED_OBJECT @@ -61,8 +60,6 @@ ,T_SCHEMA_OBJECT_TAB ,T_SEQUENCE_DDL ,T_SEQUENCE_OBJECT -,T_SORT_OBJECTS_BY_DEPS_REC -,T_SORT_OBJECTS_BY_DEPS_TAB ,T_SYNONYM_DDL ,T_SYNONYM_OBJECT ,T_TABLE_COLUMN_DDL @@ -84,6 +81,7 @@ ,V_MY_SCHEMA_DDL_INFO ,V_MY_SCHEMA_OBJECT_INFO + test diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT.sql index 2fdf33d1..b16fb19c 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT.sql @@ -4,7 +4,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_ARGUMENT_OBJECT" authid current_user is object Please note that these arguments are only used in type methods. Only DATA_LEVEL 0 arguments are stored here. - USER_ARGUMENTS.POSITION is mapped to ARGUMENT#. + USER_ARGUMENTS.POSITION is mapped to ARGUMENT#. Column Datatype Description ------ -------- ----------- @@ -15,14 +15,14 @@ CREATE TYPE "ORACLE_TOOLS"."T_ARGUMENT_OBJECT" authid current_user is object -- ARGUMENT_NAME can refer to any of the following: -- a) Return type, if ARGUMENT_NAME is null -- b) The argument that appears in the argument list if ARGUMENT_NAME is not null - + , data_type_name$ varchar2(30 char) -- Datatype of the argument , in_out$ varchar2(9 char) -- Direction of the argument: IN, OUT or IN/OUT , type_owner$ varchar2(30 char) -- Owner of the type of the argument , type_name$ varchar2(30 char) -- Name of the type of the argument. , constructor function t_argument_object - ( self in out nocopy t_argument_object + ( self in out nocopy oracle_tools.t_argument_object , p_argument# in integer , p_argument_name in varchar2 , p_data_type_name in varchar2 diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT_TAB.sql index 9f735574..10745259 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT_TAB.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_ARGUMENT_OBJECT_TAB.sql @@ -1,3 +1,3 @@ -CREATE TYPE "ORACLE_TOOLS"."T_ARGUMENT_OBJECT_TAB" AS table of t_argument_object; +CREATE TYPE "ORACLE_TOOLS"."T_ARGUMENT_OBJECT_TAB" AS table of oracle_tools.t_argument_object; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CLUSTER_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CLUSTER_OBJECT.sql index 199186bd..497f582c 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CLUSTER_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CLUSTER_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_CLUSTER_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_CLUSTER_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_cluster_object - ( self in out nocopy t_cluster_object + ( self in out nocopy oracle_tools.t_cluster_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_DDL.sql index 861e7c32..9cc5d32d 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_DDL.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_COMMENT_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_COMMENT_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure uninstall - ( self in out nocopy t_comment_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_comment_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_OBJECT.sql index f4e4873c..d9ec3513 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_COMMENT_OBJECT.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_COMMENT_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_COMMENT_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( column_name$ varchar2(128 char) , constructor function t_comment_object - ( self in out nocopy t_comment_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_comment_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_column_name in varchar2 ) @@ -12,7 +12,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_COMMENT_OBJECT" authid current_user under t_depend , overriding member function column_name return varchar2 deterministic -- end of getter(s) , overriding member procedure chk - ( self in t_comment_object + ( self in oracle_tools.t_comment_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_DDL.sql index 855052c3..5de41203 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_DDL.sql @@ -1,22 +1,22 @@ -CREATE TYPE "ORACLE_TOOLS"."T_CONSTRAINT_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_CONSTRAINT_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure migrate - ( self in out nocopy t_constraint_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_constraint_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure uninstall - ( self in out nocopy t_constraint_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_constraint_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure add_ddl - ( self in out nocopy t_constraint_ddl + ( self in out nocopy oracle_tools.t_constraint_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer ) , overriding member procedure execute_ddl - ( self in t_constraint_ddl + ( self in oracle_tools.t_constraint_ddl ) ) not final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql index f59e47ca..ab47aa36 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql @@ -1,11 +1,11 @@ -CREATE TYPE "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( object_name$ varchar2(4000 char) , column_names$ varchar2(4000 char) , search_condition$ varchar2(4000 char) , constraint_type$ varchar2(1 char) , constructor function t_constraint_object - ( self in out nocopy t_constraint_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_constraint_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_constraint_type in varchar2 default null @@ -28,7 +28,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" authid current_user under t_dep ) return varchar2 , overriding member procedure chk - ( self in t_constraint_object + ( self in oracle_tools.t_constraint_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql index 4cf34000..f16bc7c6 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql @@ -1,12 +1,12 @@ CREATE TYPE "ORACLE_TOOLS"."T_DDL" authid current_user as object ( ddl#$ integer , verb$ varchar2(4000 char) -, text t_text_tab +, text oracle_tools.t_text_tab , constructor function t_ddl - ( self in out nocopy t_ddl + ( self in out nocopy oracle_tools.t_ddl , p_ddl# in integer , p_verb in varchar2 - , p_text in t_text_tab + , p_text in oracle_tools.t_text_tab ) return self as result -- no getter for text because the (possibly large) attribute text will be copied @@ -15,13 +15,13 @@ CREATE TYPE "ORACLE_TOOLS"."T_DDL" authid current_user as object , member function verb return varchar2 deterministic -- end of getter(s) , member procedure print - ( self in t_ddl + ( self in oracle_tools.t_ddl ) -, order member function match( p_ddl in t_ddl ) return integer deterministic -, member function compare( p_ddl in t_ddl ) +, order member function match( p_ddl in oracle_tools.t_ddl ) return integer deterministic +, member function compare( p_ddl in oracle_tools.t_ddl ) return integer deterministic -, member procedure text_to_compare( self in t_ddl, p_text_tab out nocopy oracle_tools.t_text_tab ) +, member procedure text_to_compare( self in oracle_tools.t_ddl, p_text_tab out nocopy oracle_tools.t_text_tab ) ) not final; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_REC.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_REC.sql deleted file mode 100644 index 0a848f01..00000000 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_REC.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TYPE "ORACLE_TOOLS"."T_DDL_INFO_REC" AS OBJECT -(VERB VARCHAR2(4000 CHAR), -OBJECT_SCHEMA VARCHAR2(128 CHAR), -OBJECT_TYPE VARCHAR2(30 CHAR), -OBJECT_NAME VARCHAR2(4000 CHAR), -BASE_OBJECT_SCHEMA VARCHAR2(128 CHAR), -BASE_OBJECT_TYPE VARCHAR2(30 CHAR), -BASE_OBJECT_NAME VARCHAR2(4000 CHAR), -COLUMN_NAME VARCHAR2(128 CHAR), -GRANTEE VARCHAR2(128 CHAR), -PRIVILEGE VARCHAR2(40 CHAR), -GRANTABLE VARCHAR2(3 CHAR), -DDL# INTEGER, -TEXT "T_TEXT_TAB"); -/ - diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_TAB.sql deleted file mode 100644 index 8175486d..00000000 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_TAB.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TYPE "ORACLE_TOOLS"."T_DDL_INFO_TAB" AS TABLE OF "T_DDL_INFO_REC"; -/ - diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql index 971747e0..1aa402ca 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_DDL_SEQUENCE" authid current_user under t_ddl +CREATE TYPE "ORACLE_TOOLS"."T_DDL_SEQUENCE" authid current_user under oracle_tools.t_ddl ( overriding member procedure text_to_compare - ( self in t_ddl_sequence - , p_text_tab out nocopy oracle_tools.t_text_tab + ( self in oracle_tools.t_ddl_sequence + , p_text_tab out nocopy oracle_tools.t_text_tab ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_TAB.sql index 89f961f9..eac9b9c3 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_TAB.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_TAB.sql @@ -1,3 +1,3 @@ -CREATE TYPE "ORACLE_TOOLS"."T_DDL_TAB" AS table of t_ddl; +CREATE TYPE "ORACLE_TOOLS"."T_DDL_TAB" AS table of oracle_tools.t_ddl; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DEPENDENT_OR_GRANTED_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DEPENDENT_OR_GRANTED_OBJECT.sql index 9af1b401..7bbae1a5 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DEPENDENT_OR_GRANTED_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_DEPENDENT_OR_GRANTED_OBJECT.sql @@ -1,16 +1,16 @@ -CREATE TYPE "ORACLE_TOOLS"."T_DEPENDENT_OR_GRANTED_OBJECT" authid current_user under t_schema_object -( base_object$ t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_DEPENDENT_OR_GRANTED_OBJECT" authid current_user under oracle_tools.t_schema_object +( base_object$ oracle_tools.t_named_object , overriding member function base_object_schema return varchar2 deterministic , overriding member function base_object_type return varchar2 deterministic , overriding member function base_object_name return varchar2 deterministic , overriding final member procedure base_object_schema - ( self in out nocopy t_dependent_or_granted_object + ( self in out nocopy oracle_tools.t_dependent_or_granted_object , p_base_object_schema in varchar2 ) , overriding member procedure chk - ( self in t_dependent_or_granted_object + ( self in oracle_tools.t_dependent_or_granted_object , p_schema in varchar2 - ) + ) , overriding member function base_dict_object_type return varchar2 deterministic ) not instantiable diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_FUNCTION_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_FUNCTION_OBJECT.sql index 8cb4a680..c757a011 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_FUNCTION_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_FUNCTION_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_FUNCTION_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_FUNCTION_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_function_object - ( self in out nocopy t_function_object + ( self in out nocopy oracle_tools.t_function_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_DDL.sql index 9630762e..cb70c5a1 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_DDL.sql @@ -1,12 +1,12 @@ -CREATE TYPE "ORACLE_TOOLS"."T_INDEX_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_INDEX_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure migrate - ( self in out nocopy t_index_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_index_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure execute_ddl - ( self in t_index_ddl + ( self in oracle_tools.t_index_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_OBJECT.sql index 2a44e067..d3b59c93 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_INDEX_OBJECT.sql @@ -1,17 +1,17 @@ -CREATE TYPE "ORACLE_TOOLS"."T_INDEX_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_INDEX_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( object_name$ varchar2(4000 char) , column_names$ varchar2(4000 char) , tablespace_name$ varchar2(30 char) , constructor function t_index_object - ( self in out nocopy t_index_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_index_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result , constructor function t_index_object - ( self in out nocopy t_index_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_index_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_tablespace_name in varchar2 @@ -23,7 +23,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_INDEX_OBJECT" authid current_user under t_dependen , member function column_names return varchar2 deterministic , member function tablespace_name return varchar2 deterministic , member procedure tablespace_name - ( self in out nocopy t_index_object + ( self in out nocopy oracle_tools.t_index_object , p_tablespace_name in varchar2 ) -- end of getter(s)/setter(s) @@ -34,7 +34,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_INDEX_OBJECT" authid current_user under t_dependen ) return varchar2 , overriding member procedure chk - ( self in t_index_object + ( self in oracle_tools.t_index_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_JAVA_SOURCE_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_JAVA_SOURCE_OBJECT.sql index 947b7047..f28ab2ad 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_JAVA_SOURCE_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_JAVA_SOURCE_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_JAVA_SOURCE_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_JAVA_SOURCE_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_java_source_object - ( self in out nocopy t_java_source_object + ( self in out nocopy oracle_tools.t_java_source_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_DDL.sql index 3ee441e0..9559cd2d 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_DDL.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure migrate - ( self in out nocopy t_materialized_view_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_materialized_view_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_LOG_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_LOG_OBJECT.sql index 65e057ff..bb7c9f4f 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_LOG_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_LOG_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_LOG_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_LOG_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_materialized_view_log_object - ( self in out nocopy t_materialized_view_log_object + ( self in out nocopy oracle_tools.t_materialized_view_log_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_OBJECT.sql index 8665b219..cb18f4bd 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MATERIALIZED_VIEW_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_materialized_view_object - ( self in out nocopy t_materialized_view_object + ( self in out nocopy oracle_tools.t_materialized_view_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MEMBER_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MEMBER_OBJECT.sql index a5f0d68f..02ec8aea 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MEMBER_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_MEMBER_OBJECT.sql @@ -1,4 +1,4 @@ -CREATE TYPE "ORACLE_TOOLS"."T_MEMBER_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_MEMBER_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( member#$ integer , member_name$ varchar2(128 char) -- begin of getter(s)/setter(s) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_NAMED_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_NAMED_OBJECT.sql index 8353fc0c..fba1eda5 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_NAMED_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_NAMED_OBJECT.sql @@ -1,20 +1,20 @@ -CREATE TYPE "ORACLE_TOOLS"."T_NAMED_OBJECT" authid current_user under t_schema_object +CREATE TYPE "ORACLE_TOOLS"."T_NAMED_OBJECT" authid current_user under oracle_tools.t_schema_object ( object_name$ varchar2(4000 char) , overriding final member function object_name return varchar2 deterministic , final static procedure create_named_object ( p_object_type in varchar2 , p_object_schema in varchar2 , p_object_name in varchar2 - , p_named_object out nocopy t_schema_object + , p_named_object out nocopy oracle_tools.t_schema_object ) , final static function create_named_object ( p_object_type in varchar2 , p_object_schema in varchar2 , p_object_name in varchar2 ) - return t_named_object + return oracle_tools.t_named_object , overriding member procedure chk - ( self in t_named_object + ( self in oracle_tools.t_named_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_DDL.sql index 4cb5dcac..b4b2b005 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_DDL.sql @@ -1,17 +1,17 @@ -CREATE TYPE "ORACLE_TOOLS"."T_OBJECT_GRANT_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_OBJECT_GRANT_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure uninstall - ( self in out nocopy t_object_grant_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_object_grant_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure add_ddl - ( self in out nocopy t_object_grant_ddl + ( self in out nocopy oracle_tools.t_object_grant_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer ) , overriding member procedure execute_ddl - ( self in t_object_grant_ddl + ( self in oracle_tools.t_object_grant_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_OBJECT.sql index 4cf628fb..f8f21ecc 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_OBJECT_GRANT_OBJECT.sql @@ -1,10 +1,10 @@ -CREATE TYPE "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( grantee$ varchar2(128 char) , privilege$ varchar2(40 char) , grantable$ varchar2(3 char) , constructor function t_object_grant_object - ( self in out nocopy t_object_grant_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_object_grant_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_grantee in varchar2 , p_privilege in varchar2 @@ -18,7 +18,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" authid current_user under t_d , overriding member function grantable return varchar2 deterministic -- end of getter(s) , overriding member procedure chk - ( self in t_object_grant_object + ( self in oracle_tools.t_object_grant_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_BODY_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_BODY_OBJECT.sql index 36a101a3..59f4b8db 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_BODY_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_BODY_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_PACKAGE_BODY_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_PACKAGE_BODY_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_package_body_object - ( self in out nocopy t_package_body_object + ( self in out nocopy oracle_tools.t_package_body_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_SPEC_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_SPEC_OBJECT.sql index 49e8bf45..0acabb6d 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_SPEC_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PACKAGE_SPEC_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_PACKAGE_SPEC_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_PACKAGE_SPEC_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_package_spec_object - ( self in out nocopy t_package_spec_object + ( self in out nocopy oracle_tools.t_package_spec_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCEDURE_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCEDURE_OBJECT.sql index de49f424..7faea02d 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCEDURE_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCEDURE_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_PROCEDURE_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_PROCEDURE_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_procedure_object - ( self in out nocopy t_procedure_object + ( self in out nocopy oracle_tools.t_procedure_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_DDL.sql index 71fdc240..e86f77ab 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_DDL.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_PROCOBJ_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_PROCOBJ_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure uninstall - ( self in out nocopy t_procobj_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_procobj_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_OBJECT.sql index 706412ff..f68d47b5 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_PROCOBJ_OBJECT.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" authid current_user under oracle_tools.t_named_object ( dict_object_type$ varchar2(19 char) , constructor function t_procobj_object - ( self in out nocopy t_procobj_object + ( self in out nocopy oracle_tools.t_procobj_object , p_object_schema in varchar2 , p_object_name in varchar2 ) @@ -11,7 +11,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" authid current_user under t_named_ , overriding member function object_type return varchar2 deterministic -- end of getter(s) , overriding member procedure chk - ( self in t_procobj_object + ( self in oracle_tools.t_procobj_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_DDL.sql index eeeeb528..ac896ac7 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_DDL.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_REFRESH_GROUP_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_REFRESH_GROUP_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure uninstall - ( self in out nocopy t_refresh_group_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_refresh_group_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_OBJECT.sql index a5641094..996e9c25 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REFRESH_GROUP_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_REFRESH_GROUP_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_REFRESH_GROUP_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_refresh_group_object - ( self in out nocopy t_refresh_group_object + ( self in out nocopy oracle_tools.t_refresh_group_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REF_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REF_CONSTRAINT_OBJECT.sql index 3dcdccd8..803f165c 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REF_CONSTRAINT_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_REF_CONSTRAINT_OBJECT.sql @@ -1,13 +1,13 @@ -CREATE TYPE "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" authid current_user under t_constraint_object -( ref_object$ t_named_object -- referenced table +CREATE TYPE "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" authid current_user under oracle_tools.t_constraint_object +( ref_object$ oracle_tools.t_named_object -- referenced table , constructor function t_ref_constraint_object - ( self in out nocopy t_ref_constraint_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_ref_constraint_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_constraint_type in varchar2 default null , p_column_names in varchar2 default null - , p_ref_object in t_named_object default null + , p_ref_object in oracle_tools.t_named_object default null ) return self as result -- begin of getter(s) @@ -18,11 +18,11 @@ CREATE TYPE "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" authid current_user under t -- end of getter(s) , overriding final map member function signature return varchar2 deterministic , overriding member procedure chk - ( self in t_ref_constraint_object + ( self in oracle_tools.t_ref_constraint_object , p_schema in varchar2 ) , final member procedure ref_object_schema - ( self in out nocopy t_ref_constraint_object + ( self in out nocopy oracle_tools.t_ref_constraint_object , p_ref_object_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL.sql index 86b8fe28..039b62a7 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL.sql @@ -1,52 +1,52 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_DDL" authid current_user as object -( obj t_schema_object -, ddl_tab t_ddl_tab +( obj oracle_tools.t_schema_object +, ddl_tab oracle_tools.t_ddl_tab , static procedure create_schema_ddl - ( p_obj in t_schema_object - , p_ddl_tab in t_ddl_tab - , p_schema_ddl out nocopy t_schema_ddl + ( p_obj in oracle_tools.t_schema_object + , p_ddl_tab in oracle_tools.t_ddl_tab + , p_schema_ddl out nocopy oracle_tools.t_schema_ddl ) , static function create_schema_ddl - ( p_obj in t_schema_object - , p_ddl_tab in t_ddl_tab + ( p_obj in oracle_tools.t_schema_object + , p_ddl_tab in oracle_tools.t_ddl_tab ) - return t_schema_ddl + return oracle_tools.t_schema_ddl , member procedure print - ( self in t_schema_ddl + ( self in oracle_tools.t_schema_ddl ) , member procedure add_ddl - ( self in out nocopy t_schema_ddl + ( self in out nocopy oracle_tools.t_schema_ddl , p_verb in varchar2 - , p_text in t_text_tab + , p_text in oracle_tools.t_text_tab ) , member procedure add_ddl - ( self in out nocopy t_schema_ddl + ( self in out nocopy oracle_tools.t_schema_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer default 0 ) -, order member function match( p_schema_ddl in t_schema_ddl ) return integer deterministic +, order member function match( p_schema_ddl in oracle_tools.t_schema_ddl ) return integer deterministic , final member procedure install - ( self in out nocopy t_schema_ddl - , p_source in t_schema_ddl + ( self in out nocopy oracle_tools.t_schema_ddl + , p_source in oracle_tools.t_schema_ddl ) , static procedure migrate - ( p_source in t_schema_ddl - , p_target in t_schema_ddl - , p_schema_ddl in out nocopy t_schema_ddl + ( p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl + , p_schema_ddl in out nocopy oracle_tools.t_schema_ddl ) , member procedure migrate - ( self in out nocopy t_schema_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_schema_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , member procedure uninstall - ( self in out nocopy t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) -- no getters because the (possibly large) attributes will be copied , member procedure chk - ( self in t_schema_ddl + ( self in oracle_tools.t_schema_ddl , p_schema in varchar2 ) , static procedure execute_ddl @@ -54,9 +54,9 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_DDL" authid current_user as object , p_text in varchar2 ) , member procedure execute_ddl - ( self in t_schema_ddl + ( self in oracle_tools.t_schema_ddl ) -, static procedure execute_ddl(p_schema_ddl in t_schema_ddl) +, static procedure execute_ddl(p_schema_ddl in oracle_tools.t_schema_ddl) ) not final; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL_TAB.sql index 243d09b1..265345aa 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL_TAB.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_DDL_TAB.sql @@ -1,3 +1,3 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_DDL_TAB" AS table of t_schema_ddl; +CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_DDL_TAB" AS table of oracle_tools.t_schema_ddl; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT.sql index fd4c8652..270dd564 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT.sql @@ -4,19 +4,19 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT" authid current_user as object -- begin of getter(s)/setter(s) , final member function network_link return varchar2 deterministic , final member procedure network_link - ( self in out nocopy t_schema_object + ( self in out nocopy oracle_tools.t_schema_object , p_network_link in varchar2 - ) + ) , final member function object_schema return varchar2 deterministic , final member procedure object_schema - ( self in out nocopy t_schema_object + ( self in out nocopy oracle_tools.t_schema_object , p_object_schema in varchar2 ) , not instantiable member function object_type return varchar2 deterministic , member function object_name return varchar2 deterministic , member function base_object_schema return varchar2 deterministic , member procedure base_object_schema - ( self in out nocopy t_schema_object + ( self in out nocopy oracle_tools.t_schema_object , p_base_object_schema in varchar2 ) , member function base_object_type return varchar2 deterministic @@ -53,7 +53,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT" authid current_user as object deterministic , final member function dict2metadata_object_type return varchar2 deterministic , member procedure print - ( self in t_schema_object + ( self in oracle_tools.t_schema_object ) , static procedure create_schema_object ( p_object_schema in varchar2 @@ -66,7 +66,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT" authid current_user as object , p_grantee in varchar2 default null , p_privilege in varchar2 default null , p_grantable in varchar2 default null - , p_schema_object out nocopy t_schema_object + , p_schema_object out nocopy oracle_tools.t_schema_object ) , static function create_schema_object ( p_object_schema in varchar2 @@ -80,7 +80,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT" authid current_user as object , p_privilege in varchar2 default null , p_grantable in varchar2 default null ) - return t_schema_object + return oracle_tools.t_schema_object , static function is_a_repeatable ( p_object_type in varchar2 ) @@ -90,7 +90,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT" authid current_user as object , final member function fq_object_name return varchar2 deterministic , member function dict_object_type return varchar2 deterministic , member procedure chk - ( self in t_schema_object + ( self in oracle_tools.t_schema_object , p_schema in varchar2 ) , member function base_dict_object_type return varchar2 deterministic diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT_TAB.sql index 1da6311e..2d00ed78 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT_TAB.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SCHEMA_OBJECT_TAB.sql @@ -1,3 +1,3 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT_TAB" AS table of t_schema_object; +CREATE TYPE "ORACLE_TOOLS"."T_SCHEMA_OBJECT_TAB" AS table of oracle_tools.t_schema_object; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql index 23afda94..307b4956 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SEQUENCE_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_SEQUENCE_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure add_ddl - ( self in out nocopy t_sequence_ddl + ( self in out nocopy oracle_tools.t_sequence_ddl , p_verb in varchar2 - , p_text in t_text_tab + , p_text in oracle_tools.t_text_tab ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql index 3be353cc..f2715891 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SEQUENCE_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_SEQUENCE_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_sequence_object - ( self in out nocopy t_sequence_object + ( self in out nocopy oracle_tools.t_sequence_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_REC.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_REC.sql deleted file mode 100644 index e929128c..00000000 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_REC.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SORT_OBJECTS_BY_DEPS_REC" AS OBJECT (OBJECT_SCHEMA VARCHAR2(128 CHAR), -OBJECT_TYPE VARCHAR2(30 CHAR), -OBJECT_NAME VARCHAR2(4000 CHAR), -DEPENDENCY_LIST VARCHAR2(4000 CHAR), -NR INTEGER); -/ - diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_TAB.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_TAB.sql deleted file mode 100644 index 65e33823..00000000 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_TAB.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SORT_OBJECTS_BY_DEPS_TAB" AS TABLE OF "ORACLE_TOOLS"."T_SORT_OBJECTS_BY_DEPS_REC"; -/ - diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql index fa5292bd..5c484f8a 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SYNONYM_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_SYNONYM_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure uninstall - ( self in out nocopy t_synonym_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_synonym_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_OBJECT.sql index 2a4723ae..360ad7d1 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_OBJECT.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_SYNONYM_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_SYNONYM_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( object_name$ varchar2(4000 char) , constructor function t_synonym_object - ( self in out nocopy t_synonym_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_synonym_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) @@ -12,7 +12,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_SYNONYM_OBJECT" authid current_user under t_depend , overriding member function object_name return varchar2 deterministic -- end of getter(s) , overriding member procedure chk - ( self in t_synonym_object + ( self in oracle_tools.t_synonym_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_DDL.sql index 08964d75..6b43c847 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_DDL.sql @@ -1,17 +1,17 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_DDL" authid current_user under t_type_attribute_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_DDL" authid current_user under oracle_tools.t_type_attribute_ddl ( constructor function t_table_column_ddl - ( self in out nocopy t_table_column_ddl - , p_obj in t_schema_object + ( self in out nocopy oracle_tools.t_table_column_ddl + , p_obj in oracle_tools.t_schema_object ) return self as result , overriding member procedure migrate - ( self in out nocopy t_table_column_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_table_column_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure uninstall - ( self in out nocopy t_table_column_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_table_column_ddl + , p_target in oracle_tools.t_schema_ddl ) ) not final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_OBJECT.sql index 57f03fba..0ec0cfaa 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_COLUMN_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under t_type_attribute_object +CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under oracle_tools.t_type_attribute_object ( /* - From USER_TAB_COLUMNS (see also T_TYPE_ATTRIBUTE_OBJECT): + From USER_TAB_COLUMNS (see also oracle_tools.t_type_attribute_object): Column Datatype Description ------ -------- ----------- @@ -10,7 +10,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under t_t -- The constraint should be in an ENABLE VALIDATE state. , default_length$ number -- Length of default value for the column. -- This starts at the default expression after DEFAULT plus whitespace till the next token. -, data_default$ t_text_tab -- Default value for the column +, data_default$ oracle_tools.t_text_tab -- Default value for the column , char_col_decl_length$ number -- Length , char_length$ number -- Displays the length of the column in characters. This value only applies to the following datatypes: -- CHAR @@ -26,8 +26,8 @@ CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under t_t -- NCHAR -- NVARCHAR2 , constructor function t_table_column_object - ( self in out nocopy t_table_column_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_table_column_object + , p_base_object in oracle_tools.t_named_object , p_member# in integer , p_member_name in varchar2 , p_data_type_name in varchar2 @@ -39,7 +39,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under t_t , p_character_set_name in varchar2 , p_nullable in varchar2 , p_default_length in number - , p_data_default in t_text_tab + , p_data_default in oracle_tools.t_text_tab , p_char_col_decl_length in number , p_char_length number , p_char_used in varchar2 @@ -50,7 +50,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" authid current_user under t_t , overriding member function column_name return varchar2 deterministic , member function nullable return varchar2 deterministic , member function default_length return number deterministic -, member function data_default return t_text_tab deterministic +, member function data_default return oracle_tools.t_text_tab deterministic , member function char_col_decl_length return number deterministic , overriding member function char_length return number deterministic , overriding member function char_used return varchar2 deterministic diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_DDL.sql index 0455e619..e88e36d1 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_DDL.sql @@ -1,15 +1,15 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TABLE_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TABLE_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure migrate - ( self in out nocopy t_table_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_table_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure uninstall - ( self in out nocopy t_table_ddl - , p_target in t_schema_ddl - ) + ( self in out nocopy oracle_tools.t_table_ddl + , p_target in oracle_tools.t_schema_ddl + ) , overriding member procedure add_ddl - ( self in out nocopy t_table_ddl + ( self in out nocopy oracle_tools.t_table_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_OBJECT.sql index 81818246..47fa7255 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TABLE_OBJECT.sql @@ -1,13 +1,13 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TABLE_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_TABLE_OBJECT" authid current_user under oracle_tools.t_named_object ( tablespace_name$ varchar2(30 char) , constructor function t_table_object - ( self in out nocopy t_table_object + ( self in out nocopy oracle_tools.t_table_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result , constructor function t_table_object - ( self in out nocopy t_table_object + ( self in out nocopy oracle_tools.t_table_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_tablespace_name in varchar2 @@ -15,12 +15,12 @@ CREATE TYPE "ORACLE_TOOLS"."T_TABLE_OBJECT" authid current_user under t_named_ob return self as result , member function tablespace_name return varchar2 deterministic , member procedure tablespace_name - ( self in out nocopy t_table_object + ( self in out nocopy oracle_tools.t_table_object , p_tablespace_name in varchar2 ) , overriding member function object_type return varchar2 deterministic , overriding member procedure chk - ( self in t_table_object + ( self in oracle_tools.t_table_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_DDL.sql index b353bc42..11921f13 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_DDL.sql @@ -1,7 +1,7 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TRIGGER_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TRIGGER_DDL" authid current_user under oracle_tools.t_schema_ddl ( -- GPA 2017-03-27 #142494703 The DDL generator should remove leading whitespace before WHEN clauses in triggers because that generates differences. overriding member procedure add_ddl - ( self in out nocopy t_trigger_ddl + ( self in out nocopy oracle_tools.t_trigger_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_OBJECT.sql index 2ddbb256..948a0b23 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TRIGGER_OBJECT.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TRIGGER_OBJECT" authid current_user under t_dependent_or_granted_object +CREATE TYPE "ORACLE_TOOLS"."T_TRIGGER_OBJECT" authid current_user under oracle_tools.t_dependent_or_granted_object ( object_name$ varchar2(4000 char) , constructor function t_trigger_object - ( self in out nocopy t_trigger_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_trigger_object + , p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) @@ -12,7 +12,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_TRIGGER_OBJECT" authid current_user under t_depend , overriding member function object_name return varchar2 deterministic -- end of getter(s) , overriding member procedure chk - ( self in t_trigger_object + ( self in oracle_tools.t_trigger_object , p_schema in varchar2 ) ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_DDL.sql index 5f0273ed..f61b82a1 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_DDL.sql @@ -1,17 +1,17 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_DDL" authid current_user under oracle_tools.t_schema_ddl ( constructor function t_type_attribute_ddl - ( self in out nocopy t_type_attribute_ddl - , p_obj in t_schema_object + ( self in out nocopy oracle_tools.t_type_attribute_ddl + , p_obj in oracle_tools.t_schema_object ) return self as result , overriding member procedure migrate - ( self in out nocopy t_type_attribute_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_type_attribute_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure uninstall - ( self in out nocopy t_type_attribute_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_type_attribute_ddl + , p_target in oracle_tools.t_schema_ddl ) ) not final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_OBJECT.sql index d5372e9f..c66c7b04 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_ATTRIBUTE_OBJECT.sql @@ -1,4 +1,4 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" authid current_user under t_member_object +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" authid current_user under oracle_tools.t_member_object ( /* From USER_TYPE_ATTRS: @@ -14,8 +14,8 @@ CREATE TYPE "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" authid current_user under t , character_set_name$ varchar2(44 char) -- Name of the character set: CHAR_CS or NCHAR_CS , constructor function t_type_attribute_object - ( self in out nocopy t_type_attribute_object - , p_base_object in t_named_object + ( self in out nocopy oracle_tools.t_type_attribute_object + , p_base_object in oracle_tools.t_named_object , p_member# in integer , p_member_name in varchar2 , p_data_type_name in varchar2 diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_BODY_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_BODY_OBJECT.sql index be6023e2..8a0fcde5 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_BODY_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_BODY_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_BODY_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_BODY_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_type_body_object - ( self in out nocopy t_type_body_object + ( self in out nocopy oracle_tools.t_type_body_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_DDL.sql index 419e49f9..d94ea88a 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_DDL.sql @@ -1,17 +1,17 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_DDL" authid current_user under oracle_tools.t_schema_ddl ( constructor function t_type_method_ddl - ( self in out nocopy t_type_method_ddl - , p_obj in t_schema_object + ( self in out nocopy oracle_tools.t_type_method_ddl + , p_obj in oracle_tools.t_schema_object ) return self as result , overriding member procedure migrate - ( self in out nocopy t_type_method_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_type_method_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) , overriding member procedure uninstall - ( self in out nocopy t_type_method_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_type_method_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_OBJECT.sql index ee9e6abb..f136fa6e 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_METHOD_OBJECT.sql @@ -1,4 +1,4 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" authid current_user under t_member_object +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" authid current_user under oracle_tools.t_member_object ( /* From USER_TYPE_METHODS: @@ -25,8 +25,8 @@ CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" authid current_user under t_me , arguments t_argument_object_tab -- List of arguments, if any. , constructor function t_type_method_object - ( self in out nocopy t_type_method_object - , p_base_object in t_named_object -- the type specification + ( self in out nocopy oracle_tools.t_type_method_object + , p_base_object in oracle_tools.t_named_object -- the type specification , p_member# in integer -- the METHOD_NO , p_member_name in varchar2 -- the METHOD_NAME , p_method_type in varchar2 @@ -49,7 +49,7 @@ CREATE TYPE "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" authid current_user under t_me -- end of getter(s)/setter(s) , member function static_or_member return varchar2 deterministic , overriding final map member function signature return varchar2 deterministic -, overriding member procedure chk( self in t_type_method_object, p_schema in varchar2 ) +, overriding member procedure chk( self in oracle_tools.t_type_method_object, p_schema in varchar2 ) ) not final; / diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_DDL.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_DDL.sql index 0d80fc0e..4212eb53 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_DDL.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_DDL.sql @@ -1,8 +1,8 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_SPEC_DDL" authid current_user under t_schema_ddl +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_SPEC_DDL" authid current_user under oracle_tools.t_schema_ddl ( overriding member procedure migrate - ( self in out nocopy t_type_spec_ddl - , p_source in t_schema_ddl - , p_target in t_schema_ddl + ( self in out nocopy oracle_tools.t_type_spec_ddl + , p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl ) ) final; diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_OBJECT.sql index c0171769..8f83da90 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_TYPE_SPEC_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_TYPE_SPEC_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_TYPE_SPEC_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_type_spec_object - ( self in out nocopy t_type_spec_object + ( self in out nocopy oracle_tools.t_type_spec_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql index 0f9a1100..4958f93b 100644 --- a/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql +++ b/db/app/ddl/src/full/02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql @@ -1,6 +1,6 @@ -CREATE TYPE "ORACLE_TOOLS"."T_VIEW_OBJECT" authid current_user under t_named_object +CREATE TYPE "ORACLE_TOOLS"."T_VIEW_OBJECT" authid current_user under oracle_tools.t_named_object ( constructor function t_view_object - ( self in out nocopy t_view_object + ( self in out nocopy oracle_tools.t_view_object , p_object_schema in varchar2 , p_object_name in varchar2 ) diff --git a/db/app/ddl/src/full/R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql b/db/app/ddl/src/full/R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql index 1a862400..88071495 100644 --- a/db/app/ddl/src/full/R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql +++ b/db/app/ddl/src/full/R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql @@ -7,7 +7,7 @@ CREATE OR REPLACE FUNCTION "ORACLE_TOOLS"."F_GENERATE_DDL" , pi_object_names_include in natural default null , pi_object_names in varchar2 default null , pi_skip_repeatables in naturaln default 1 -, pi_transform_param_list in varchar2 default pkg_ddl_util.c_transform_param_list +, pi_transform_param_list in varchar2 default oracle_tools.pkg_ddl_util.c_transform_param_list , pi_interface in varchar2 default null ) return clob @@ -17,8 +17,8 @@ as l_clob clob := null; begin -$if cfg_pkg.c_debugging $then - dbug.enter('F_GENERATE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'pi_source_schema: %s; pi_source_database_link: %s; pi_target_schema: %s; pi_target_database_link: %s' @@ -54,13 +54,13 @@ $end commit; -- see the pragma -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging $then dbug.leave; $end return l_clob; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging $then exception when others then diff --git a/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_ERROR.sql b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_ERROR.sql new file mode 100644 index 00000000..0dd51573 --- /dev/null +++ b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_ERROR.sql @@ -0,0 +1,104 @@ +CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_ERROR" IS + +-- The error_code is an integer in the range -20000..-20999 and the message is a character string of at most 2048 bytes. + +/* EXCEPTIONS */ +c_schema_does_not_exist constant integer := -20100; +e_schema_does_not_exist exception; +pragma exception_init(e_schema_does_not_exist, -20100); + +c_numeric_boolean_wrong constant integer := -20101; +e_numeric_boolean_wrong exception; +pragma exception_init(e_numeric_boolean_wrong, -20101); + +c_database_link_does_not_exist constant integer := -20102; +e_database_link_does_not_exist exception; +pragma exception_init(e_database_link_does_not_exist, -20102); + +c_schema_wrong constant integer := -20103; +e_schema_wrong exception; +pragma exception_init(e_schema_wrong, -20103); + +c_source_and_target_equal constant integer := -20104; +e_source_and_target_equal exception; +pragma exception_init(e_source_and_target_equal, -20104); + +c_object_names_wrong constant integer := -20105; +e_object_names_wrong exception; +pragma exception_init(e_object_names_wrong, -20105); + +c_object_type_wrong constant integer := -20106; +e_object_type_wrong exception; +pragma exception_init(e_object_type_wrong, -20106); + +c_could_not_process_interface constant pls_integer := -20107; +e_could_not_process_interface exception; +pragma exception_init(e_could_not_process_interface, -20107); + +c_reraise_with_backtrace constant pls_integer := -20108; +e_reraise_with_backtrace exception; +pragma exception_init(e_reraise_with_backtrace, -20108); + +c_could_not_parse constant pls_integer := -20109; +e_could_not_parse exception; +pragma exception_init(e_could_not_parse, -20109); + +c_invalid_parameters constant pls_integer := -20110; +e_invalid_parameters exception; +pragma exception_init(e_invalid_parameters, -20110); + +c_missing_session_role constant pls_integer := -20111; +e_missing_session_role exception; +pragma exception_init(e_missing_session_role, -20111); + +c_missing_session_privilege constant pls_integer := -20112; +e_missing_session_privilege exception; +pragma exception_init(e_missing_session_privilege, -20112); + +c_object_not_correct constant pls_integer := -20113; +e_object_not_correct exception; +pragma exception_init(e_object_not_correct, -20113); + +c_object_not_found constant pls_integer := -20114; +e_object_not_found exception; +pragma exception_init(e_object_not_found, -20114); + +c_execute_via_db_link constant pls_integer := -20115; +e_execute_via_db_link exception; +pragma exception_init(e_execute_via_db_link, -20115); + +c_duplicate_item constant pls_integer := -20116; +e_duplicate_item exception; +pragma exception_init(e_duplicate_item, -20116); + +c_object_not_valid constant pls_integer := -20117; +e_object_not_valid exception; +pragma exception_init(e_object_not_valid, -20117); + +c_no_ddl_retrieved constant pls_integer := -20118; +e_no_ddl_retrieved exception; +pragma exception_init(e_no_ddl_retrieved, -20118); + +c_missing_schema constant pls_integer := -20119; +e_missing_schema exception; +pragma exception_init(e_missing_schema, -20119); + +c_missing_db_link constant pls_integer := -20120; +e_missing_db_link exception; +pragma exception_init(e_missing_db_link, -20120); + +c_schema_not_empty constant pls_integer := -20121; +e_schema_not_empty exception; +pragma exception_init(e_schema_not_empty, -20121); + +c_wrong_db_link constant pls_integer := -20121; +e_wrong_db_link exception; +pragma exception_init(e_wrong_db_link, -20121); + +c_not_implemented constant pls_integer := -20122; +e_not_implemented exception; +pragma exception_init(e_not_implemented, -20122); + +end pkg_ddl_error; +/ + diff --git a/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql index 44eee033..66054371 100644 --- a/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql +++ b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql @@ -1,20 +1,21 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS /** - * Dit package bevat DDL utilities gebaseerd op DBMS_METADATA en DBMS_METADATA_DIFF. + * This package contains DDL utilities based on DBMS_METADATA and DBMS_METADATA_DIFF. * *

- * De volgende functionaliteit wordt beschikbaar gemaakt: + * These routines are available: *

    - *
  • Tonen van DDL van een object
    • - *
  • Tonen van DDL van een schema
    • - *
  • Tonen van verschillen van DDL tussen twee schema's
    • - *
  • Uitvoeren van DDL
    • + *
  • display_ddl_schema: display DDL for a schema
    • + *
  • display_ddl_schema_diff: display DDL differences DDL between two schemas (like the patch utility)
    • + *
  • execute_ddl: execute DDL
    • + *
  • synchronize: synchronize a target schema based on a source schema
    • + *
  • uninstall: uninstall a target schema
    • *
*

* *

- * De documentatie is in PL/SQL Developer plsqldoc formaat. + * The documentation is in Javadoc format and thus readable by PL/SQL Developer and pldoc. *

* */ @@ -24,7 +25,6 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS c_use_sqlterminator constant boolean := false; -- pkg_dd_util v4/v5 c_debugging constant naturaln := 1; -- 0: none, 1: standard, 2: verbose, 3: even more verbose - c_testing constant boolean := true; -- 0: none, 1: standard, 2: verbose, 3: even more verbose -- pivotal issues @@ -62,43 +62,14 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS c_transform_param_list constant varchar2(4000 char) := 'SEGMENT_ATTRIBUTES,TABLESPACE'; - /* EXCEPTIONS */ - c_schema_does_not_exist constant integer := -20100; - e_schema_does_not_exist exception; - pragma exception_init(e_schema_does_not_exist, -20100); - - c_numeric_boolean_wrong constant integer := -20101; - e_numeric_boolean_wrong exception; - pragma exception_init(e_numeric_boolean_wrong, -20101); - - c_database_link_does_not_exist constant integer := -20102; - e_database_link_does_not_exist exception; - pragma exception_init(e_database_link_does_not_exist, -20102); - - c_schema_wrong constant integer := -20103; - e_schema_wrong exception; - pragma exception_init(e_schema_wrong, -20103); - - c_source_and_target_equal constant integer := -20104; - e_source_and_target_equal exception; - pragma exception_init(e_source_and_target_equal, -20104); - - c_object_names_wrong constant integer := -20105; - e_object_names_wrong exception; - pragma exception_init(e_object_names_wrong, -20105); - - c_object_type_wrong constant integer := -20106; - e_object_type_wrong exception; - pragma exception_init(e_object_type_wrong, -20106); - /* TYPES */ subtype t_dict_object_type is all_objects.object_type%type; subtype t_dict_object_type_nn is t_dict_object_type not null; - subtype t_metadata_object_type is varchar2(30 char); -- langer dan all_objects.object_type%type + subtype t_metadata_object_type is varchar2(30 char); subtype t_metadata_object_type_nn is t_metadata_object_type not null; - subtype t_object_name is varchar2(4000 char); -- standaard maximaal 30 maar langer kan nodig zijn voor lange synoniemnamen (zie SYS.KU$_SYNONYM_VIEW) of XML schema's + subtype t_object_name is varchar2(4000 char); subtype t_object_name_nn is t_object_name not null; -- key: owner.object_type.object_name[.grantee] @@ -120,80 +91,40 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS type t_transform_param_tab is table of boolean index by varchar2(4000 char); /** - * - * Get a sorted dependency list sorted by the least number of dependencies first. + * This function displays the DDL for one or more schema objects. * *

- * When there is a circular dependency, the function will just pick one: it will not abort. - * May be used to determine the best installation order for several schemas. - *

- * - * - * select t.column_value - * from table - * ( pkg_ddl_util.get_sorted_dependency_list - * ( oracle_tools.t_text_tab - * ( 'APEX_050000' - * , '' - * ) - * , cursor(select owner, referenced_owner from all_dependencies) - * ) - * ) t - * - * - * @param p_object_tab A list of dependencies to resolve. - * @param p_object_refcursor An openend cursor with one column: the object. - * Example: select username from all_users. - * @param p_dependency_refcursor An opened cursor with two columns where the first column depends on the second column. - * Example: select owner, referenced_owner from all_dependencies. - */ - function get_sorted_dependency_list - ( p_object_tab in t_text_tab - , p_dependency_refcursor in sys_refcursor -- query with two columns: object1 depends on object2, i.e. select owner, referenced_owner from all_dependencies ... - ) - return t_text_tab pipelined; - - function get_sorted_dependency_list - ( p_object_refcursor in sys_refcursor - , p_dependency_refcursor in sys_refcursor -- query with two columns: object1 depends on object2, i.e. select owner, referenced_owner from all_dependencies ... - ) - return t_text_tab pipelined; - - /** - * Deze functie toont DDL van een of meerdere objecten van een schema. - * - *

- * Op basis van p_object_type kun je filteren welke objecttypen van belang zijn: + * Based on p_object_type you can filter on object types: *

    - *
  • Indien leeg dan alle objecttypen genoemd in documentatie van DBMS_METADATA.
    • - *
  • Indien niet leeg dan alle objecttypen die matchen (LIKE) met p_object_type.
    • + *
  • If empty display all object types mentioned in the DBMS_METADATA documentation.
    • + *
  • Else, only those object types that match (LIKE) p_object_type.
    • *
*

* *

- * Op basis van p_object_names en p_object_names_include kun je filteren op objectnamen: + * Based on p_object_names and p_object_names_include the filtering is like this: *

    - *
  • Indien p_object_names_include leeg is, dan zijn er geen beperkingen aan objectnamen.
    • - *
  • Indien p_object_names_include 1 is, dan zullen alle namen in p_object_names gebruikt worden in een filter zoals in DBMS_METADATA.SET_FILTER(name=>'NAME_EXPR', value=>'IN (...)').
    • - *
  • Indien p_object_names_include 0 is, dan zullen alle namen in p_object_names gebruikt worden in een filter zoals in DBMS_METADATA.SET_FILTER(name=>'EXCLUDE_NAME_EXPR', value=>'IN (...)').
    • + *
  • If p_object_names_include is empty then there are no constraints regarding object names (although special objects like Flyway tables and Oracle objects will be ignored).
    • + *
  • If p_object_names_include is 1, only names in p_object_names will be included like in DBMS_METADATA.SET_FILTER(name=>'NAME_EXPR', value=>'IN (...)').
    • + *
  • If p_object_names_include is 0, only names in p_object_names will be excluded like in DBMS_METADATA.SET_FILTER(name=>'EXCLUDE_NAME_EXPR', value=>'IN (...)').
    • *
*

* *

- * Parameters p_schema, p_new_schema en p_object_names worden niet geconverteerd naar bijvoorbeeld hoofdletters. + * NOTE: parameters p_schema and p_object_names will NOT be converted to upper case. *

* - * @param p_schema De naam van het schema - * @param p_new_schema De naam van het nieuwe te remappen schema - * @param p_sort_objects_by_deps Sorteer objecten in volgorde van afhankelijkheden opdat er zo min mogelijk compilatiefouten optreden vanwege ontbrekende objecten. - * @param p_object_type Filter op objecttype. - * @param p_object_names Een lijst van namen van het (basis-)object gescheiden door komma's. - * @param p_object_names_include Wat er moet gebeuren met de lijst van namen: include de lijst (1), exclude de lijst (0) of niet gebruiken en dus geen beperking opleggen (null) - * @param p_network_link De netwerk link + * @param p_schema The schema name. + * @param p_new_schema The new schema name. + * @param p_sort_objects_by_deps Sort objecten in dependency order to reduce number of installation errors/warnings. + * @param p_object_type Filter for object type. + * @param p_object_names A comma separated list of (base) object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_network_link The network link. * @param p_grantor_is_schema An extra filter for grants. If the value is 1, only grants with grantor equal to p_schema will be chosen. * @param p_transform_param_list A comma separated list of transform parameters, see dbms_metadata.set_transform_param(). * - * @return Een lijst van DDL text plus informatie over object. + * @return A list of DDL text plus information about the object. */ function display_ddl_schema ( p_schema in t_schema_nn default user @@ -206,34 +137,34 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS , p_grantor_is_schema in t_numeric_boolean_nn default 0 , p_transform_param_list in varchar2 default c_transform_param_list ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined; procedure create_schema_ddl - ( p_source_schema_ddl in t_schema_ddl - , p_target_schema_ddl in t_schema_ddl + ( p_source_schema_ddl in oracle_tools.t_schema_ddl + , p_target_schema_ddl in oracle_tools.t_schema_ddl , p_skip_repeatables in t_numeric_boolean - , p_schema_ddl out nocopy t_schema_ddl + , p_schema_ddl out nocopy oracle_tools.t_schema_ddl ); /** - * Deze functie toont DDL om van een source schema naar target schema te migreren. + * Display DDL to migrate from source to target. * *

- * Zie display_ddl_schema() voor een beschrijving van het gebruik van p_object_type, p_object_names en p_object_names_include. + * See display_ddl_schema() for the usage of p_object_type, p_object_names and p_object_names_include. *

* - * @param p_object_type Filter op objecttype. - * @param p_object_names Een lijst van namen van het (basis-)object gescheiden door komma's. - * @param p_object_names_include Wat er moet gebeuren met de lijst van namen: include de lijst (1), exclude de lijst (0) of niet gebruiken en dus geen beperking opleggen (null) - * @param p_schema_source De naam van het bronschema (mag leeg zijn voor uninstall) - * @param p_schema_target De naam van het doelschema - * @param p_network_link_source De netwerk link van het bronschema - * @param p_network_link_target De netwerk link van het doelschema + * @param p_object_type Filter for object type. + * @param p_object_names A comma separated list of (base) object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_schema_source Source schema (may be empty for uninstall). + * @param p_schema_target Target schema. + * @param p_network_link_source Source network link. + * @param p_network_link_target Target network link. * @param pi_skip_repeatables Skip repeatables objects (1) or check all objects (0) * @param p_transform_param_list A comma separated list of transform parameters, see dbms_metadata.set_transform_param(). * - * @return Een lijst van DDL text plus informatie over object. + * @return A list of DDL text plus information about the object. */ function display_ddl_schema_diff ( p_object_type in t_metadata_object_type default null @@ -246,7 +177,7 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS , p_skip_repeatables in t_numeric_boolean_nn default 1 -- Default for Flyway with repeatable migrations , p_transform_param_list in varchar2 default c_transform_param_list ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined; procedure execute_ddl @@ -255,29 +186,33 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS ); procedure execute_ddl - ( p_ddl_text_tab in t_text_tab + ( p_ddl_text_tab in oracle_tools.t_text_tab , p_network_link in varchar2 default null ); procedure execute_ddl - ( p_schema_ddl_tab in t_schema_ddl_tab + ( p_ddl_tab in dbms_sql.varchar2a + ); + + procedure execute_ddl + ( p_schema_ddl_tab in oracle_tools.t_schema_ddl_tab , p_network_link in varchar2 default null ); /** - * Deze procedure synchroniseert een target schema aan de hand van een source schema. + * Synchronize a target schema based on a source schema. * *

- * Zie display_ddl_schema() voor een beschrijving van het gebruik van p_object_type, p_object_names en p_object_names_include. + * See display_ddl_schema() for the usage of p_object_type, p_object_names and p_object_names_include. *

* - * @param p_object_type Filter op objecttype. - * @param p_object_names Een lijst van namen van het (basis-)object gescheiden door komma's. - * @param p_object_names_include Wat er moet gebeuren met de lijst van namen: include de lijst (1), exclude de lijst (0) of niet gebruiken en dus geen beperking opleggen (null) - * @param p_schema_source De naam van het bronschema - * @param p_schema_target De naam van het doelschema - * @param p_network_link_source De netwerk link van het bronschema - * @param p_network_link_target De netwerk link van het doelschema + * @param p_object_type Filter for object type. + * @param p_object_names A comma separated list of (base) object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_schema_source Source schema (may be empty for uninstall). + * @param p_schema_target Target schema. + * @param p_network_link_source Source network link. + * @param p_network_link_target Target network link. */ procedure synchronize ( p_object_type in t_metadata_object_type default null @@ -290,17 +225,17 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS ); /** - * Deze procedure de-installeert een target schema. + * This one uninstalls a target schema. * *

- * Zie display_ddl_schema() voor een beschrijving van het gebruik van p_object_type, p_object_names en p_object_names_include. + * See display_ddl_schema() for the usage of p_object_type, p_object_names and p_object_names_include. *

* - * @param p_object_type Filter op objecttype. - * @param p_object_names Een lijst van namen van het (basis-)object gescheiden door komma's. - * @param p_object_names_include Wat er moet gebeuren met de lijst van namen: include de lijst (1), exclude de lijst (0) of niet gebruiken en dus geen beperking opleggen (null) - * @param p_schema_target De naam van het doelschema - * @param p_network_link_target De netwerk link van het doelschema + * @param p_object_type Filter for object type. + * @param p_object_names A comma separated list of (base) object names. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_schema_target Target schema. + * @param p_network_link_target Target network link. */ procedure uninstall ( p_object_type in t_metadata_object_type default null @@ -317,10 +252,10 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS * See display_ddl_schema() for a description of the usage of p_object_type, p_object_names and p_object_names_include. *

* - * @param p_schema Schema name - * @param p_object_type Filter for object type - * @param p_object_names A list of object names separated by a comma - * @param p_object_names_include Either include the list (1), exclude the list (0) or do not use the list (null) + * @param p_schema Schema name. + * @param p_object_type Filter for object type. + * @param p_object_names A list of object names separated by a comma. + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? * @param p_grantor_is_schema An extra filter for grants. If the value is 1, only grants with grantor equal to p_schema will be chosen. * @param p_schema_object_tab Only applicable for the procedure variant. See the description for return. * @@ -332,7 +267,7 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS , p_object_names in t_object_names default null , p_object_names_include in t_numeric_boolean default null , p_grantor_is_schema in t_numeric_boolean_nn default 0 - , p_schema_object_tab out nocopy t_schema_object_tab + , p_schema_object_tab out nocopy oracle_tools.t_schema_object_tab ); function get_schema_object @@ -342,12 +277,12 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS , p_object_names_include in t_numeric_boolean default null , p_grantor_is_schema in t_numeric_boolean_nn default 0 ) - return t_schema_object_tab + return oracle_tools.t_schema_object_tab pipelined; procedure get_member_ddl - ( p_schema_ddl in t_schema_ddl - , p_member_ddl_tab out nocopy t_schema_ddl_tab + ( p_schema_ddl in oracle_tools.t_schema_ddl + , p_member_ddl_tab out nocopy oracle_tools.t_schema_ddl_tab ); -- set checks for an object type @@ -367,34 +302,56 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS -- So we invoke package procedure from the type bodies. */ procedure chk_schema_object - ( p_schema_object in t_schema_object + ( p_schema_object in oracle_tools.t_schema_object , p_schema in varchar2 ); procedure chk_schema_object - ( p_dependent_or_granted_object in t_dependent_or_granted_object + ( p_dependent_or_granted_object in oracle_tools.t_dependent_or_granted_object , p_schema in varchar2 ); procedure chk_schema_object - ( p_named_object in t_named_object + ( p_named_object in oracle_tools.t_named_object , p_schema in varchar2 ); procedure chk_schema_object - ( p_constraint_object in t_constraint_object + ( p_constraint_object in oracle_tools.t_constraint_object , p_schema in varchar2 ); /* -- helper function */ + /** + * Determine whether a schema object matches a filter. + * + * Rules: + *
    + *
  1. A schema base object where is_exclude_name_expr() = 1: return 0
    2. + *
  2. A schema object where is_exclude_name_expr() = 1: return 0
    3. + *
  3. If p_metadata_object_type is not member of p_object_types_to_check: return 1
    4. + *
  4. When p_object_type is empty or equal to the (base) object type and the combination of p_object_name and p_object_names_include matches p_object_names: return 1
    5. + *
  5. Else: return 0
    6. + *
+ * + * @param p_object_type A metadata object type (from client). + * @param p_object_names A comma separated list of object names (from client). + * @param p_object_names_include How to treat the object name list: include (1), exclude (0) or don't care (null)? + * @param p_object_types_to_check A list of metadata object types to check for (null = check all). + * @param p_metadata_object_type The schema object type (metadata). + * @param p_object_name The schema object name. + * @param p_metadata_base_object_type The schema base object type (metadata). + * @param p_base_object_name The schema base object name. + * + */ function schema_object_matches_filter ( -- filter values p_object_type in t_metadata_object_type , p_object_names in t_object_names , p_object_names_include in t_numeric_boolean - , p_object_types_to_check in t_text_tab + , p_object_types_to_check in oracle_tools.t_text_tab -- database values , p_metadata_object_type in t_metadata_object_type , p_object_name in t_object_name @@ -414,7 +371,7 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS procedure get_exclude_name_expr_tab ( p_object_type in varchar2 , p_object_name in varchar2 default null - , p_exclude_name_expr_tab out nocopy t_text_tab + , p_exclude_name_expr_tab out nocopy oracle_tools.t_text_tab ); function is_exclude_name_expr @@ -429,12 +386,14 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS */ function get_schema_ddl ( p_schema in t_schema_nn - , p_new_schema in t_schema + , p_object_type in t_metadata_object_type + , p_object_names in t_object_names + , p_object_names_include in t_numeric_boolean , p_use_schema_export in t_numeric_boolean_nn - , p_schema_object_tab in t_schema_object_tab + , p_schema_object_tab in oracle_tools.t_schema_object_tab , p_transform_param_list in varchar2 default c_transform_param_list ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined; /* @@ -459,56 +418,73 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_DDL_UTIL" AUTHID CURRENT_USER IS -- Remark 2: A call to display_ddl_schema() with a database linke will invoke set_display_ddl_schema() at the remote database. */ function get_display_ddl_schema - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined; /* - -- Sorteer objecten op volgorde van afhankelijkheden. + -- Sort objects on dependency order. */ function sort_objects_by_deps - ( p_cursor in sys_refcursor + ( p_schema_object_tab in oracle_tools.t_schema_object_tab , p_schema in t_schema_nn default user ) - return t_sort_objects_by_deps_tab + return oracle_tools.t_schema_object_tab pipelined; - procedure init_clob; - - procedure append_clob(p_line in varchar2); - - function get_clob return clob; - procedure migrate_schema_ddl - ( p_source in t_schema_ddl - , p_target in t_schema_ddl - , p_schema_ddl in out nocopy t_schema_ddl + ( p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl + , p_schema_ddl in out nocopy oracle_tools.t_schema_ddl ); - function modify_ddl_text - ( p_ddl_text in clob - , p_schema in t_schema_nn - , p_new_schema in t_schema - , p_object_type in t_metadata_object_type default null - ) - return clob; +$if oracle_tools.cfg_pkg.c_testing $then -- test functions + + procedure ut_cleanup_empty; + + --%suitepath(DDL) + --%suite + --%rollback(manual) + + --%beforeall procedure ut_setup; + + --%afterall procedure ut_teardown; + --%test + --%beforetest(oracle_tools.pkg_ddl_util.ut_cleanup_empty) procedure ut_display_ddl_schema; + + --%test + --%beforetest(oracle_tools.pkg_ddl_util.ut_cleanup_empty) procedure ut_display_ddl_schema_diff; + --%test procedure ut_object_type_order; + + --%test procedure ut_dict2metadata_object_type; + + --%test procedure ut_is_a_repeatable; + --%test procedure ut_get_schema_object; + --%test + --%beforetest(oracle_tools.pkg_ddl_util.ut_cleanup_empty) procedure ut_synchronize; + --%test procedure ut_sort_objects_by_deps; + --%test + procedure ut_modify_ddl_text; + +$end -- $if oracle_tools.cfg_pkg.c_testing $then + end pkg_ddl_util; / diff --git a/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_STR_UTIL.sql b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_STR_UTIL.sql index 368726c9..855113c2 100644 --- a/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_STR_UTIL.sql +++ b/db/app/ddl/src/full/R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_STR_UTIL.sql @@ -1,28 +1,47 @@ CREATE OR REPLACE PACKAGE "ORACLE_TOOLS"."PKG_STR_UTIL" IS /** - *

Functionaliteit

+ *

Functionality

*

* String utilities. *

*

NOTE 1

*

- * De documentatie is in PLDoc formaat + * The documentation is in PLDoc format * (http://www.sourceforge.net/projects/pldoc). *

* @headcom * */ -c_revision_label constant varchar2(100 char) := '$Revision:: 1.15 $'; +c_debugging constant naturaln := 0; -- 0: none, 1: standard, 2: verbose, 3: even more verbose type t_clob_tab is table of clob; /** - * Splitst een string gescheiden door een karakterreeks in meerdere delen. + * An enhancement for dbms_lob.substr(). * - * @param p_str De te splitsen string. - * @param p_delimiter De scheiding tussen delen. - * @param p_str_tab De afzonderlijke delen. + * It appears that dbms_lob.substr(amount => 32767) returns at most 32764 characters. + * This function corrects that. + * + * @param p_clob The CLOB. + * @param p_amount The amount. + * @param p_offset The offset. + * + * @return The substring + */ +function dbms_lob_substr +( p_clob in clob +, p_amount in naturaln := 32767 +, p_offset in positiven := 1 +) +return varchar2; + +/** + * Split a string separated by a delimiter string. + * + * @param p_str The input string to split. + * @param p_delimiter The separator string. + * @param p_str_tab The output table. */ procedure split ( p_str in varchar2 @@ -43,10 +62,10 @@ procedure split ); /** - * Verwijdert rechts aan het begin en links aan het einde van de string alle karakters die in de set zitten. + * Removes left and right from the input string all characters in a set. * - * @param p_str De string. Als de string alleen maar uit karakters van set bestaat, wordt die leeg (null). - * @param p_set De set van karakters die niet meer aan begin of einde mogen. + * @param p_str The input string. If it consists only of characters from the set it will become empty. + * @param p_set The set of characters to remove from the begin and end. */ procedure trim ( p_str in out nocopy clob @@ -54,11 +73,11 @@ procedure trim ); /** - * Verwijdert voor elk element rechts aan het begin en links aan het einde alle karakters die in de set zitten. - * Hierna worden alle null elementen vanaf het einde verwijderd. + * Removes left and right from the input table all characters in a set. + * All null elements will be removed. * - * @param p_str_tab Een collectie van strings. - * @param p_set De set van karakters die niet meer aan begin of einde mogen. + * @param p_str_tab A string collection. + * @param p_set The set of characters to remove from the begin and end. */ procedure trim ( p_str_tab in out nocopy t_clob_tab @@ -66,23 +85,23 @@ procedure trim ); /** - * Vergelijkt twee CLOB collecties en retourneert 0 indien ze gelijk zijn qua aantal elementen en ook per element. - * - * @param p_str1_tab De eerste CLOB collectie. - * @param p_str2_tab De eerste CLOB collectie. - * - * @return -1 indien p_str1_tab.count < p_str2_tab.count of - * indien p_str1_tab.count = p_str2_tab.count en er is een rij R met - * dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) < 0 en - * voor alle rijen < R geldt dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) = 0 - * 0 p_str1_tab.count = p_str2_tab.count en - * voor alle rijen R geldt dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) = 0 - * 1 indien p_str1_tab.count > p_str2_tab.count of - * indien p_str1_tab.count = p_str2_tab.count en er is een rij R met - * dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) > 0 en - * voor alle rijen < R geldt dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) = 0 - - * @throws ORA-06531 Reference to uninitialized collection + * Compare two CLOB collections and returns 0 if totally equal (count and each element). + * + * @param p_str1_tab The first CLOB collection. + * @param p_str2_tab The second CLOB collection. + * + * @return -1 if p_str1_tab.count < p_str2_tab.count or + * p_str1_tab.count = p_str2_tab.count and there is a row R for which + * dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) < 0 and + * for all rows R' < R dbms_lob.compare(p_str1_tab(R'), p_str2_tab(R')) = 0 + * 0 if p_str1_tab.count = p_str2_tab.count and + * for all rows R dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) = 0 + * 1 if p_str1_tab.count > p_str2_tab.count or + * if p_str1_tab.count = p_str2_tab.count and there is a row R with + * dbms_lob.compare(p_str1_tab(R), p_str2_tab(R)) > 0 and + * for all rows R' < R dbms_lob.compare(p_str1_tab(R'), p_str2_tab(R')) = 0 + + * @throws ORA-06531 Reference to an uninitialized collection */ function compare ( p_str1_tab in t_clob_tab @@ -91,19 +110,17 @@ function compare return integer; /** - * Vergelijkt twee CLOB collecties. - * - * @param p_str1_tab De eerste CLOB collectie. - * @param p_str2_tab De eerste CLOB collectie. - * @param p_first_line_not_equal De eerste regel die niet gelijk is. - * NULL indien er geen verschillen zijn. - * @param p_first_char_not_equal De eerste karakterpositie die niet gelijk is in de eerste regel die niet gelijk is. - * NULL indien er geen verschillen zijn of als de ene collectie groter is dan de andere - * en de kleinere collectie een subset is van de andere (d.w.z. alle regels gelijk). - * Niet NULL als er een regelnummer R is die in beide collecties zit en waarvoor er een - * karakter C zit is waarvoor geldt dat: - * dbms_lob.substr(lob_loc => p_str1_tab(R), offset => C, amount => 1) != - * dbms_lob.substr(lob_loc => p_str2_tab(R), offset => C, amount => 1) + * Compares two CLOB collections. + * + * @param p_str1_tab The first CLOB collection. + * @param p_str2_tab The second CLOB collection. + * @param p_first_line_not_equal The first line not equal (null when there are no differences). + * @param p_first_char_not_equal The first character position that differs for line p_first_line_not_equal. + * NULL when no differences or one collection is a sub set of the other (but not equal). + * Not NULL if there is a row R and character position C for which: + * + * dbms_lob.substr(lob_loc => p_str1_tab(R), offset => C, amount => 1) != + * dbms_lob.substr(lob_loc => p_str2_tab(R), offset => C, amount => 1) * * @throws ORA-06531 Reference to uninitialized collection */ @@ -117,8 +134,8 @@ procedure compare /** * Append a buffer to a CLOB using dbms_lob.writeappend(). * - * @param pi_buffer The buffer. - * @param pio_clob The CLOB. + * @param pi_buffer The buffer. + * @param pio_clob The CLOB. */ procedure append_text ( pi_buffer in varchar2 @@ -132,9 +149,9 @@ procedure append_text * See also http://www.talkapex.com/2009/06/how-to-quickly-append-varchar2-to-clob.html *

* - * @param pi_text The text to write to the buffer. - * @param pio_buffer The buffer that, when full, is flushed to the CLOB. - * @param pio_clob The CLOB. + * @param pi_text The text to write to the buffer. + * @param pio_buffer The buffer that, when full, is flushed to the CLOB. + * @param pio_clob The CLOB. */ procedure append_text ( pi_text in varchar2 @@ -145,9 +162,9 @@ procedure append_text /** * Write or append a text collection to a CLOB. * - * @param pi_text_tab The text collection. - * @param pio_clob The CLOB. If null a temporary is created. - * @param pi_append Should we append or not? If not the CLOB will be trimmed to zero bytes. + * @param pi_text_tab The text collection. + * @param pio_clob The CLOB. If null a temporary is created. + * @param pi_append Should we append or not? If not the CLOB will be trimmed to zero bytes. */ procedure text2clob ( pi_text_tab in oracle_tools.t_text_tab @@ -163,8 +180,8 @@ return clob; /** * Write or append a text collection to a CLOB. * - * @param pi_clob The CLOB. If null a temporary is created. - * @param pi_trim Trim at both ends. + * @param pi_clob The CLOB. If null a temporary is created. + * @param pi_trim Trim at both ends. * * @return The text collection */ @@ -174,6 +191,60 @@ function clob2text ) return oracle_tools.t_text_tab; -END PKG_STR_UTIL; +$if oracle_tools.cfg_pkg.c_testing $then + +-- test functions + +--%suitepath(DDL) +--%suite + +--%test +procedure ut_split1; + +--%test +procedure ut_split2; + +--%test +procedure ut_split3; + +--%test +--%disabled +procedure ut_trim1; + +--%test +--%disabled +procedure ut_trim2; + +--%test +--%disabled +procedure ut_compare1; + +--%test +--%disabled +procedure ut_compare2; + +--%test +--%disabled +procedure ut_append_text1; + +--%test +--%disabled +procedure ut_append_text2; + +--%test +--%disabled +procedure ut_text2clob1; + +--%test +--%disabled +procedure ut_text2clob2; + +--%test +--%disabled +procedure ut_clob2text; + +$end -- $if oracle_tools.cfg_pkg.c_testing $then + +END pkg_str_util; / diff --git a/db/app/ddl/src/full/R__10.ORACLE_TOOLS.VIEW.V_MY_SCHEMA_DDL_INFO.sql b/db/app/ddl/src/full/R__10.ORACLE_TOOLS.VIEW.V_MY_SCHEMA_DDL_INFO.sql index 181e7e60..b79e48fb 100644 --- a/db/app/ddl/src/full/R__10.ORACLE_TOOLS.VIEW.V_MY_SCHEMA_DDL_INFO.sql +++ b/db/app/ddl/src/full/R__10.ORACLE_TOOLS.VIEW.V_MY_SCHEMA_DDL_INFO.sql @@ -14,14 +14,14 @@ CREATE OR REPLACE VIEW "ORACLE_TOOLS"."V_MY_SCHEMA_DDL_INFO" ("OBJECT_SCHEMA", " , u.text as ddl_text from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( user -- p_schema - , null -- p_new_schema - , 1 -- p_sort_objects_by_deps - , null -- p_object_type - , null -- p_object_names - , null -- p_object_names_include - , null -- p_network_link - , 0 -- p_grantor_is_schema + ( p_schema => user + , p_new_schema => null + , p_sort_objects_by_deps => 1 + , p_object_type => null + , p_object_names => null + , p_object_names_include => null + , p_network_link => null + , p_grantor_is_schema => 0 ) ) t , table(t.ddl_tab) u; diff --git a/db/app/ddl/src/full/R__11.ORACLE_TOOLS.PROCEDURE.P_GENERATE_DDL.sql b/db/app/ddl/src/full/R__11.ORACLE_TOOLS.PROCEDURE.P_GENERATE_DDL.sql index c8d731ba..05ced326 100644 --- a/db/app/ddl/src/full/R__11.ORACLE_TOOLS.PROCEDURE.P_GENERATE_DDL.sql +++ b/db/app/ddl/src/full/R__11.ORACLE_TOOLS.PROCEDURE.P_GENERATE_DDL.sql @@ -8,18 +8,14 @@ CREATE OR REPLACE PROCEDURE "ORACLE_TOOLS"."P_GENERATE_DDL" , pi_object_names in varchar2 default null , pi_skip_repeatables in naturaln default 1 , pi_interface in varchar2 default null -, pi_transform_param_list in varchar2 default pkg_ddl_util.c_transform_param_list +, pi_transform_param_list in varchar2 default oracle_tools.pkg_ddl_util.c_transform_param_list , po_clob out nocopy clob ) authid current_user as - c_could_not_process constant pls_integer := -20099; - e_could_not_process exception; - pragma exception_init(e_could_not_process, -20099); - -- to reduce typos we use constant identifiers - "pkg_ddl_util v4" constant varchar2(30 char) := 'pkg_ddl_util v4'; -- pkg_ddl_util - "pkg_ddl_util v5" constant varchar2(30 char) := 'pkg_ddl_util v5'; -- pkg_ddl_util + "pkg_ddl_util v4" constant varchar2(30 char) := 'pkg_ddl_util v4'; + "pkg_ddl_util v5" constant varchar2(30 char) := 'pkg_ddl_util v5'; -- try the interfaces in this order -- the first one which matches pi_interface and which does not return an error, wins @@ -46,10 +42,10 @@ as l_sofar binary_integer := 0; l_op_name constant varchar2(10 char) := 'processed'; l_units constant varchar2(10 char) := 'rows'; - l_program constant varchar2(30 char) := 'P_GENERATE_DDL'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt + l_program constant varchar2(61 char) := $$PLSQL_UNIT; -- no schema because l_program is used in dbms_application_info begin -$if cfg_pkg.c_debugging $then - dbug.enter('P_GENERATE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'pi_source_schema: %s; pi_source_database_link: %s; pi_target_schema: %s; pi_target_database_link: %s' @@ -188,7 +184,7 @@ $end ,units => l_units); else - raise_application_error(c_could_not_process, 'Could not process interface ' || l_interface_tab(i_interface_idx)); + raise_application_error(oracle_tools.pkg_ddl_error.c_could_not_process_interface, 'Could not process interface ' || l_interface_tab(i_interface_idx)); end if; l_processed := true; @@ -196,7 +192,7 @@ $end exception when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging $then dbug.on_error; $end -- when this is the last interface tried we must reraise otherwise we try the next @@ -209,19 +205,19 @@ $end if not(l_processed) then - raise_application_error(c_could_not_process, 'Could not process interface ' || pi_interface); + raise_application_error(oracle_tools.pkg_ddl_error.c_could_not_process_interface, 'Could not process interface ' || pi_interface); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging $then dbug.leave; $end exception when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging $then dbug.leave_on_error; $end - raise_application_error(-20000, dbms_utility.format_error_backtrace, true); + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, dbms_utility.format_error_backtrace, true); end p_generate_ddl; / diff --git a/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_DDL_UTIL.sql b/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_DDL_UTIL.sql index 041ce506..1e24e3c6 100644 --- a/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_DDL_UTIL.sql +++ b/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_DDL_UTIL.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_DDL_UTIL" IS +CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_DDL_UTIL" IS -- -*-coding: utf-8-*- /* TYPES */ @@ -11,17 +11,17 @@ CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_DDL_UTIL" IS type t_object_lookup_rec is record ( count t_numeric_boolean default 0 - , schema_ddl t_schema_ddl + , schema_ddl oracle_tools.t_schema_ddl , ready boolean default false -- pipe row has been issued ); type t_object_lookup_tab is table of t_object_lookup_rec index by t_object; - -- key is t_schema_object.signature(), value is t_schema_object.id() + -- key is oracle_tools.t_schema_object.signature(), value is oracle_tools.t_schema_object.id() type t_constraint_lookup_tab is table of t_object index by t_object; -- for parse_ddl - -- just to make the usage of VIEW V_DISPLAY_DDL_SCHEMA in dynamic SQL explicit - subtype t_stm_v_display_ddl_schema is v_display_ddl_schema%rowtype; + -- just to make the usage of VIEW oracle_tools.v_display_ddl_schema in dynamic SQL explicit + subtype t_stm_v_display_ddl_schema is oracle_tools.v_display_ddl_schema%rowtype; subtype t_graph is t_object_dependency_tab; /* @@ -30,7 +30,9 @@ CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_DDL_UTIL" IS */ -- This means l_object depends on l_object_dependency - type t_object_exclude_name_expr_tab is table of t_text_tab index by t_metadata_object_type; + type t_object_exclude_name_expr_tab is table of oracle_tools.t_text_tab index by t_metadata_object_type; + + subtype t_module is varchar2(100); /* CONSTANTS */ @@ -47,17 +49,28 @@ CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_DDL_UTIL" IS g_dbname global_name.global_name%type := null; - g_package constant varchar2(61 char) := 'PKG_DDL_UTIL'; + g_package constant t_module := $$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT; + + g_package_prefix constant t_module := g_package || '.'; + + function get_object_no_dependencies_tab + return t_object_natural_tab; + + c_object_no_dependencies_tab constant t_object_natural_tab := get_object_no_dependencies_tab; -- initialisation - g_package_prefix constant varchar2(61 char) := g_package || '.'; + "schema_version" constant user_objects.object_name%type := 'schema_version'; + + "flyway_schema_history" constant user_objects.object_name%type := 'flyway_schema_history'; - c_not_a_directed_acyclic_graph constant integer := -20001; + "CREATE$JAVA$LOB$TABLE" constant user_objects.object_name%type := 'CREATE$JAVA$LOB$TABLE'; -$if cfg_pkg.c_testing $then + c_object_to_ignore_tab constant oracle_tools.t_text_tab := oracle_tools.t_text_tab("schema_version", "flyway_schema_history", "CREATE$JAVA$LOB$TABLE"); + +$if oracle_tools.cfg_pkg.c_testing $then "EMPTY" constant all_objects.owner%type := 'EMPTY'; - g_owner constant all_objects.owner%type := 'ORACLE_TOOLS'; + g_owner constant all_objects.owner%type := $$PLSQL_UNIT_OWNER; g_owner_utplsql all_objects.owner%type; -- not a real constant but set only once @@ -67,127 +80,10 @@ $if cfg_pkg.c_testing $then g_loopback constant varchar2(10 char) := 'LOOPBACK'; - g_object_names constant varchar2(32767 char) := -'BIU_EBA_DEMO_LOAD_EMP -,EBA_CM_CHECKLIST_SAMPLE -,EBA_CM_CHECKLIST_STD -,EBA_CM_FW -,EBA_CUST -,EBA_CUST_FLEX_FW -,EBA_CUST_FW -,EBA_CUST_SAMPLE_DATA -,EBA_DEMO_CHART_DEPT -,EBA_DEMO_CHART_EMP -,EBA_DEMO_CHART_POPULATION -,EBA_DEMO_CHART_PROJECTS -,EBA_DEMO_CHART_STOCKS -,EBA_DEMO_CHART_TASKS -,EBA_DEMO_LOAD_DATA -,EBA_DEMO_LOAD_DEPT -,EBA_DEMO_LOAD_EMP -,EBA_DP -,EBA_DPS_SEQ -,EBA_DP_ACCESS_LEVELS -,EBA_DP_ACTIVE_FILTERS_T -,EBA_DP_ACTIVE_FILTERS_TBL -,EBA_DP_CALENDARS -,EBA_DP_CATEGORIES -,EBA_DP_DASHBOARD -,EBA_DP_DATASRC_TYPES -,EBA_DP_DATA_ACCESS -,EBA_DP_DATA_SOURCES -,EBA_DP_DATA_SOURCE_PERMS -,EBA_DP_DEMO_DATA -,EBA_DP_DEMO_PROJECTS -,EBA_DP_DEMO_PROJECT_DATA -,EBA_DP_ERRORS -,EBA_DP_ERROR_LOOKUP -,EBA_DP_FAVORITES -,EBA_DP_FILES -,EBA_DP_FILTER2_FW -,EBA_DP_FILTER_COLUMN_T -,EBA_DP_FILTER_COL_TBL -,EBA_DP_FILTER_REPORT -,EBA_DP_FILTER_RPT_FILTERS -,EBA_DP_FORMAT_MASKS -,EBA_DP_FW -,EBA_DP_HISTORY -,EBA_DP_INVOCATIONS -,EBA_DP_NOTES -,EBA_DP_NOTIFICATIONS -,EBA_DP_PARSER -,EBA_DP_PDF -,EBA_DP_PDF_RPT -,EBA_DP_PDF_RPT_SRC -,EBA_DP_PDF_RPT_SRC_COLS -,EBA_DP_PREFERENCES -,EBA_DP_REPORTS -,EBA_DP_REPORT_PERMS -,EBA_DP_REPORT_VALIDATIONS -,EBA_DP_RESERVED_NAMES -,EBA_DP_RPT_TYPES -,EBA_DP_RPT_VAL_DEPENDENCYS -,EBA_DP_RPT_VAL_HISTORY_V -,EBA_DP_RPT_VAL_V -,EBA_DP_SECURITY -,EBA_DP_TAGS -,EBA_DP_TAGS_SUM -,EBA_DP_TAGS_TYPE_SUM -,EBA_DP_UI -,EBA_DP_USERS -,EBA_DP_USER_PREF -,EBA_DP_VIEWERS -,EBA_DP_VIEWER_GROUPS -,EBA_DP_VIEWER_GROUP_REF -,EBA_DP_WHITELIST_OBJECTS -,EBA_DP_WIDGETS -,EBA_DP_WIDGET_TYPES -,EBA_GLCL -,EBA_GLCLS_REMOVE_DATA -,EBA_GLCL_ACCESS_LEVELS -,EBA_GLCL_CATEGORIES -,EBA_GLCL_DATA_LOAD -,EBA_GLCL_ERRORS -,EBA_GLCL_ERROR_LOOKUP -,EBA_GLCL_FILES -,EBA_GLCL_FW -,EBA_GLCL_HELP_PAGE -,EBA_GLCL_HISTORY -,EBA_GLCL_ITEMS -,EBA_GLCL_LINKS -,EBA_GLCL_NOTES -,EBA_GLCL_NOTIFICATIONS -,EBA_GLCL_PREFERENCES -,EBA_GLCL_PROJECTS -,EBA_GLCL_RPT -,EBA_GLCL_SEQ -,EBA_GLCL_STATUS_CODES -,EBA_GLCL_SUB_CATEGORIES -,EBA_GLCL_TAGS -,EBA_GLCL_TAGS_SUM -,EBA_GLCL_TAGS_TYPE_SUM -,EBA_GLCL_TZ_PREF -,EBA_GLCL_USERS -,EBA_LIVEPOLL -,EBA_LIVEPOLL_ACCOUNT -,EBA_LIVEPOLL_EMAIL_API -,EBA_LIVEPOLL_FW -,EBA_LIVEPOLL_QUIZ -,EBA_SALES_ACL_API -,EBA_SALES_DATA -,EBA_SALES_FW -,EBA_SB -,EBA_SB_EMAIL_API -,EBA_SB_FW -,EBA_SB_SAMPLE'; - -$end -- $if cfg_pkg.c_testing $then +$end -- $if oracle_tools.cfg_pkg.c_testing $then /* EXCEPTIONS */ - e_not_a_directed_acyclic_graph exception; - pragma exception_init(e_not_a_directed_acyclic_graph, -20001); - -- ORA-31603: object ... of type MATERIALIZED_VIEW not found in schema ... e_object_not_found exception; pragma exception_init(e_object_not_found, -31603); @@ -204,7 +100,10 @@ $end -- $if cfg_pkg.c_testing $then e_wrong_transform_object_type exception; pragma exception_init(e_wrong_transform_object_type, -31602); - + -- ORA-44003: invalid SQL name + e_invalid_sql_name exception; + pragma exception_init(e_invalid_sql_name, -44003); + /* VARIABLES */ g_object_exclude_name_expr_tab t_object_exclude_name_expr_tab; @@ -219,7 +118,7 @@ $end -- $if cfg_pkg.c_testing $then -- -- Well, we need to use a view since a pipelined function with a database -- link does not work. But then, if we use a view (which actually uses - -- AUTHID DEFINER) the AUTHID for pkg_ddl_util will be the same, + -- AUTHID DEFINER) the AUTHID for oracle_tools.pkg_ddl_util will be the same, -- i.e. ORACLE_TOOLS. That means that objects not granted directly to -- ORACLE_TOOLS on the remote database will not be retrieved by -- DBMS_METADATA. @@ -243,10 +142,6 @@ $if dbms_db_version.ver_le_10 $then $error 'Oracle 10 and below not supported.' $end - -- Oracle 10g does not allow us to store a ref cursor as a package variable - -- not does it allow us to retrieve collections via dbms_sql. - -- So just put everything into a collection in set_display_ddl_schema_args(). - g_schema_ddl_tab t_schema_ddl_tab; $else -- PLS-00994: Cursor Variables cannot be declared as part of a package -- So store a dbms_sql cursor (integer) and convert to sys_refcursor whenever necessary. @@ -257,30 +152,30 @@ $end g_clob clob := null; -- DBMS_METADATA object types voor DBA gerelateerde taken (DBA rol) - g_dba_md_object_type_tab constant t_text_tab := t_text_tab( 'CONTEXT' - /*, 'DEFAULT_ROLE'*/ - , 'DIRECTORY' - /*, 'FGA_POLICY'*/ - /*, 'ROLE'*/ - /*, 'ROLE_GRANT'*/ - /*, 'ROLLBACK_SEGMENT'*/ - , 'SYSTEM_GRANT' - /*, 'TABLESPACE'*/ - /*, 'TABLESPACE_QUOTA'*/ - /*, 'TRUSTED_DB_LINK'*/ - /*, 'USER'*/ - ); + g_dba_md_object_type_tab constant oracle_tools.t_text_tab := oracle_tools.t_text_tab( 'CONTEXT' + /*, 'DEFAULT_ROLE'*/ + , 'DIRECTORY' + /*, 'FGA_POLICY'*/ + /*, 'ROLE'*/ + /*, 'ROLE_GRANT'*/ + /*, 'ROLLBACK_SEGMENT'*/ + , 'SYSTEM_GRANT' + /*, 'TABLESPACE'*/ + /*, 'TABLESPACE_QUOTA'*/ + /*, 'TRUSTED_DB_LINK'*/ + /*, 'USER'*/ + ); -- DBMS_METADATA object types voor de PUBLIC rol - g_public_md_object_type_tab constant t_text_tab := t_text_tab('DB_LINK'); + g_public_md_object_type_tab constant oracle_tools.t_text_tab := oracle_tools.t_text_tab('DB_LINK'); -- DBMS_METADATA object types ordered by least dependencies (see also sort_objects_by_deps) - g_schema_md_object_type_tab constant t_text_tab := - t_text_tab + g_schema_md_object_type_tab constant oracle_tools.t_text_tab := + oracle_tools.t_text_tab ( 'SEQUENCE' , 'TYPE_SPEC' , 'CLUSTER' -$if pkg_ddl_util.c_get_queue_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_queue_ddl $then , 'AQ_QUEUE_TABLE' , 'AQ_QUEUE' $else @@ -306,24 +201,24 @@ $end /* zit al bij TABLE */ --,'REF_CONSTRAINT' , 'SYNONYM' -- zo laat mogelijk i.v.m. verwijderen publieke synoniemen in synchronize() -- vanaf hier is beste volgorde niet bekend -$if pkg_ddl_util.c_get_db_link_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_db_link_ddl $then , 'DB_LINK' $end -$if pkg_ddl_util.c_get_dimension_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_dimension_ddl $then , 'DIMENSION' $end -$if pkg_ddl_util.c_get_indextype_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_indextype_ddl $then , 'INDEXTYPE' $end , 'JAVA_SOURCE' -$if pkg_ddl_util.c_get_library_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_library_ddl $then , 'LIBRARY' $end -$if pkg_ddl_util.c_get_operator_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_operator_ddl $then , 'OPERATOR' $end , 'REFRESH_GROUP' -$if pkg_ddl_util.c_get_xmlschema_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_xmlschema_ddl $then , 'XMLSCHEMA' $end , 'PROCOBJ' @@ -397,6 +292,14 @@ $end p_longops_rec.totalwork := p_longops_rec.sofar; longops_show(p_longops_rec, 0); end if; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print + ( dbug."info" + , 'p_longops_rec.target_desc: %s; p_longops_rec.totalwork: %s' + , p_longops_rec.target_desc + , p_longops_rec.totalwork + ); +$end end longops_done; function get_db_link @@ -449,13 +352,13 @@ $end if p_schema is null and p_network_link is not null then - raise_application_error(c_schema_wrong, p_description || ' is empty and the network link not.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_schema_wrong, p_description || ' is empty and the network link not.'); elsif p_schema is not null and p_network_link is null and dbms_assert.schema_name(p_schema) is null then raise_application_error - ( c_schema_does_not_exist + ( oracle_tools.pkg_ddl_error.c_schema_does_not_exist , p_description || '"' || p_schema || '"' || ' does not exist.' ); -- hier komt ie niet omdat dbms_assert.schema_name() al een exceptie genereert end if; @@ -469,7 +372,7 @@ $end begin if (p_numeric_boolean is not null and p_numeric_boolean not in (0, 1)) then - raise_application_error(c_numeric_boolean_wrong, p_description || ' (' || p_numeric_boolean || ') is not empty and not 0 or 1.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong, p_description || ' (' || p_numeric_boolean || ') is not empty and not 0 or 1.'); end if; end check_numeric_boolean; @@ -482,7 +385,7 @@ $end if (p_object_names is not null and p_object_names_include is null) then raise_application_error - ( c_object_names_wrong + ( oracle_tools.pkg_ddl_error.c_object_names_wrong , 'The include flag (' || p_object_names_include || ') is empty and the list of object names is not empty:' || @@ -494,7 +397,7 @@ $end elsif (p_object_names is null and p_object_names_include is not null) then raise_application_error - ( c_object_names_wrong + ( oracle_tools.pkg_ddl_error.c_object_names_wrong , 'The include flag (' || p_object_names_include || ') is not empty and the list of object names is empty:' || @@ -515,7 +418,7 @@ $end if p_network_link is not null and get_db_link(p_network_link) is null then - raise_application_error(c_database_link_does_not_exist, p_description || ' "' || p_network_link || '" unknown.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_database_link_does_not_exist, p_description || ' "' || p_network_link || '" unknown.'); end if; end check_network_link; @@ -532,7 +435,7 @@ $end (p_schema_source = p_schema_target) then -- source and target equal - raise_application_error(c_source_and_target_equal, 'Source and target may not be equal.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_source_and_target_equal, 'Source and target may not be equal.'); end if; end check_source_target; @@ -542,7 +445,7 @@ $end is begin if p_object_type is null or -$if not(pkg_ddl_util.c_get_queue_ddl) $then +$if not(oracle_tools.pkg_ddl_util.c_get_queue_ddl) $then p_object_type in ('AQ_QUEUE', 'AQ_QUEUE_TABLE') or $end p_object_type in ('CONSTRAINT', 'REF_CONSTRAINT') or @@ -550,11 +453,11 @@ $end then null; -- ok else - raise_application_error(c_object_type_wrong, 'Object type (' || p_object_type || ') is not one of the metadata schema object types.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_object_type_wrong, 'Object type (' || p_object_type || ') is not one of the metadata schema object types.'); end if; end check_object_type; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then procedure print ( p_line_tab in dbms_sql.varchar2a @@ -608,7 +511,7 @@ $if cfg_pkg.c_debugging $then procedure print ( p_description in varchar2 - , p_text_tab in t_text_tab + , p_text_tab in oracle_tools.t_text_tab ) is l_str varchar2(32767 char); @@ -617,7 +520,7 @@ $if cfg_pkg.c_debugging $then if p_text_tab is not null and p_text_tab.count > 0 then l_str := p_text_tab(p_text_tab.first); -- to prevent a VALUE_ERROR (?!) - pkg_str_util.split(p_str => l_str, p_delimiter => chr(10), p_str_tab => l_line_tab); + oracle_tools.pkg_str_util.split(p_str => l_str, p_delimiter => chr(10), p_str_tab => l_line_tab); end if; print(p_description, l_line_tab, l_line_tab.first, least(l_line_tab.last, 10)); exception @@ -650,15 +553,20 @@ $end , p_unmarked_nodes in out nocopy t_object_natural_tab , p_marked_nodes in out nocopy t_object_natural_tab , p_result in out nocopy dbms_sql.varchar2_table + , p_error_n out nocopy t_object ) is l_m t_object; begin + p_error_n := null; + if p_marked_nodes.exists(p_n) then if p_marked_nodes(p_n) = 1 /* A */ then - raise_application_error(c_not_a_directed_acyclic_graph, 'Node ' || p_n || ' has been visited before.'); + -- node has been visited before + p_error_n := p_n; + return; end if; else if not p_unmarked_nodes.exists(p_n) @@ -681,7 +589,12 @@ $end , p_unmarked_nodes => p_unmarked_nodes , p_marked_nodes => p_marked_nodes , p_result => p_result + , p_error_n => p_error_n ); /* E */ + if p_error_n is not null + then + return; + end if; l_m := p_graph(p_n).next(l_m); end loop; end if; @@ -695,6 +608,7 @@ $end procedure tsort ( p_graph in t_graph , p_result out nocopy dbms_sql.varchar2_table /* I */ + , p_error_n out nocopy t_object ) is l_unmarked_nodes t_object_natural_tab; @@ -702,7 +616,7 @@ $end l_n t_object; l_m t_object; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'TSORT'); $end @@ -747,10 +661,13 @@ $end , p_unmarked_nodes => l_unmarked_nodes , p_marked_nodes => l_marked_nodes , p_result => p_result + , p_error_n => p_error_n ); + exit when p_error_n is not null; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print(dbug."output", 'p_error_n: %s', p_error_n); dbug.leave; exception when others @@ -760,12 +677,52 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then $end end tsort; + procedure dsort + ( p_graph in out nocopy t_graph + , p_result out nocopy dbms_sql.varchar2_table /* I */ + ) + is + l_error_n t_object; + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'DSORT'); +$end + + while true + loop + tsort(p_graph, p_result, l_error_n); + + exit when l_error_n is null; -- successful: stop + + if p_graph(l_error_n).count = 0 + then + raise program_error; + end if; + + p_graph(l_error_n) := c_object_no_dependencies_tab; + + if p_graph(l_error_n).count != 0 + then + raise program_error; + end if; + end loop; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; +$end + end dsort; + function get_host(p_network_link in varchar2) return varchar2 is l_host all_db_links.host%type; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'GET_HOST'); dbug.print(dbug."input", 'p_network_link: %s', p_network_link); $end @@ -777,7 +734,7 @@ $end select dbms_assert.enquote_name(t.host) into l_host from all_db_links t where t.db_link = upper(p_network_link); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', l_host); dbug.leave; $end @@ -785,7 +742,7 @@ $end return l_host; exception when others then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', to_char(null)); dbug.leave; $end @@ -812,9 +769,9 @@ $end is procedure parse_alter is - l_constraint varchar2(32767 char) := dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => 32767); - l_constraint_expr_tab constant t_text_tab := - t_text_tab + l_constraint varchar2(32767 char) := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => 32767); + l_constraint_expr_tab constant oracle_tools.t_text_tab := + oracle_tools.t_text_tab ( -- 1) ALTER TABLE ""."" ADD CONSTRAINT "" PRIMARY KEY (...) -- ALTER TABLE ""."
" ADD CONSTRAINT "" FOREIGN KEY (...) -- ALTER TABLE ""."
" ADD CONSTRAINT "" CHECK (...) @@ -838,9 +795,9 @@ $end l_column_names varchar2(32767 char); l_search_condition varchar2(32767 char); - l_base_object t_named_object; - l_ref_object t_named_object; - l_constraint_object t_constraint_object := null; + l_base_object oracle_tools.t_named_object; + l_ref_object oracle_tools.t_named_object; + l_constraint_object oracle_tools.t_constraint_object := null; l_ref_object_schema t_schema; l_ref_object_type t_metadata_object_type; l_ref_object_name t_object; @@ -872,7 +829,7 @@ $end end loop; l_constraint := substr(l_constraint, l_pos1); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'l_constraint: "%s"', l_constraint); $end if l_constraint like l_constraint_expr_tab(1) @@ -912,7 +869,7 @@ $end p_object_schema := p_base_object_schema; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'p_object_type: %s; named constraint?: %s' @@ -929,7 +886,7 @@ $end l_pos1 := instr(l_constraint, '"', 1, 5); l_pos2 := instr(l_constraint, '"', 1, 6); p_object_name := substr(l_constraint, l_pos1+1, l_pos2 - (l_pos1+1)); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'l_pos1: %s; l_pos2: %s; p_object_name: %s' @@ -951,7 +908,7 @@ $end then l_column_names := replace(substr(l_constraint, l_pos1+1, l_pos2 - (l_pos1+1)), ' '); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'l_pos1: %s; l_pos2: %s; l_column_names: %s' @@ -962,7 +919,7 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then $end l_base_object := - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_type => p_base_object_type , p_object_schema => p_base_object_schema , p_object_name => p_base_object_name @@ -970,7 +927,7 @@ $end case when l_constraint like l_constraint_expr_tab(2) -- primary key - then l_constraint_object := t_constraint_object + then l_constraint_object := oracle_tools.t_constraint_object ( p_base_object => l_base_object , p_object_schema => p_base_object_schema , p_object_name => null -- constraint name is not known @@ -978,7 +935,7 @@ $end , p_column_names => l_column_names ); when l_constraint like l_constraint_expr_tab(3) -- unique key - then l_constraint_object := t_constraint_object + then l_constraint_object := oracle_tools.t_constraint_object ( p_base_object => l_base_object , p_object_schema => p_base_object_schema , p_object_name => null -- constraint name is not known @@ -1005,17 +962,17 @@ $end and obj.object_name = l_ref_object_name; l_ref_object := - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => l_ref_object_schema , p_object_type => l_ref_object_type , p_object_name => l_ref_object_name ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_ref_object.print(); $end - l_constraint_object := t_ref_constraint_object + l_constraint_object := oracle_tools.t_ref_constraint_object ( p_base_object => l_base_object , p_object_schema => p_base_object_schema , p_object_name => null -- constraint name unknown @@ -1025,34 +982,40 @@ $end ); end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_constraint_object.print(); $end begin p_object_name := p_object_lookup_tab(p_constraint_lookup_tab(l_constraint_object.signature())).schema_ddl.obj.object_name(); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print( dbug."info", 'p_object_name (%s) determined by lookup', p_object_name); $end exception when others then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print( dbug."warning", 'p_object_name could not be determined by lookup: %s', sqlerrm); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print + ( dbug."warning" + , 'constraint signature: %s; constraint looked up: %s; p_object_name could not be determined by lookup: %s' + , l_constraint_object.signature() + , case when p_constraint_lookup_tab.exists(l_constraint_object.signature()) then p_constraint_lookup_tab(l_constraint_object.signature()) end + , sqlerrm + ); $end for r_cc in ( select c.constraint_name , oracle_tools.t_constraint_object.get_column_names - ( c.owner - , c.constraint_name - , c.table_name + ( p_object_schema => c.owner + , p_object_name => c.constraint_name + , p_table_name => c.table_name ) as column_names from all_constraints c where c.owner = p_schema and c.table_name = p_base_object_name ) loop -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'r_cc.constraint_name: %s; r_cc.column_names: %s' @@ -1063,7 +1026,7 @@ $end if replace(r_cc.column_names, ' ') = replace(l_column_names, ' ') then p_object_name := r_cc.constraint_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print( dbug."info", 'p_object_name (%s) determined by dictionary search', p_object_name); $end exit; @@ -1090,13 +1053,13 @@ $end end if; l_base_object := - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_type => p_base_object_type , p_object_schema => p_base_object_schema , p_object_name => p_base_object_name ); - l_constraint_object := t_constraint_object + l_constraint_object := oracle_tools.t_constraint_object ( p_base_object => l_base_object , p_object_schema => p_base_object_schema , p_object_name => null -- constraint name is not known @@ -1104,19 +1067,19 @@ $end , p_search_condition => l_search_condition ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_constraint_object.print(); $end begin p_object_name := p_object_lookup_tab(p_constraint_lookup_tab(l_constraint_object.signature())).schema_ddl.obj.object_name(); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print( dbug."info", 'p_object_name (%s) determined by lookup', p_object_name); $end exception when others then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print( dbug."warning", 'p_object_name could not be determined by lookup: %s', sqlerrm); $end open c_con(b_schema => p_schema, b_table_name => p_base_object_name); @@ -1126,7 +1089,7 @@ $end exit fetch_loop when c_con%notfound; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'r_con.constraint_name: %s; r_con.search_condition: %s' @@ -1138,7 +1101,7 @@ $end if r_con.search_condition = l_search_condition then p_object_name := r_con.constraint_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print( dbug."info", 'p_object_name (%s) determined by dictionary search', p_object_name); $end exit fetch_loop; @@ -1157,7 +1120,7 @@ $end p_object_type := case when instr(l_constraint, ' FOREIGN KEY ') > 0 then 'REF_CONSTRAINT' else 'CONSTRAINT' end; elsif l_constraint not like l_constraint_expr_tab(7) then - raise_application_error(-20000, 'Could not parse "' || l_constraint || '"'); + raise_application_error(oracle_tools.pkg_ddl_error.c_could_not_parse, 'Could not parse "' || l_constraint || '"'); end if; end parse_alter; @@ -1169,7 +1132,7 @@ $end -- COMMENT ON COLUMN "schema"."object"."column" IS l_pos1 pls_integer := dbms_lob.instr(lob_loc => p_ddl.ddlText, pattern => ' IS '); l_pos2 pls_integer; - l_comment constant all_tab_comments.comments%type := dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => case when l_pos1 > 0 then l_pos1 else 2000 end); + l_comment constant all_tab_comments.comments%type := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => case when l_pos1 > 0 then l_pos1 else 2000 end); begin if p_base_object_schema is null then @@ -1226,7 +1189,7 @@ $end when others then raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_could_not_parse , 'Comment: ' || l_comment || '; p_schema: ' || p_schema || '; p_base_object_name: ' || p_base_object_name @@ -1236,7 +1199,7 @@ $end procedure parse_procobj is - l_plsql_block varchar2(4000 char) := dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => 4000); + l_plsql_block varchar2(4000 char) := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => 4000); l_pos1 pls_integer := null; l_pos2 pls_integer := null; begin @@ -1250,7 +1213,7 @@ $end procedure parse_index is - l_index varchar2(4000 char) := dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => 4000); + l_index varchar2(4000 char) := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => 4000); l_pos1 pls_integer := null; l_pos2 pls_integer := null; begin @@ -1271,7 +1234,7 @@ $end procedure parse_object_grant is - l_object_grant varchar2(4000 char) := dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => 4000); + l_object_grant varchar2(4000 char) := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => 4000); l_pos1 pls_integer := null; l_pos2 pls_integer := null; begin @@ -1285,13 +1248,13 @@ $end end parse_object_grant; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'PARSE_DDL'); dbug.print ( dbug."input" , 'p_schema: %s; p_ddl.ddlText: %s' , p_schema - , dbms_lob.substr(lob_loc => p_ddl.ddlText, amount => 100) + , oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl.ddlText, p_amount => 200) ); $end @@ -1301,7 +1264,7 @@ $end <> for i_parsed_item_idx in p_ddl.parseditems.first .. p_ddl.parseditems.last loop -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info" ,'p_ddl.parseditems(%s).item: %s; value: %s' ,i_parsed_item_idx @@ -1315,13 +1278,13 @@ $end when 'NAME' then p_object_name := p_ddl.parseditems(i_parsed_item_idx).value; when 'OBJECT_TYPE' then - p_object_type := t_schema_object.dict2metadata_object_type(p_ddl.parseditems(i_parsed_item_idx).value); + p_object_type := oracle_tools.t_schema_object.dict2metadata_object_type(p_ddl.parseditems(i_parsed_item_idx).value); when 'SCHEMA' then p_object_schema := p_ddl.parseditems(i_parsed_item_idx).value; when 'BASE_OBJECT_NAME' then p_base_object_name := p_ddl.parseditems(i_parsed_item_idx).value; when 'BASE_OBJECT_TYPE' then - p_base_object_type := t_schema_object.dict2metadata_object_type(p_ddl.parseditems(i_parsed_item_idx).value); + p_base_object_type := oracle_tools.t_schema_object.dict2metadata_object_type(p_ddl.parseditems(i_parsed_item_idx).value); when 'BASE_OBJECT_SCHEMA' then p_base_object_schema := p_ddl.parseditems(i_parsed_item_idx).value; when 'GRANTEE' then @@ -1349,7 +1312,7 @@ $end end if; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."output" , 'p_verb: %s; p_object_name; %s; p_object_type: %s; p_object_schema: %s' @@ -1388,14 +1351,14 @@ $end begin if not(g_object_exclude_name_expr_tab.exists(p_object_type)) then - g_object_exclude_name_expr_tab(p_object_type) := t_text_tab(); + g_object_exclude_name_expr_tab(p_object_type) := oracle_tools.t_text_tab(); end if; g_object_exclude_name_expr_tab(p_object_type).extend(1); g_object_exclude_name_expr_tab(p_object_type)(g_object_exclude_name_expr_tab(p_object_type).last) := p_exclude_name_expr; end add; - procedure add(p_object_type_tab in t_text_tab, p_exclude_name_expr in varchar2) + procedure add(p_object_type_tab in oracle_tools.t_text_tab, p_exclude_name_expr in varchar2) is begin for i_idx in p_object_type_tab.first .. p_object_type_tab.last @@ -1405,199 +1368,40 @@ $end end add; begin -- no dropped tables - add(t_text_tab('TABLE', 'INDEX', 'TRIGGER', 'OBJECT_GRANT'), 'BIN$%'); + add(oracle_tools.t_text_tab('TABLE', 'INDEX', 'TRIGGER', 'OBJECT_GRANT'), 'BIN$%'); -- no AQ indexes/views - add(t_text_tab('INDEX', 'VIEW', 'OBJECT_GRANT'), 'AQ$%'); + add(oracle_tools.t_text_tab('INDEX', 'VIEW', 'OBJECT_GRANT'), 'AQ$%'); -- no Flashback archive tables/indexes - add(t_text_tab('TABLE', 'INDEX'), 'SYS\_FBA\_%'); - + add(oracle_tools.t_text_tab('TABLE', 'INDEX'), 'SYS\_FBA\_%'); + -- no system generated indexes add('INDEX', 'SYS\_C%'); -- no generated types by declaring pl/sql table types in package specifications - add(t_text_tab('SYNONYM', 'TYPE_SPEC', 'TYPE_BODY', 'OBJECT_GRANT'), 'SYS\_PLSQL\_%'); + add(oracle_tools.t_text_tab('SYNONYM', 'TYPE_SPEC', 'TYPE_BODY', 'OBJECT_GRANT'), 'SYS\_PLSQL\_%'); -- see http://orasql.org/2012/04/28/a-funny-fact-about-collect/ - add(t_text_tab('SYNONYM', 'TYPE_SPEC', 'TYPE_BODY', 'OBJECT_GRANT'), 'SYSTP%'); + add(oracle_tools.t_text_tab('SYNONYM', 'TYPE_SPEC', 'TYPE_BODY', 'OBJECT_GRANT'), 'SYSTP%'); -- no datapump tables - add(t_text_tab('TABLE', 'OBJECT_GRANT'), 'SYS\_SQL\_FILE\_SCHEMA%'); - add(t_text_tab('TABLE', 'OBJECT_GRANT'), user || '\_DDL'); - add(t_text_tab('TABLE', 'OBJECT_GRANT'), user || '\_DML'); + add(oracle_tools.t_text_tab('TABLE', 'OBJECT_GRANT'), 'SYS\_SQL\_FILE\_SCHEMA%'); + add(oracle_tools.t_text_tab('TABLE', 'OBJECT_GRANT'), user || '\_DDL'); + add(oracle_tools.t_text_tab('TABLE', 'OBJECT_GRANT'), user || '\_DML'); -- no Oracle generated datapump tables - add(t_text_tab('TABLE', 'OBJECT_GRANT'), 'SYS\_EXPORT\_FULL\_%'); + add(oracle_tools.t_text_tab('TABLE', 'OBJECT_GRANT'), 'SYS\_EXPORT\_FULL\_%'); - -- no Flyway stuff - -- old schema history table - add(t_text_tab('TABLE', 'OBJECT_GRANT', 'INDEX', 'CONSTRAINT', 'REF_CONSTRAINT'), 'schema_version%'); - -- new schema history table - add(t_text_tab('TABLE', 'OBJECT_GRANT', 'INDEX', 'CONSTRAINT', 'REF_CONSTRAINT'), 'flyway_schema_history%'); + -- no Flyway stuff and other Oracle things + for i_idx in c_object_to_ignore_tab.first .. c_object_to_ignore_tab.last + loop + add(oracle_tools.t_text_tab('TABLE', 'OBJECT_GRANT', 'INDEX', 'CONSTRAINT', 'REF_CONSTRAINT'), c_object_to_ignore_tab(i_idx) || '%'); + end loop; -- no identity column sequences - add(t_text_tab('SEQUENCE', 'OBJECT_GRANT'), 'ISEQ$$%'); + add(oracle_tools.t_text_tab('SEQUENCE', 'OBJECT_GRANT'), 'ISEQ$$%'); end i_object_exclude_name_expr_tab; - procedure md_set_remap_param - ( p_object_type in varchar2 - , p_object_schema in varchar2 - , p_new_object_schema in varchar2 - , p_base_object_schema in varchar2 - , p_handle in number - ) - is - l_transform_handle number := null; - l_object_type_tab t_text_tab; - begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter(g_package_prefix || 'MD_SET_REMAP_PARAM'); - dbug.print(dbug."input" - ,'p_object_type: %s; p_object_schema: %s; p_new_object_schema: %s; p_base_object_schema: %s' - ,p_object_type - ,p_object_schema - ,p_new_object_schema - ,p_base_object_schema); -$end - - -- first, are we going to remap? - if p_object_schema != p_new_object_schema or p_base_object_schema != p_new_object_schema - then - if p_object_type = 'SCHEMA_EXPORT' - then - if p_object_schema != p_new_object_schema - then - l_object_type_tab := g_schema_md_object_type_tab; - - for i_idx in l_object_type_tab.first .. l_object_type_tab.last - loop - begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", 'l_object_type_tab(%s): %s', i_idx, l_object_type_tab(i_idx)); -$end - l_transform_handle := - dbms_metadata.add_transform - ( handle => p_handle - , name => 'MODIFY' - , object_type => l_object_type_tab(i_idx) - ); - - if p_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param - ( transform_handle => l_transform_handle - , name => 'REMAP_SCHEMA' - , old_value => p_object_schema - , new_value => p_new_object_schema - , object_type => l_object_type_tab(i_idx) - ); - end if; - if p_base_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param - ( transform_handle => l_transform_handle - , name => 'REMAP_SCHEMA' - , old_value => p_base_object_schema - , new_value => p_new_object_schema - , object_type => l_object_type_tab(i_idx) - ); - end if; - exception - when e_invalid_transform_parameter or e_wrong_transform_object_type - then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.on_error; -$end - null; - end; - end loop; - end if; - else - begin - l_transform_handle := dbms_metadata.add_transform(handle => p_handle, name => 'MODIFY'); - - if nvl(is_dependent_object_type(p_object_type => p_object_type), 1) = 1 - then - if p_object_type in ('INDEX', 'TRIGGER') - then - if is_dependent_object_type(p_object_type => p_object_type) is null - then - null; -- OK - else - raise program_error; - end if; - - if p_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param(transform_handle => l_transform_handle - ,name => 'REMAP_SCHEMA' - ,old_value => p_object_schema - ,new_value => p_new_object_schema); - end if; - else - if is_dependent_object_type(p_object_type => p_object_type) = 1 - then - null; -- OK - else - raise program_error; - end if; - - if p_base_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param(transform_handle => l_transform_handle - ,name => 'REMAP_SCHEMA' - ,old_value => p_base_object_schema - ,new_value => p_new_object_schema); - end if; - end if; - elsif p_object_type = 'SYNONYM' - then - if p_object_schema != 'PUBLIC' and p_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param(transform_handle => l_transform_handle - ,name => 'REMAP_SCHEMA' - ,old_value => p_object_schema - ,new_value => p_new_object_schema); - elsif p_object_schema = 'PUBLIC' and p_base_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param(transform_handle => l_transform_handle - ,name => 'REMAP_SCHEMA' - ,old_value => p_base_object_schema - ,new_value => p_new_object_schema); - end if; - else - if p_object_schema != 'DBA' - then - if p_object_schema != p_new_object_schema - then - dbms_metadata.set_remap_param(transform_handle => l_transform_handle - ,name => 'REMAP_SCHEMA' - ,old_value => p_object_schema - ,new_value => p_new_object_schema); - end if; - end if; - end if; - exception - when e_invalid_transform_parameter or e_wrong_transform_object_type - then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.on_error; -$end - null; - end; - end if; -- if p_object_type = 'SCHEMA_EXPORT' - end if; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.leave; - exception - when others - then - dbug.leave_on_error; - raise; -$end - end md_set_remap_param; - procedure get_transform_param_tab ( p_transform_param_list in varchar2 , p_transform_param_tab out nocopy t_transform_param_tab @@ -1609,7 +1413,7 @@ $end if p_transform_param_list is not null then - pkg_str_util.split(p_str => p_transform_param_list, p_delimiter => ',', p_str_tab => l_line_tab); + oracle_tools.pkg_str_util.split(p_str => p_transform_param_list, p_delimiter => ',', p_str_tab => l_line_tab); if l_line_tab.count > 0 then for i_idx in l_line_tab.first .. l_line_tab.last @@ -1622,7 +1426,7 @@ $end procedure md_set_transform_param ( p_transform_handle in number default dbms_metadata.session_transform - , p_object_type_tab in t_text_tab default t_text_tab('INDEX', 'TABLE', 'CLUSTER', 'CONSTRAINT', 'TABLE', 'VIEW', 'TYPE_SPEC') + , p_object_type_tab in oracle_tools.t_text_tab default oracle_tools.t_text_tab('INDEX', 'TABLE', 'CLUSTER', 'CONSTRAINT', 'TABLE', 'VIEW', 'TYPE_SPEC') , p_use_object_type_param in boolean default false , p_transform_param_tab in t_transform_param_tab default g_transform_param_tab ) @@ -1663,23 +1467,35 @@ $end procedure md_set_filter ( p_object_type in varchar2 , p_object_schema in varchar2 - , p_object_name_tab in t_text_tab + , p_object_name_tab in oracle_tools.t_text_tab , p_base_object_schema in varchar2 - , p_base_object_name_tab in t_text_tab + , p_base_object_name_tab in oracle_tools.t_text_tab , p_handle in number ) is - function in_list_expr(p_object_name_tab in t_text_tab) + function in_list_expr(p_object_name_tab in oracle_tools.t_text_tab) return varchar2 is l_in_list varchar2(32767 char) := 'IN ('; + l_object_name user_objects.object_name%type := null; begin if p_object_name_tab is not null and p_object_name_tab.count > 0 then for i_idx in p_object_name_tab.first .. p_object_name_tab.last loop -- trim tab, linefeed, carriage return and space from the input - l_in_list := l_in_list || '''' || dbms_assert.simple_sql_name(trim(chr(9) from trim(chr(10) from trim(chr(13) from trim(' ' from p_object_name_tab(i_idx)))))) || ''','; + l_object_name := trim(chr(9) from trim(chr(10) from trim(chr(13) from trim(' ' from p_object_name_tab(i_idx))))); + -- GJP 2021-08-27 Do not check for valid SQL names. + /* + begin + l_object_name := dbms_assert.simple_sql_name(l_object_name); + exception + when e_invalid_sql_name + then l_object_name := dbms_assert.enquote_name(l_object_name); -- "ST00001oyY/EaERZngUwEAAH+t7Q=" + end; + l_in_list := l_in_list || '''' || dbms_assert.simple_sql_name(l_object_name) || ''','; + */ + l_in_list := l_in_list || '''' || l_object_name || ''','; end loop; l_in_list := rtrim(l_in_list, ','); end if; @@ -1688,21 +1504,48 @@ $end return l_in_list; end in_list_expr; + procedure set_filter(handle in number, name in varchar2, value in varchar2) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print(dbug."info", 'dbms_metadata.set_filter(%s, %s, %s)', handle, name, value); +$end + dbms_metadata.set_filter(handle, name, value); + end set_filter; + + procedure set_filter(handle in number, name in varchar2, value in boolean default true) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print(dbug."info", 'dbms_metadata.set_filter(%s, %s, %s)', handle, name, dbug.cast_to_varchar2(value)); +$end + dbms_metadata.set_filter(handle, name, value); + end set_filter; + + procedure set_filter(handle in number, name in varchar2, value in number) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print(dbug."info", 'dbms_metadata.set_filter(%s, %s, %s)', handle, name, value); +$end + dbms_metadata.set_filter(handle, name, value); + end set_filter; + procedure set_exclude_name_expr(p_object_type in t_metadata_object_type, p_name in varchar2) is - l_exclude_name_expr_tab t_text_tab; + l_exclude_name_expr_tab oracle_tools.t_text_tab; begin get_exclude_name_expr_tab(p_object_type => p_object_type, p_exclude_name_expr_tab => l_exclude_name_expr_tab); if l_exclude_name_expr_tab.count > 0 then for i_idx in l_exclude_name_expr_tab.first .. l_exclude_name_expr_tab.last loop - dbms_metadata.set_filter(handle => p_handle, name => p_name, value => q'[LIKE ']' || l_exclude_name_expr_tab(i_idx) || q'[' ESCAPE '\']'); + set_filter(handle => p_handle, name => p_name, value => q'[LIKE ']' || l_exclude_name_expr_tab(i_idx) || q'[' ESCAPE '\']'); end loop; end if; end set_exclude_name_expr; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'MD_SET_FILTER'); dbug.print(dbug."input" ,'p_object_type: %s; p_object_schema: %s; p_base_object_schema: %s' @@ -1714,9 +1557,9 @@ $end if p_object_type = 'SCHEMA_EXPORT' then -- Use filters to specify the schema. See SCHEMA_EXPORT_OBJECTS for a complete overview. - dbms_metadata.set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); - -- dbms_metadata.set_filter(handle => p_handle, name => 'INCLUDE_USER', value => true); - dbms_metadata.set_filter + set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); + -- set_filter(handle => p_handle, name => 'INCLUDE_USER', value => true); + set_filter ( handle => p_handle , name => 'EXCLUDE_PATH_EXPR' , value => 'in (' || @@ -1739,7 +1582,7 @@ $end '''ALTER_PACKAGE_SPEC'' ,' || '''ALTER_PROCEDURE'' ,' || '''DEFAULT_ROLE'' ,' || -$if not(pkg_ddl_util.c_get_db_link_ddl) $then +$if not(oracle_tools.pkg_ddl_util.c_get_db_link_ddl) $then '''DB_LINK'' ,' || $end '''ON_USER_GRANT'' ,' || @@ -1772,29 +1615,28 @@ $end raise program_error; end if; - dbms_metadata.set_filter(handle => p_handle, name => 'SYSTEM_GENERATED', value => false); - dbms_metadata.set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); + set_filter(handle => p_handle, name => 'SYSTEM_GENERATED', value => false); + set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); if p_object_name_tab is not null and p_object_name_tab.count between 1 and c_max_object_name_tab_count then - dbms_metadata.set_filter(handle => p_handle - ,name => 'NAME_EXPR' - ,value => in_list_expr(p_object_name_tab)); + set_filter(handle => p_handle + ,name => 'NAME_EXPR' + ,value => in_list_expr(p_object_name_tab)); end if; if p_base_object_name_tab is not null and p_base_object_name_tab.count between 1 and c_max_object_name_tab_count then - dbms_metadata.set_filter(handle => p_handle - ,name => 'BASE_OBJECT_NAME_EXPR' - ,value => in_list_expr(p_base_object_name_tab)); + set_filter(handle => p_handle + ,name => 'BASE_OBJECT_NAME_EXPR' + ,value => in_list_expr(p_base_object_name_tab)); end if; - -- always exclude table "schema_version" and its indexes, constraints - dbms_metadata.set_filter(handle => p_handle - ,name => 'EXCLUDE_BASE_OBJECT_NAME_EXPR' - ,value => in_list_expr(t_text_tab('schema_version'))); + set_filter(handle => p_handle + ,name => 'EXCLUDE_BASE_OBJECT_NAME_EXPR' + ,value => in_list_expr(c_object_to_ignore_tab)); else if is_dependent_object_type(p_object_type => p_object_type) = 1 then @@ -1803,20 +1645,20 @@ $end raise program_error; end if; - dbms_metadata.set_filter(handle => p_handle, name => 'BASE_OBJECT_SCHEMA', value => p_base_object_schema); + set_filter(handle => p_handle, name => 'BASE_OBJECT_SCHEMA', value => p_base_object_schema); if p_base_object_name_tab is not null and p_base_object_name_tab.count between 1 and c_max_object_name_tab_count then - dbms_metadata.set_filter(handle => p_handle - ,name => 'BASE_OBJECT_NAME_EXPR' - ,value => in_list_expr(p_base_object_name_tab)); + set_filter(handle => p_handle + ,name => 'BASE_OBJECT_NAME_EXPR' + ,value => in_list_expr(p_base_object_name_tab)); end if; - -- always exclude table "schema_version" and its indexes, constraints - dbms_metadata.set_filter(handle => p_handle - ,name => 'EXCLUDE_BASE_OBJECT_NAME_EXPR' - ,value => in_list_expr(t_text_tab('schema_version'))); + set_filter(handle => p_handle + ,name => 'EXCLUDE_BASE_OBJECT_NAME_EXPR' + ,value => in_list_expr(c_object_to_ignore_tab)); + if p_object_type = 'OBJECT_GRANT' then set_exclude_name_expr(p_object_type => 'TYPE_SPEC', p_name => 'EXCLUDE_BASE_OBJECT_NAME_EXPR'); @@ -1824,7 +1666,7 @@ $end end if; elsif p_object_type = 'SYNONYM' then - dbms_metadata.set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); + set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); -- Voor synoniemen moet gelden: -- 1a) lange naam van synonym moet gelijk zijn aan korte naam EN @@ -1832,28 +1674,28 @@ $end if p_object_schema != 'PUBLIC' then -- simple custom filter: always allowed - dbms_metadata.set_filter(handle => p_handle - ,name => 'CUSTOM_FILTER' - ,value => '/* 1a */ KU$.SYN_LONG_NAME = KU$.SCHEMA_OBJ.NAME'); + set_filter(handle => p_handle + ,name => 'CUSTOM_FILTER' + ,value => '/* 1a */ KU$.SYN_LONG_NAME = KU$.SCHEMA_OBJ.NAME'); else -- simple custom filter: always allowed - dbms_metadata.set_filter(handle => p_handle - ,name => 'CUSTOM_FILTER' - ,value => q'[/* 1a */ KU$.SYN_LONG_NAME = KU$.SCHEMA_OBJ.NAME AND /* 1b */ KU$.OWNER_NAME = ']' || - dbms_assert.schema_name(p_base_object_schema) || q'[']'); + set_filter(handle => p_handle + ,name => 'CUSTOM_FILTER' + ,value => q'[/* 1a */ KU$.SYN_LONG_NAME = KU$.SCHEMA_OBJ.NAME AND /* 1b */ KU$.OWNER_NAME = ']' || + dbms_assert.schema_name(p_base_object_schema) || q'[']'); end if; if p_object_name_tab is not null and p_object_name_tab.count between 1 and c_max_object_name_tab_count then - dbms_metadata.set_filter(handle => p_handle - ,name => 'NAME_EXPR' - ,value => in_list_expr(p_object_name_tab)); + set_filter(handle => p_handle + ,name => 'NAME_EXPR' + ,value => in_list_expr(p_object_name_tab)); end if; else if p_object_schema != 'DBA' then - dbms_metadata.set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); + set_filter(handle => p_handle, name => 'SCHEMA', value => p_object_schema); end if; if p_object_type not in ('DEFAULT_ROLE', 'FGA_POLICY', 'ROLE_GRANT') @@ -1861,20 +1703,19 @@ $end if p_object_name_tab is not null and p_object_name_tab.count between 1 and c_max_object_name_tab_count then - dbms_metadata.set_filter(handle => p_handle - ,name => 'NAME_EXPR' - ,value => in_list_expr(p_object_name_tab)); + set_filter(handle => p_handle + ,name => 'NAME_EXPR' + ,value => in_list_expr(p_object_name_tab)); end if; - -- always exclude table "schema_version" - dbms_metadata.set_filter(handle => p_handle - ,name => 'EXCLUDE_NAME_EXPR' - ,value => in_list_expr(t_text_tab('schema_version'))); + set_filter(handle => p_handle + ,name => 'EXCLUDE_NAME_EXPR' + ,value => in_list_expr(c_object_to_ignore_tab)); end if; if p_object_type = 'TABLE' then - dbms_metadata.set_filter(handle => p_handle, name => 'SECONDARY', value => false); + set_filter(handle => p_handle, name => 'SECONDARY', value => false); end if; end if; @@ -1884,7 +1725,7 @@ $end end if; end if; -- if p_object_type = 'SCHEMA_EXPORT' -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -1897,23 +1738,21 @@ $end procedure md_open ( p_object_type in t_metadata_object_type , p_object_schema in varchar2 - , p_object_name_tab in t_text_tab - , p_new_object_schema in varchar2 + , p_object_name_tab in oracle_tools.t_text_tab , p_base_object_schema in varchar2 - , p_base_object_name_tab in t_text_tab + , p_base_object_name_tab in oracle_tools.t_text_tab , p_transform_param_tab in t_transform_param_tab , p_handle out number ) is l_found pls_integer := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'MD_OPEN'); dbug.print(dbug."input" - ,'p_object_type: %s; p_object_schema: %s; p_new_object_schema: %s; p_base_object_schema: %s' + ,'p_object_type: %s; p_object_schema: %s; p_base_object_schema: %s' ,p_object_type ,p_object_schema - ,p_new_object_schema ,p_base_object_schema); $end @@ -1939,7 +1778,7 @@ $end null; -- OK else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'p_object_schema (' ||p_object_schema ||') should be empty, ' @@ -1959,7 +1798,7 @@ $end null; -- OK else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Base object schema (' ||p_base_object_schema ||') should not be empty.' @@ -1970,7 +1809,7 @@ $end null; -- ok else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Object schema (' ||p_object_schema ||') should not be empty, ' @@ -1987,7 +1826,7 @@ $end null; -- OK else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Object schema (' ||p_object_schema ||') should not be empty, ' @@ -2017,7 +1856,7 @@ $end when no_data_found then raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_missing_session_role , 'User "' || user || '" must have session role SELECT_CATALOG_ROLE to view objects of type "' || p_object_type || '" for "' || @@ -2039,7 +1878,7 @@ $end when no_data_found then raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_missing_session_privilege , 'User "' || user || '" must have session privilege CREATE ANY PROCEDURE to view package or type bodies for "' || @@ -2059,13 +1898,6 @@ $end -- ORA-06502: PL/SQL: numeric or value error -- LPX-00210: expected '<' instead of '\' - md_set_remap_param - ( p_object_type => p_object_type - , p_object_schema => p_object_schema - , p_new_object_schema => p_new_object_schema - , p_base_object_schema => p_base_object_schema - , p_handle => p_handle - ); if p_object_type = 'SCHEMA_EXPORT' then md_set_transform_param @@ -2076,7 +1908,7 @@ $end else md_set_transform_param ( p_transform_handle => dbms_metadata.add_transform(handle => p_handle, name => 'DDL') - , p_object_type_tab => t_text_tab(p_object_type) + , p_object_type_tab => oracle_tools.t_text_tab(p_object_type) , p_transform_param_tab => p_transform_param_tab ); end if; @@ -2100,12 +1932,16 @@ $end dbms_metadata.set_count(handle => p_handle, value => c_dbms_metadata_set_count); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others then dbug.leave_on_error; - raise_application_error(-20000, p_object_type||';'||p_object_schema||';'||p_new_object_schema||';'||p_base_object_schema, true); + raise_application_error + ( oracle_tools.pkg_ddl_error.c_reraise_with_backtrace + , p_object_type||';'||p_object_schema||';'||p_base_object_schema + , true + ); $end end md_open; @@ -2121,7 +1957,7 @@ $end l_pos2 pls_integer; l_ddl_tab_last pls_integer; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'MD_FETCH_DDL'); $end @@ -2132,13 +1968,13 @@ $end then -- GRANT DELETE, INSERT, SELECT, UPDATE, REFERENCES, ON COMMIT REFRESH, QUERY REWRITE, DEBUG, FLASHBACK ... l_ddl_tab_last := p_ddl_tab.last; -- the collection may expand so just store the last entry -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'p_ddl_tab.first: %s; l_ddl_tab_last: %s', p_ddl_tab.first, l_ddl_tab_last); $end for i_ku$ddls_idx in p_ddl_tab.first .. l_ddl_tab_last loop - l_statement := dbms_lob.substr(lob_loc => p_ddl_tab(i_ku$ddls_idx).ddlText, offset => 1, amount => 4000); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then + l_statement := oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => p_ddl_tab(i_ku$ddls_idx).ddlText, p_offset => 1, p_amount => 4000); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'i_ku$ddls_idx: %s; ltrim(l_statement): %s', i_ku$ddls_idx, ltrim(l_statement)); $end if ltrim(l_statement) like 'GRANT %, % ON "%' @@ -2147,11 +1983,11 @@ $end l_pos2 := instr(l_statement, ' ON "'); l_privileges := substr(l_statement, l_pos1, l_pos2 - l_pos1); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'l_privileges: %s', l_privileges); $end - pkg_str_util.split + oracle_tools.pkg_str_util.split ( p_str => l_privileges , p_delimiter => ', ' , p_str_tab => l_line_tab @@ -2164,14 +2000,14 @@ $end for i_idx in l_line_tab.first .. l_line_tab.last loop -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'replace(l_statement, l_privileges, l_line_tab(%s)): %s', i_idx, replace(l_statement, l_privileges, l_line_tab(i_idx))); $end if i_idx = l_line_tab.first then -- replace i_ku$ddls_idx dbms_lob.createtemporary(p_ddl_tab(i_ku$ddls_idx).ddlText, true); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => replace(l_statement, l_privileges, l_line_tab(i_idx)) , pio_clob => p_ddl_tab(i_ku$ddls_idx).ddlText ); @@ -2182,7 +2018,7 @@ $end p_ddl_tab(p_ddl_tab.last) := p_ddl_tab(i_ku$ddls_idx); -- create a new clob dbms_lob.createtemporary(p_ddl_tab(p_ddl_tab.last).ddlText, true); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => replace(l_statement, l_privileges, l_line_tab(i_idx)) , pio_clob => p_ddl_tab(p_ddl_tab.last).ddlText ); @@ -2196,13 +2032,13 @@ $end exception when e_job_is_not_attached then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.on_error; $end p_ddl_tab := null; end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'p_ddl_tab.count: %s', case when p_ddl_tab is not null then p_ddl_tab.count end); dbug.leave; exception @@ -2215,11 +2051,13 @@ $end procedure parse_object ( p_schema in varchar2 - , p_new_schema in varchar2 + , p_object_type in t_metadata_object_type + , p_object_names in t_object_names + , p_object_names_include in t_numeric_boolean , p_constraint_lookup_tab in t_constraint_lookup_tab , p_object_lookup_tab in out nocopy t_object_lookup_tab , p_ku$_ddl in out nocopy sys.ku$_ddl - , p_object_key out nocopy varchar2 + , p_object_key out nocopy varchar2 -- error if null ) is l_verb varchar2(4000 char) := null; @@ -2233,6 +2071,8 @@ $end l_grantee varchar2(4000 char) := null; l_privilege varchar2(4000 char) := null; l_grantable varchar2(4000 char) := null; + l_ddl_text varchar2(32767 char) := null; + l_exclude_name_expr_tab oracle_tools.t_text_tab; procedure cleanup is @@ -2244,13 +2084,15 @@ $end end if; end cleanup; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'PARSE_OBJECT'); dbug.print ( dbug."input" - , 'p_schema: %s; p_new_schema: %s' + , 'p_schema: %s; p_object_type: %s; p_object_names: %s; p_object_names_include: %s' , p_schema - , p_new_schema + , p_object_type + , p_object_names + , p_object_names_include ); $end @@ -2272,26 +2114,16 @@ $end , l_grantable ); - -- GPA 2017-02-05 parse_ddl() did not change base_object_schema for OBJECT_GRANT - if p_new_schema != p_schema - then - if l_object_schema = p_schema - then - l_object_schema := p_new_schema; - end if; - if l_base_object_schema = p_schema - then - l_base_object_schema := p_new_schema; - end if; - end if; - + l_object_type := oracle_tools.t_schema_object.dict2metadata_object_type(l_object_type); + l_base_object_type := oracle_tools.t_schema_object.dict2metadata_object_type(l_base_object_type); + p_object_key := - t_schema_object.id + oracle_tools.t_schema_object.id ( p_object_schema => l_object_schema - , p_object_type => t_schema_object.dict2metadata_object_type(l_object_type) + , p_object_type => l_object_type , p_object_name => l_object_name , p_base_object_schema => l_base_object_schema - , p_base_object_type => t_schema_object.dict2metadata_object_type(l_base_object_type) + , p_base_object_type => l_base_object_type , p_base_object_name => l_base_object_name , p_column_name => l_column_name , p_grantee => l_grantee @@ -2304,24 +2136,15 @@ $end then p_object_lookup_tab(p_object_key).schema_ddl.add_ddl ( p_verb => l_verb - , p_text => case - when p_new_schema != p_schema - then modify_ddl_text - ( p_ddl_text => p_ku$_ddl.ddlText - , p_schema => p_schema - , p_new_schema => p_new_schema - , p_object_type => p_object_lookup_tab(p_object_key).schema_ddl.obj.object_type() - ) - else p_ku$_ddl.ddlText - end + , p_text => p_ku$_ddl.ddlText ); begin - p_object_lookup_tab(p_object_key).schema_ddl.chk(nvl(p_new_schema, p_schema)); + p_object_lookup_tab(p_object_key).schema_ddl.chk(p_schema); exception when others then - raise_application_error(-20000, 'Object ' || p_object_lookup_tab(p_object_key).schema_ddl.obj.id() || ' is not correct.', true); + raise_application_error(oracle_tools.pkg_ddl_error.c_object_not_correct, 'Object ' || p_object_lookup_tab(p_object_key).schema_ddl.obj.id() || ' is not correct.', true); end; -- the normal stuff @@ -2330,48 +2153,84 @@ $end exception when no_data_found then - p_object_key := null; case - when l_object_name like 'schema_version%' + when schema_object_matches_filter + ( -- filter values + p_object_type => p_object_type + , p_object_names => p_object_names + , p_object_names_include => p_object_names_include + , p_object_types_to_check => null + -- database values + , p_metadata_object_type => l_object_type + , p_object_name => l_object_name + , p_metadata_base_object_type => l_base_object_type + , p_base_object_name => l_base_object_name + ) = 0 -- object not but on purpose then - -- skip Flyway stuff - null; - - when t_schema_object.dict2metadata_object_type(l_object_type) = 'PROCACT_SCHEMA' +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print + ( dbug."info" + , 'l_object_type: %s; l_object_name: %s; l_base_object_type: %s; l_base_object_name' + , l_object_type + , l_object_name + , l_base_object_type + , l_base_object_name + ); +$end + p_object_key := null; + + when l_object_type = 'PROCACT_SCHEMA' or + l_object_type = 'PROCACT_SYSTEM' or + l_verb in ('DBMS_JAVA.START_IMPORT', 'DBMS_JAVA.IMPORT_TEXT_CHUNK', 'DBMS_JAVA.IMPORT_RAW_CHUNK', 'DBMS_JAVA.END_IMPORT') then - null; + p_object_key := null; -- GPA 2017-02-05 Ignore the old job package DBMS_JOB - when t_schema_object.dict2metadata_object_type(l_object_type) = 'PROCOBJ' and l_verb = 'DBMS_JOB.SUBMIT' + when l_object_type = 'PROCOBJ' and l_verb = 'DBMS_JOB.SUBMIT' then - null; + p_object_key := null; else - null; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print - ( dbug."warning" - , 'object not found in allowed objects: %s; ddl: %s' - , p_object_key - , dbms_lob.substr(p_ku$_ddl.ddlText, 100) - ); - raise program_error; -$end + -- GJP 2021-08-27 Ignore this only when the DDL is whitespace only. + if p_ku$_ddl.ddlText is not null + then + l_ddl_text := trim(replace(replace(oracle_tools.pkg_str_util.dbms_lob_substr(p_ku$_ddl.ddlText, 32767), chr(10), ' '), chr(13), ' ')); + if l_ddl_text is not null + then + raise_application_error + ( oracle_tools.pkg_ddl_error.c_object_not_found + , utl_lms.format_message + ( 'object "%s" not found in allowed objects; ddl: "%s"' + , p_object_key + , substr(l_ddl_text, 1, 2000) + ) + ); + end if; + end if; end case; end; cleanup; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'p_object_key: %s', p_object_key); dbug.leave; $end exception + -- GJP 2021-08-30 Ignore this always. + when oracle_tools.pkg_ddl_error.e_object_not_found + then + p_object_key := null; + cleanup; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave_on_error; +$end + when others then p_object_key := null; cleanup; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave_on_error; $end raise; @@ -2394,12 +2253,12 @@ $end ( p_object_schema in varchar2 , p_object_type in varchar2 , p_filter in varchar2 - , p_schema_ddl_tab in out nocopy t_schema_ddl_tab + , p_schema_ddl_tab in out nocopy oracle_tools.t_schema_ddl_tab ) is l_idx pls_integer := p_schema_ddl_tab.last; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package || '.REMOVE_DDL'); dbug.print(dbug."input", 'p_object_schema: %s; p_object_type: %s; p_filter: %s; p_schema_ddl_tab.count: %s', p_object_schema, p_object_type, p_filter, p_schema_ddl_tab.count); $end @@ -2407,7 +2266,7 @@ $end loop exit when l_idx is null; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , '[%s] object_schema: %s; object_type: %s; text: %s' @@ -2435,13 +2294,13 @@ $end end if; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'p_schema_ddl_tab.count: %s', p_schema_ddl_tab.count); dbug.leave; $end end remove_ddl; - procedure remove_public_synonyms(p_schema_ddl_tab in out nocopy t_schema_ddl_tab) is + procedure remove_public_synonyms(p_schema_ddl_tab in out nocopy oracle_tools.t_schema_ddl_tab) is begin remove_ddl(p_object_schema => 'PUBLIC' ,p_object_type => 'SYNONYM' @@ -2449,7 +2308,7 @@ $end ,p_schema_ddl_tab => p_schema_ddl_tab); end remove_public_synonyms; - procedure remove_object_grants(p_schema_ddl_tab in out nocopy t_schema_ddl_tab) + procedure remove_object_grants(p_schema_ddl_tab in out nocopy oracle_tools.t_schema_ddl_tab) is begin remove_ddl(p_object_schema => null @@ -2511,7 +2370,7 @@ $end end if; end add; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'COMPARE_DDL'); dbug.print ( dbug."output" @@ -2629,7 +2488,7 @@ $end end loop; end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."output" , 'p_compare_line_tab.count: %s' @@ -2642,7 +2501,7 @@ $end procedure add2text ( p_str in varchar2 - , p_text_tab in out nocopy t_text_tab + , p_text_tab in out nocopy oracle_tools.t_text_tab ) is begin @@ -2656,9 +2515,9 @@ $end function lines2text ( p_line_tab in dbms_sql.varchar2a ) - return t_text_tab + return oracle_tools.t_text_tab is - l_text_tab t_text_tab := t_text_tab(); + l_text_tab oracle_tools.t_text_tab := oracle_tools.t_text_tab(); begin for i_idx in p_line_tab.first .. p_line_tab.last loop @@ -2667,92 +2526,295 @@ $end return l_text_tab; end lines2text; - /* PUBLIC ROUTINES */ - function get_sorted_dependency_list - ( p_object_tab in t_text_tab - , p_dependency_refcursor in sys_refcursor -- query with two columns: object1 depends on object2, i.e. select owner, referenced_owner from all_dependencies ... + function get_object_no_dependencies_tab + return t_object_natural_tab + is + l_object_no_dependencies_tab t_object_natural_tab; -- initialisation + begin + return l_object_no_dependencies_tab; + end get_object_no_dependencies_tab; + + function modify_ddl_text + ( p_ddl_text in varchar2 + , p_schema in t_schema_nn + , p_new_schema in t_schema ) - return t_text_tab pipelined + return varchar2 is - l_object_tab t_object_natural_tab; - l_object1 t_object; - l_object2 t_object; - l_graph t_graph; - l_result dbms_sql.varchar2_table; + l_ddl_text varchar2(32767 char) := p_ddl_text; + l_schema varchar2(32767 char); + l_new_schema varchar2(32767 char); + l_match_mode varchar2(2); + "([^_a-zA-Z0-9$#])" constant varchar2(100) := '([^_a-zA-Z0-9$#])'; begin - for i_idx in p_object_tab.first .. p_object_tab.last - loop - l_object_tab(p_object_tab(i_idx)) := 1; - end loop; + if p_schema <> p_new_schema and l_ddl_text is not null + then + /* + ON ""."
" must be replaced by ON "EMPTY"."
" - loop - fetch p_dependency_refcursor into l_object1, l_object2; + CREATE OR REPLACE EDITIONABLE TRIGGER "EMPTY"."" + BEFORE INSERT OR DELETE OR UPDATE ON ""."
" + REFERENCING FOR EACH ROW + */ + + -- replace p_schema - exit when p_dependency_refcursor%notfound; + -- A) CASE SENSITIVE, between " and " + l_ddl_text := + replace(l_ddl_text, '"' || p_schema || '"', '"' || p_new_schema || '"'); + + -- B) (NOT CASE SENSITIVE) + -- 1) at the start of a line or after a non Oracle identifier character (extra $ and #) + -- 2) before a non Oracle identifier character or the end of a line + for i_case_idx in 1..2 + loop + l_schema := case i_case_idx when 1 then lower(p_schema) else p_schema end; + l_new_schema := case i_case_idx when 1 then lower(p_new_schema) else p_new_schema end; + l_match_mode := case i_case_idx when 1 then 'c' else 'i' end || -- case sensitive for 1, case insensitive for 2 + 'm'; -- multi line mode + + for i_repl_idx in 1 .. 4 + loop + l_ddl_text := + case i_repl_idx + when 1 then regexp_replace(l_ddl_text, '^' || l_schema || '$' , l_new_schema , 1, 0, l_match_mode) + when 2 then regexp_replace(l_ddl_text, "([^_a-zA-Z0-9$#])" || l_schema || '$' , '\1' || l_new_schema , 1, 0, l_match_mode) + when 3 then regexp_replace(l_ddl_text, '^' || l_schema || "([^_a-zA-Z0-9$#])" , l_new_schema || '\1' , 1, 0, l_match_mode) + when 4 then regexp_replace(l_ddl_text, "([^_a-zA-Z0-9$#])" || l_schema || "([^_a-zA-Z0-9$#])", '\1' || l_new_schema || '\2', 1, 0, l_match_mode) + end; + end loop; + end loop; - if l_object_tab.exists(l_object1) and l_object_tab.exists(l_object2) +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + if p_ddl_text != l_ddl_text then - l_graph(l_object2)(l_object1) := 1; + dbug.print(dbug."info", 'old ddl text: %s', substr(p_ddl_text, 1, 255)); + dbug.print(dbug."info", 'new ddl text: %s', substr(l_ddl_text, 1, 255)); end if; - end loop; - - close p_dependency_refcursor; +$end + end if; - while l_graph.first is not null - loop - begin - tsort(l_graph, l_result); + return l_ddl_text; + end modify_ddl_text; - exit; -- successful: stop - exception - when e_not_a_directed_acyclic_graph - then - l_graph.delete(l_graph.first); - end; - end loop; + procedure remap_schema + ( p_schema in t_schema_nn + , p_new_schema in t_schema_nn + , p_schema_object in out nocopy oracle_tools.t_schema_object + ) + is + l_ref_constraint_object oracle_tools.t_ref_constraint_object; + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'REMAP_SCHEMA (1)'); + p_schema_object.print; +$end - if l_result.count > 0 + if p_schema != p_new_schema -- implies both not null then - for i_idx in l_result.first .. l_result.last - loop - pipe row (l_result(i_idx)); - l_object_tab.delete(l_result(i_idx)); - end loop; + -- If we are going to move to another schema, adjust all schema attributes because the DDL generated + -- will also be changed due to dbms_metadata.set_remap_param() being called. + if p_schema_object.object_schema() = p_schema + then + p_schema_object.object_schema(p_new_schema); + end if; + if p_schema_object.base_object_schema() = p_schema + then + p_schema_object.base_object_schema(p_new_schema); + end if; + if p_schema_object is of (oracle_tools.t_ref_constraint_object) + then + l_ref_constraint_object := treat(p_schema_object as oracle_tools.t_ref_constraint_object); + if l_ref_constraint_object.ref_object_schema() = p_schema + then + l_ref_constraint_object.ref_object_schema(p_new_schema); + p_schema_object := l_ref_constraint_object; + end if; + end if; end if; - while l_object_tab.first is not null - loop - pipe row (l_object_tab.first); - l_object_tab.delete(l_object_tab.first); - end loop; - - return; - end get_sorted_dependency_list; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + p_schema_object.print; + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; +$end + end remap_schema; - function get_sorted_dependency_list - ( p_object_refcursor in sys_refcursor - , p_dependency_refcursor in sys_refcursor -- query with two columns: object1 depends on object2, i.e. select owner, referenced_owner from all_dependencies ... + procedure remap_schema + ( p_schema in t_schema_nn + , p_new_schema in t_schema_nn + , p_ddl in out nocopy oracle_tools.t_ddl ) - return t_text_tab pipelined is - l_object_tab t_text_tab; - begin - fetch p_object_refcursor bulk collect into l_object_tab; - close p_object_refcursor; - - for r in - ( select t.column_value - from table(oracle_tools.pkg_ddl_util.get_sorted_dependency_list(l_object_tab, p_dependency_refcursor)) t - ) - loop - pipe row (r.column_value); - end loop; + l_str_tab dbms_sql.varchar2a; - return; - end get_sorted_dependency_list; + procedure append_clob + ( p_clob in out nocopy clob + , p_buffer in varchar2 + , p_append in varchar2 + ) is + begin + dbms_lob.writeappend(lob_loc => p_clob, amount => length(p_buffer || p_append), buffer => p_buffer || p_append); + end append_clob; + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'REMAP_SCHEMA (2)'); +$end - function display_ddl_schema - ( p_schema in t_schema_nn + if p_ddl.text is not null and p_ddl.text.count > 0 + then + if length(p_schema) = length(p_new_schema) + then + -- GJP 2021-09-02 + -- The replacement will not change the length: do not change p_ddl.text itself just its elements + for i_idx in p_ddl.text.first .. p_ddl.text.last + loop + p_ddl.text(i_idx) := modify_ddl_text(p_ddl_text => p_ddl.text(i_idx), p_schema => p_schema, p_new_schema => p_new_schema); + end loop; + else + -- GJP 2021-09-02 + -- The replacement will change the length and it may either become too big or too small + -- (remainder empty which will cause compare problems). + + -- GJP 2021-09-03 + -- It is not sufficient to replace the individual chunks from p_ddl.text since + -- those are not lines, but just chunks. This will give a problem if the old schema starts at index i and ends at index i+1. + -- In that case it will not be replaced. + -- + -- The solution: + -- A) concatenate all the chunks from the text array to a CLOB (initially trimmed) + -- B) split them into lines using the linefeed character + -- C) trim the CLOB + -- D) modify each line and append it to the CLOB (add a new line except for the last line) + -- E) convert the CLOB to the text array element + + -- See A + oracle_tools.pkg_str_util.text2clob + ( pi_text_tab => p_ddl.text + , pio_clob => g_clob + , pi_append => false -- trim g_clob first + ); + + -- See B + oracle_tools.pkg_str_util.split + ( p_str => g_clob + , p_delimiter => chr(10) + , p_str_tab => l_str_tab + ); + + -- See C + dbms_lob.trim(g_clob, 0); + + -- See D + if l_str_tab.count > 0 + then + for i_idx in l_str_tab.first .. l_str_tab.last + loop + append_clob + ( p_clob => g_clob + , p_buffer => modify_ddl_text(p_ddl_text => l_str_tab(i_idx), p_schema => p_schema, p_new_schema => p_new_schema) + , p_append => case when i_idx < l_str_tab.last then chr(10) end -- add a new line but NOT for the last line + ); + end loop; + end if; + + -- See E + p_ddl.text := + oracle_tools.pkg_str_util.clob2text + ( pi_clob => g_clob + , pi_trim => 0 + ); + end if; + end if; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; +$end + end remap_schema; + + procedure remap_schema + ( p_schema in t_schema_nn + , p_new_schema in t_schema_nn + , p_ddl_tab in out nocopy oracle_tools.t_ddl_tab + ) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'REMAP_SCHEMA (3)'); +$end + + if p_ddl_tab is not null and p_ddl_tab.count > 0 + then + for i_idx in p_ddl_tab.first .. p_ddl_tab.last + loop + remap_schema + ( p_schema => p_schema + , p_new_schema => p_new_schema + , p_ddl => p_ddl_tab(i_idx) + ); + end loop; + end if; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; +$end + end remap_schema; + + procedure remap_schema + ( p_schema in t_schema_nn + , p_new_schema in t_schema_nn + , p_schema_ddl in out nocopy oracle_tools.t_schema_ddl + ) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'REMAP_SCHEMA (4)'); +$end + + if p_schema = p_new_schema + then + raise program_error; + end if; + + remap_schema + ( p_schema => p_schema + , p_new_schema => p_new_schema + , p_schema_object => p_schema_ddl.obj + ); + remap_schema + ( p_schema => p_schema + , p_new_schema => p_new_schema + , p_ddl_tab => p_schema_ddl.ddl_tab + ); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; +$end + end remap_schema; + + /* PUBLIC ROUTINES */ + + function display_ddl_schema + ( p_schema in t_schema_nn , p_new_schema in t_schema , p_sort_objects_by_deps in t_numeric_boolean_nn , p_object_type in t_metadata_object_type @@ -2762,22 +2824,26 @@ $end , p_grantor_is_schema in t_numeric_boolean_nn , p_transform_param_list in varchar2 ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined is + l_object_names constant t_object_names := + ',' || + replace(replace(replace(replace(p_object_names, chr(9)), chr(13)), chr(10)), chr(32)) || + ','; + l_network_link all_db_links.db_link%type := null; l_cursor sys_refcursor; - l_schema_ddl_tab t_schema_ddl_tab; - l_schema_object_tab t_schema_object_tab; - l_sort_objects_by_deps_tab t_sort_objects_by_deps_tab; + l_schema_object_tab oracle_tools.t_schema_object_tab; l_transform_param_tab t_transform_param_tab; l_line_tab dbms_sql.varchar2a; - l_program constant varchar2(30 char) := 'DISPLAY_DDL_SCHEMA'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt + l_schema_ddl_tab oracle_tools.t_schema_ddl_tab; + l_program constant t_module := 'DISPLAY_DDL_SCHEMA'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt -- dbms_application_info stuff l_longops_rec t_longops_rec := longops_init(p_target_desc => l_program, p_op_name => 'fetch', p_units => 'objects'); begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || 'DISPLAY_DDL_SCHEMA'); dbug.print(dbug."input" ,'p_schema: %s; p_new_schema: %s; p_sort_objects_by_deps: %s; p_object_type: %s; p_object_names: %s' @@ -2814,11 +2880,9 @@ $end if l_network_link is null then raise program_error; - else - l_network_link := '@' || l_network_link; end if; - pkg_ddl_util.set_display_ddl_schema_args + oracle_tools.pkg_ddl_util.set_display_ddl_schema_args ( p_schema => p_schema , p_new_schema => p_new_schema , p_sort_objects_by_deps => p_sort_objects_by_deps @@ -2830,14 +2894,14 @@ $end , p_transform_param_list => p_transform_param_list ); - open l_cursor for 'select t.schema_ddl from oracle_tools.v_display_ddl_schema' || l_network_link || ' t'; + open l_cursor for 'select t.schema_ddl from oracle_tools.v_display_ddl_schema@' || l_network_link || ' t'; else -- local /* GPA 27-10-2016 The queries below may invoke the objects clause twice. Now if it that means invoking get_schema_ddl() twice that may be costly. The solution is to retrieve all the object ddl info once and use it twice. */ - pkg_ddl_util.get_schema_object + oracle_tools.pkg_ddl_util.get_schema_object ( p_schema => p_schema , p_object_type => p_object_type , p_object_names => p_object_names @@ -2848,86 +2912,35 @@ $end if nvl(p_sort_objects_by_deps, 0) != 0 then - select value(s) - bulk collect - into l_schema_ddl_tab - from table - ( oracle_tools.pkg_ddl_util.get_schema_ddl - ( p_schema - , p_new_schema - , case when p_object_type is not null then 0 when p_object_names_include = 1 then 0 else 1 end - , l_schema_object_tab - , p_transform_param_list - ) - ) s - ; - - select value(d) - bulk collect - into l_sort_objects_by_deps_tab - from table - ( oracle_tools.pkg_ddl_util.sort_objects_by_deps - ( cursor( select distinct - object_schema - , object_type - , object_name - from ( select nvl(o.object_schema(), o.base_object_schema()) as object_schema - , nvl(o.object_type(), o.base_object_type()) as object_type - , nvl(o.object_name(), o.base_object_name()) as object_name - from table(l_schema_object_tab) o - ) - order by - oracle_tools.t_schema_object.object_type_order(object_type) nulls last - , object_name - , object_schema - ) - , p_schema - ) - ) d - ; - open l_cursor for select s.schema_ddl from ( select value(s) as schema_ddl - , s.obj.object_schema() as object_schema - , s.obj.object_type() as object_type - , s.obj.object_name() as object_name - , s.obj.base_object_schema() as base_object_schema - , s.obj.base_object_type() as base_object_type - , s.obj.base_object_name() as base_object_name - , s.obj.column_name() as column_name - , s.obj.grantee() as grantee - , s.obj.privilege() as privilege - , s.obj.grantable() as grantable - from table(l_schema_ddl_tab) s + from table + ( oracle_tools.pkg_ddl_util.get_schema_ddl + ( p_schema => p_schema + , p_object_type => p_object_type + , p_object_names => l_object_names + , p_object_names_include => p_object_names_include + , p_use_schema_export => case when p_object_type is not null then 0 when p_object_names_include = 1 then 0 else 1 end + , p_schema_object_tab => l_schema_object_tab + , p_transform_param_list => p_transform_param_list + ) + ) s ) s -- GPA 27-10-2016 We should not forget objects so use left outer join - left outer join - ( select d.object_schema - , d.object_type - , d.object_name - , d.nr - from table(l_sort_objects_by_deps_tab) d + inner join + ( select value(d) as obj + , rownum as nr + from table + ( oracle_tools.pkg_ddl_util.sort_objects_by_deps + ( l_schema_object_tab + , p_schema + ) + ) d ) d - -- GPA 21-12-2015 Als er een naar een nieuw schema wordt gesynchroniseerd dan moet wel volgens dependencies uit oude schema worden aangemaakt. - on d.object_schema = nvl - ( case when s.object_schema = p_new_schema then p_schema else s.object_schema end - , case when s.base_object_schema = p_new_schema then p_schema else s.base_object_schema end - ) and - d.object_type = nvl(s.object_type, s.base_object_type) and - d.object_name = nvl(s.object_name, s.base_object_name) + on d.obj = s.schema_ddl.obj order by - d.nr nulls last - , s.object_schema - , s.object_type - , s.object_name - , s.base_object_schema - , s.base_object_type - , s.base_object_name - , s.column_name - , s.grantee - , s.privilege - , s.grantable + d.nr ; else -- normal stuff: no network link, no dependency sorting @@ -2935,11 +2948,13 @@ $end select value(s) as schema_ddl from table ( oracle_tools.pkg_ddl_util.get_schema_ddl - ( p_schema - , p_new_schema - , case when p_object_type is not null then 0 when p_object_names_include = 1 then 0 else 1 end - , l_schema_object_tab - , p_transform_param_list + ( p_schema => p_schema + , p_object_type => p_object_type + , p_object_names => l_object_names + , p_object_names_include => p_object_names_include + , p_use_schema_export => case when p_object_type is not null then 0 when p_object_names_include = 1 then 0 else 1 end + , p_schema_object_tab => l_schema_object_tab + , p_transform_param_list => p_transform_param_list ) ) s order by @@ -2960,7 +2975,8 @@ $end <> loop - fetch l_cursor bulk collect into l_schema_ddl_tab limit c_fetch_limit; + fetch l_cursor bulk collect into l_schema_ddl_tab limit c_fetch_limit; + if l_schema_ddl_tab.count > 0 then for i_idx in l_schema_ddl_tab.first .. l_schema_ddl_tab.last @@ -2970,6 +2986,15 @@ $end l_schema_ddl_tab(i_idx).obj.network_link(p_network_link); end if; + if p_schema != p_new_schema + then + remap_schema + ( p_schema => p_schema + , p_new_schema => p_new_schema + , p_schema_ddl => l_schema_ddl_tab(i_idx) + ); + end if; + pipe row(l_schema_ddl_tab(i_idx)); longops_show(l_longops_rec); @@ -2981,38 +3006,40 @@ $end longops_done(l_longops_rec); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end return; exception - when no_data_needed then -$if cfg_pkg.c_debugging $then - dbug.leave_on_error; + when no_data_needed + then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; $end null; -- not a real error, just a way to some cleanup - when no_data_found -- verdwijnt anders in het niets omdat het een pipelined function betreft die al data ophaalt + when no_data_found -- disappears otherwise then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end - raise program_error; - -$if cfg_pkg.c_debugging $then - when others then + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + when others + then dbug.leave_on_error; raise; $end end display_ddl_schema; procedure create_schema_ddl - ( p_source_schema_ddl in t_schema_ddl - , p_target_schema_ddl in t_schema_ddl + ( p_source_schema_ddl in oracle_tools.t_schema_ddl + , p_target_schema_ddl in oracle_tools.t_schema_ddl , p_skip_repeatables in t_numeric_boolean - , p_schema_ddl out nocopy t_schema_ddl + , p_schema_ddl out nocopy oracle_tools.t_schema_ddl ) is "nothing" constant varchar2(100) := 'nothing'; @@ -3024,7 +3051,7 @@ $end l_action varchar2(100) := "nothing"; l_comment varchar2(4000 char) := 'there are no changes'; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'CREATE_SCHEMA_DDL'); dbug.print(dbug."input", 'p_source_schema_ddl.obj:'); if p_source_schema_ddl is not null then p_source_schema_ddl.obj.print(); end if; @@ -3039,7 +3066,7 @@ $end -- determine action and comment -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , '(p_target_schema_ddl is null): %s; (p_source_schema_ddl is null): %s; (p_target_schema_ddl = p_source_schema_ddl): %s' @@ -3115,18 +3142,18 @@ $end end if; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'l_action: %s; l_comment: %s', l_action, l_comment); $end -- create with an empty ddl list - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( case when p_source_schema_ddl is not null then p_source_schema_ddl.obj else p_target_schema_ddl.obj end - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , p_schema_ddl ); @@ -3162,13 +3189,13 @@ $end ); end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end exception when others then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave_on_error; $end raise; @@ -3185,23 +3212,22 @@ $end , p_skip_repeatables in t_numeric_boolean_nn , p_transform_param_list in varchar2 ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined is - l_schema_ddl t_schema_ddl; - l_source_schema_ddl_tab t_schema_ddl_tab; - l_target_schema_ddl_tab t_schema_ddl_tab; - l_sort_objects_by_deps_tab t_sort_objects_by_deps_tab; + l_schema_ddl oracle_tools.t_schema_ddl; + l_source_schema_ddl_tab oracle_tools.t_schema_ddl_tab; + l_target_schema_ddl_tab oracle_tools.t_schema_ddl_tab; l_object t_object; l_text_tab dbms_sql.varchar2a; - l_program constant varchar2(30 char) := 'DISPLAY_DDL_SCHEMA_DIFF'; + l_program constant t_module := 'DISPLAY_DDL_SCHEMA_DIFF'; -- dbms_application_info stuff l_longops_rec t_longops_rec := longops_init(p_op_name => 'fetch', p_units => 'objects', p_target_desc => l_program); procedure free_memory - ( p_schema_ddl_tab in out nocopy t_schema_ddl_tab + ( p_schema_ddl_tab in out nocopy oracle_tools.t_schema_ddl_tab ) is begin @@ -3209,22 +3235,22 @@ $end In spite of the remark below (#141477987 ) we have to free up memory if and only if: - parameter p_skip_repeatables != 0 AND - - the object are repeatable objects (excluding t_type_method_ddl because it uses ddl_tab(1)) + - the object are repeatable objects (excluding oracle_tools.t_type_method_ddl because it uses ddl_tab(1)) */ if p_skip_repeatables != 0 and cardinality(p_schema_ddl_tab) > 0 then for i_idx in p_schema_ddl_tab.first .. p_schema_ddl_tab.last loop if p_schema_ddl_tab(i_idx).obj.is_a_repeatable() != 0 and - not(p_schema_ddl_tab(i_idx) is of (t_type_method_ddl)) + not(p_schema_ddl_tab(i_idx) is of (oracle_tools.t_type_method_ddl)) then - p_schema_ddl_tab(i_idx).ddl_tab := t_ddl_tab(); + p_schema_ddl_tab(i_idx).ddl_tab := oracle_tools.t_ddl_tab(); end if; end loop; end if; end free_memory; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); dbug.print(dbug."input" ,'p_object_type: %s; p_object_names: %s; p_object_names_include: %s; p_schema_source: %s; p_schema_target: %s' @@ -3259,35 +3285,35 @@ $end if p_schema_source is null then - l_source_schema_ddl_tab := t_schema_ddl_tab(); + l_source_schema_ddl_tab := oracle_tools.t_schema_ddl_tab(); else select value(s) bulk collect into l_source_schema_ddl_tab from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( p_schema_source - , p_schema_target - , 1 -- sort for create - , p_object_type - , p_object_names - , p_object_names_include - , p_network_link_source - , 0 -- any grantor - , p_transform_param_list + ( p_schema => p_schema_source + , p_new_schema => p_schema_target + , p_sort_objects_by_deps => 1 -- sort for create + , p_object_type => p_object_type + , p_object_names => p_object_names + , p_object_names_include => p_object_names_include + , p_network_link => p_network_link_source + , p_grantor_is_schema => 0 -- any grantor + , p_transform_param_list => p_transform_param_list ) ) s ; free_memory(l_source_schema_ddl_tab); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'cardinality(l_source_schema_ddl_tab): %s', cardinality(l_source_schema_ddl_tab)); $end if p_schema_target is null then - l_target_schema_ddl_tab := t_schema_ddl_tab(); + l_target_schema_ddl_tab := oracle_tools.t_schema_ddl_tab(); else /* GPA 2017-03-10 #141477987 Do not try to optimise retrieving DDL when there is only an uninstall @@ -3298,10 +3324,10 @@ $end into l_target_schema_ddl_tab from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( p_schema_target - , null - , 1 -- sort for drop - , p_object_type + ( p_schema => p_schema_target + , p_new_schema => null + , p_sort_objects_by_deps => 1 -- sort for drop + , p_object_type => p_object_type /* -- GPA 2017-01-12 -- When the source objects are named, we also just compare @@ -3314,18 +3340,18 @@ $end -- So we get rid of obsolete target objects if the objects -- are not named explicitly (i.e. p_object_names_include != 1). */ - , case when p_object_names_include = 1 then p_object_names end - , case when p_object_names_include = 1 then p_object_names_include end - , p_network_link_target - , 1 -- only grantor equal to p_schema_target so we can revoke the grant if necessary - , p_transform_param_list + , p_object_names => case when p_object_names_include = 1 then p_object_names end + , p_object_names_include => case when p_object_names_include = 1 then p_object_names_include end + , p_network_link => p_network_link_target + , p_grantor_is_schema => 1 -- only grantor equal to p_schema_target so we can revoke the grant if necessary + , p_transform_param_list => p_transform_param_list ) ) t ; free_memory(l_target_schema_ddl_tab); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'cardinality(l_target_schema_ddl_tab): %s', cardinality(l_target_schema_ddl_tab)); $end @@ -3341,7 +3367,7 @@ $end ) -- GPA 2017-03-24 #142307767 The incremental DDL generator handles changed check constraints incorrectly. -- - -- Since the map function is used (which uses signature()) some objects may have the seem id but not + -- Since the map function is used (which uses signature()) some objects may have the same id but not -- the same signature. -- -- For example if a check constraint has the same name but a different check condition @@ -3386,6 +3412,22 @@ $end end asc nulls last -- create next ) loop +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.print + ( dbug."debug" + , 'sofar: %s; source signature: %s; target signature: %s; id different: %s' + , to_char(l_longops_rec.sofar + 1) + , case when r_schema_ddl.source_schema_ddl is not null then r_schema_ddl.source_schema_ddl.obj.signature() end + , case when r_schema_ddl.target_schema_ddl is not null then r_schema_ddl.target_schema_ddl.obj.signature() end + , dbug.cast_to_varchar2 + ( case + when r_schema_ddl.source_schema_ddl is not null and + r_schema_ddl.target_schema_ddl is not null + then r_schema_ddl.source_schema_ddl.obj.id() != r_schema_ddl.target_schema_ddl.obj.id() + end + ) + ); +$end create_schema_ddl ( p_source_schema_ddl => r_schema_ddl.source_schema_ddl , p_target_schema_ddl => r_schema_ddl.target_schema_ddl @@ -3400,7 +3442,7 @@ $end longops_done(l_longops_rec); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end @@ -3409,21 +3451,21 @@ $end exception when no_data_needed then -$if cfg_pkg.c_debugging $then - dbug.leave_on_error; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; $end null; -- not a real error, just a way to some cleanup when no_data_found -- verdwijnt anders in het niets omdat het een pipelined function betreft die al data ophaalt then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end - raise program_error; + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end raise; @@ -3435,14 +3477,14 @@ $end ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'EXECUTE_DDL (1)'); - dbug.print(dbug."input", 'p_id: %s; p_text: %s', p_id, p_text); + dbug.print(dbug."input", 'p_id: %s; p_text[:255]: %s', p_id, substr(p_text, 1, 255)); $end - t_schema_ddl.execute_ddl(p_id => p_id, p_text => p_text); + oracle_tools.t_schema_ddl.execute_ddl(p_id => p_id, p_text => p_text); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -3453,16 +3495,16 @@ $end end execute_ddl; procedure execute_ddl - ( p_ddl_text_tab in t_text_tab + ( p_ddl_text_tab in oracle_tools.t_text_tab , p_network_link in varchar2 default null ) is l_statement varchar2(32767) := null; l_network_link all_db_links.db_link%type := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'EXECUTE_DDL (2)'); - dbug.print(dbug."input", 'p_network_link: %s; p_ddl_text_tab(1): %s', p_network_link, p_ddl_text_tab(1)); + dbug.print(dbug."input", 'p_network_link: %s; p_ddl_text_tab(1)[:255]: %s', p_network_link, substr(p_ddl_text_tab(1), 1, 255)); $end if p_network_link is not null @@ -3474,30 +3516,19 @@ $end if l_network_link is null then raise program_error; - else - l_network_link := '@' || l_network_link; end if; + + l_network_link := '@' || l_network_link; end if; - l_statement := ' + l_statement := + utl_lms.format_message + ( q'[ declare l_ddl_text_tab constant oracle_tools.t_text_tab := :b1; - l_ddl_tab dbms_sql.varchar2a' || l_network_link || '; - l_cursor integer; - l_last_error_position integer := null; - - -- ORA-24344: success with compilation error due to missing privileges - e_s6_with_compilation_error exception; - pragma exception_init(e_s6_with_compilation_error, -24344); - -- ORA-04063: view "EMPTY.V_DISPLAY_DDL_SCHEMA" has errors - e_view_has_errors exception; - pragma exception_init(e_view_has_errors, -4063); - -- ORA-01720: grant option does not exist for .PARTY - e_grant_option_does_not_exist exception; - pragma exception_init(e_grant_option_does_not_exist, -1720); + l_ddl_tab dbms_sql.varchar2a%s; begin - l_cursor := dbms_sql.open_cursor' || l_network_link || '; - -- kopieer naar (remote) array + -- copy to (remote) array if l_ddl_text_tab.count > 0 then for i_idx in l_ddl_text_tab.first .. l_ddl_text_tab.last @@ -3506,37 +3537,34 @@ begin end loop; end if; -- - dbms_sql.parse' || l_network_link || ' - ( c => l_cursor - , statement => l_ddl_tab - , lb => l_ddl_tab.first - , ub => l_ddl_tab.last - , lfflg => false - , language_flag => dbms_sql.native - ); - -- - dbms_sql.close_cursor' || l_network_link || '(l_cursor); -exception - when e_s6_with_compilation_error or e_view_has_errors or e_grant_option_does_not_exist - then dbms_sql.close_cursor' || l_network_link || '(l_cursor); - when others - then - /* DBMS_SQL.LAST_ERROR_POSITION - This function returns the byte offset in the SQL statement text where the error occurred. - The first character in the SQL statement is at position 0. - */ - l_last_error_position := 1 + nvl(dbms_sql.last_error_position' || l_network_link || ', 0); - dbms_sql.close_cursor' || l_network_link || '(l_cursor); - raise_application_error - ( -20000 - , ''Error at position '' || l_last_error_position || '': '' || substr(oracle_tools.pkg_str_util.text2clob(l_ddl_text_tab), l_last_error_position, 2000) - , true - ); -end;'; + oracle_tools.pkg_ddl_util.execute_ddl%s(l_ddl_tab); +end;]', l_network_link + , l_network_link + ); - execute immediate l_statement using p_ddl_text_tab; + begin + if l_network_link is null + then + execute immediate l_statement using p_ddl_text_tab; + else + oracle_tools.api_pkg.dbms_output_enable(substr(l_network_link, 2)); + oracle_tools.api_pkg.dbms_output_clear(substr(l_network_link, 2)); + + execute immediate l_statement using p_ddl_text_tab; + + oracle_tools.api_pkg.dbms_output_flush(substr(l_network_link, 2)); + end if; + exception + when others + then + if l_network_link is not null + then + oracle_tools.api_pkg.dbms_output_flush(substr(l_network_link, 2)); + end if; + raise; + end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -3547,13 +3575,88 @@ $end end execute_ddl; procedure execute_ddl - ( p_schema_ddl_tab in t_schema_ddl_tab - , p_network_link in varchar2 default null + ( p_ddl_tab in dbms_sql.varchar2a ) is + l_cursor integer; + l_last_error_position integer := null; + + -- ORA-24344: success with compilation error -- due to missing privileges + e_s6_with_compilation_error exception; + pragma exception_init(e_s6_with_compilation_error, -24344); + -- ORA-04063: view "EMPTY.V_DISPLAY_DDL_SCHEMA" has errors + e_view_has_errors exception; + pragma exception_init(e_view_has_errors, -4063); + -- ORA-01720: grant option does not exist for .PARTY + e_grant_option_does_not_exist exception; + pragma exception_init(e_grant_option_does_not_exist, -1720); + -- ORA-01927: cannot REVOKE privileges you did not grant + e_cannot_revoke exception; + pragma exception_init(e_cannot_revoke, -1927); + -- ORA-04045: errors during recompilation/revalidation of EMPTY.T_TRIGGER_DDL + e_errors_during_recompilation exception; + pragma exception_init(e_errors_during_recompilation, -4045); begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'EXECUTE_DDL (3)'); + dbug.print(dbug."input", 'p_ddl_tab.count: %s', p_ddl_tab.count); +$end + + l_cursor := dbms_sql.open_cursor; + -- + dbms_sql.parse + ( c => l_cursor + , statement => p_ddl_tab + , lb => p_ddl_tab.first + , ub => p_ddl_tab.last + , lfflg => false + , language_flag => dbms_sql.native + ); + -- + dbms_sql.close_cursor(l_cursor); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; +$end + exception + when e_s6_with_compilation_error or + e_view_has_errors or + e_grant_option_does_not_exist or + e_cannot_revoke or + e_errors_during_recompilation + then + dbms_sql.close_cursor(l_cursor); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave_on_error; +$end + null; -- no reraise + + when others + then + /* DBMS_SQL.LAST_ERROR_POSITION + This function returns the byte offset in the SQL statement text where the error occurred. + The first character in the SQL statement is at position 0. + */ + l_last_error_position := 1 + nvl(dbms_sql.last_error_position, 0); + dbms_sql.close_cursor(l_cursor); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave_on_error; +$end + raise_application_error + ( oracle_tools.pkg_ddl_error.c_execute_via_db_link + , 'Error at position ' || l_last_error_position || '; ddl:' || chr(10) || substr(p_ddl_tab(p_ddl_tab.first), 1, 255) + , true + ); + end execute_ddl; + + procedure execute_ddl + ( p_schema_ddl_tab in oracle_tools.t_schema_ddl_tab + , p_network_link in varchar2 default null + ) + is + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter(g_package_prefix || 'EXECUTE_DDL (4)'); dbug.print(dbug."input" ,'p_schema_ddl_tab.count: %s; p_network_link: %s' ,case when p_schema_ddl_tab is not null then p_schema_ddl_tab.count end @@ -3569,31 +3672,22 @@ $end then for i_ddl_idx in p_schema_ddl_tab(i_idx).ddl_tab.first .. p_schema_ddl_tab(i_idx).ddl_tab.last loop - begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).print(); -$end - if p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).verb() = '--' - then - -- this is a comment - null; - else - execute_ddl(p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).text, p_network_link); - end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - exception - when others - then - p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).print(); - raise; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).print(); $end - end; + if p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).verb() = '--' + then + -- this is a comment + null; + else + execute_ddl(p_schema_ddl_tab(i_idx).ddl_tab(i_ddl_idx).text, p_network_link); + end if; end loop; end if; -- if cardinality(p_schema_ddl_tab(i_idx).ddl_tab) > 0 end loop; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -3613,13 +3707,13 @@ $end , p_network_link_target in t_network_link ) is - l_diff_schema_ddl_tab t_schema_ddl_tab; + l_diff_schema_ddl_tab oracle_tools.t_schema_ddl_tab; -$if cfg_pkg.c_debugging $then - l_program constant varchar2(61) := g_package_prefix || 'SYNCHRONIZE'; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + l_program constant t_module := g_package_prefix || 'SYNCHRONIZE'; $end begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(l_program); $end @@ -3628,14 +3722,14 @@ $end select value(t) bulk collect into l_diff_schema_ddl_tab - from table(oracle_tools.pkg_ddl_util.display_ddl_schema_diff(/*p_object_type =>*/ p_object_type - ,/*p_object_names =>*/ p_object_names - ,/*p_object_names_include =>*/ p_object_names_include - ,/*p_schema_source =>*/ p_schema_source - ,/*p_schema_target =>*/ p_schema_target - ,/*p_network_link_source =>*/ p_network_link_source - ,/*p_network_link_target =>*/ p_network_link_target - ,/*p_skip_repeatables =>*/ 0)) t + from table(oracle_tools.pkg_ddl_util.display_ddl_schema_diff(p_object_type => p_object_type + ,p_object_names => p_object_names + ,p_object_names_include => p_object_names_include + ,p_schema_source => p_schema_source + ,p_schema_target => p_schema_target + ,p_network_link_source => p_network_link_source + ,p_network_link_target => p_network_link_target + ,p_skip_repeatables => 0)) t ; -- Skip public synonyms on the same database @@ -3646,7 +3740,7 @@ $end execute_ddl(l_diff_schema_ddl_tab, p_network_link_target); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -3664,13 +3758,13 @@ $end , p_network_link_target in t_network_link ) is - l_drop_schema_ddl_tab t_schema_ddl_tab; + l_drop_schema_ddl_tab oracle_tools.t_schema_ddl_tab; -$if cfg_pkg.c_debugging $then - l_program constant varchar2(61) := g_package_prefix || 'UNINSTALL'; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + l_program constant t_module := g_package_prefix || 'UNINSTALL'; $end begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(l_program); $end @@ -3684,7 +3778,7 @@ $end , p_network_link_target => p_network_link_target ); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -3700,7 +3794,7 @@ $end , p_object_names in t_object_names , p_object_names_include in t_numeric_boolean , p_grantor_is_schema in t_numeric_boolean_nn - , p_schema_object_tab out nocopy t_schema_object_tab + , p_schema_object_tab out nocopy oracle_tools.t_schema_object_tab ) is l_object_names constant varchar2(4000 char) := @@ -3712,16 +3806,16 @@ $end l_excluded_tables_tab t_excluded_tables_tab; - l_named_object_tab t_schema_object_tab := t_schema_object_tab(); - l_schema_object_tab t_schema_object_tab := t_schema_object_tab(); - l_schema_object t_schema_object; + l_named_object_tab oracle_tools.t_schema_object_tab := oracle_tools.t_schema_object_tab(); + l_schema_object_tab oracle_tools.t_schema_object_tab := oracle_tools.t_schema_object_tab(); + l_schema_object oracle_tools.t_schema_object; l_refcursor sys_refcursor; l_longops_rec t_longops_rec := longops_init(p_target_desc => 'GET_SCHEMA_OBJECT'); -- see all the queries where base info is stored - l_dependent_object_type_tab constant t_text_tab := t_text_tab('OBJECT_GRANT', 'SYNONYM', 'COMMENT', 'CONSTRAINT', 'REF_CONSTRAINT', 'INDEX', 'TRIGGER'); + l_dependent_object_type_tab constant oracle_tools.t_text_tab := oracle_tools.t_text_tab('OBJECT_GRANT', 'SYNONYM', 'COMMENT', 'CONSTRAINT', 'REF_CONSTRAINT', 'INDEX', 'TRIGGER'); /* We have two steps in this routine: @@ -3735,15 +3829,15 @@ $end If we do not check named objects, we must do it later on, after step 2. */ - l_object_types_to_check t_text_tab := + l_object_types_to_check oracle_tools.t_text_tab := case when p_object_type member of l_dependent_object_type_tab then l_dependent_object_type_tab -- do not check for example TABLE else g_schema_md_object_type_tab -- check all end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - procedure check_duplicates(p_schema_object_tab in t_schema_object_tab) +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + procedure check_duplicates(p_schema_object_tab in oracle_tools.t_schema_object_tab) is l_object_tab t_object_natural_tab; begin @@ -3754,7 +3848,7 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then p_schema_object_tab(i_idx).print(); if l_object_tab.exists(p_schema_object_tab(i_idx).signature()) then - raise_application_error(-20000, 'The signature of the object is a duplicate: ' || p_schema_object_tab(i_idx).signature()); + raise_application_error(oracle_tools.pkg_ddl_error.c_duplicate_item, 'The signature of the object is a duplicate: ' || p_schema_object_tab(i_idx).signature()); else l_object_tab(p_schema_object_tab(i_idx).signature()) := 0; end if; @@ -3772,7 +3866,7 @@ $end end if; end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || 'GET_SCHEMA_OBJECT'); dbug.print(dbug."input" ,'p_schema: %s; p_object_type: %s; p_object_names: %s; p_object_names_include: %s; p_grantor_is_schema: %s' @@ -3800,7 +3894,7 @@ $end loop longops_show(l_longops_rec); l_excluded_tables_tab(r.queue_table) := true; -$if pkg_ddl_util.c_get_queue_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_queue_ddl $then -- this is a special case since we need to exclude first if oracle_tools.pkg_ddl_util.schema_object_matches_filter ( -- filter values @@ -3814,7 +3908,7 @@ $if pkg_ddl_util.c_get_queue_ddl $then ) = 1 then l_named_object_tab.extend(1); - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_type => 'AQ_QUEUE_TABLE' , p_object_schema => r.owner , p_object_name => r.queue_table @@ -3826,7 +3920,7 @@ $else $end end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_named_object_tab); $end @@ -3857,11 +3951,11 @@ $end ) = 1 then l_named_object_tab.extend(1); - l_named_object_tab(l_named_object_tab.last) := t_materialized_view_object(r.owner, r.mview_name); + l_named_object_tab(l_named_object_tab.last) := oracle_tools.t_materialized_view_object(r.owner, r.mview_name); end if; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_named_object_tab); $end @@ -3907,7 +4001,7 @@ $end , p_object_name => r.table_name ) = 1 then - l_schema_object := t_table_object(r.owner, r.table_name, r.tablespace_name); + l_schema_object := oracle_tools.t_table_object(r.owner, r.table_name, r.tablespace_name); if not(l_excluded_tables_tab.exists(l_schema_object.object_name())) then l_named_object_tab.extend(1); @@ -3916,7 +4010,7 @@ $end end if; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_named_object_tab); $end @@ -3937,7 +4031,7 @@ $end and o.generated = 'N' -- GPA 2016-12-19 #136334705 -- OWNER OBJECT_NAME SUBOBJECT_NAME -- ===== =========== ============== - -- ORACLE_TOOLS T_TABLE_COLUMN_DDL $VSN_1 + -- ORACLE_TOOLS oracle_tools.t_table_column_ddl $VSN_1 and o.subobject_name is null -- GPA 2017-06-28 #147916863 - As a release operator I do not want comments without table or column. and not( o.object_type = 'SEQUENCE' and substr(o.object_name, 1, 5) = 'ISEQ$' ) @@ -3959,7 +4053,7 @@ $end loop longops_show(l_longops_rec); l_named_object_tab.extend(1); - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_type => r.object_type , p_object_schema => r.owner , p_object_name => r.object_name @@ -3967,7 +4061,7 @@ $end ); end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_named_object_tab); $end @@ -4027,8 +4121,8 @@ $end longops_show(l_longops_rec); l_schema_object_tab.extend(1); l_schema_object_tab(l_schema_object_tab.last) := - t_object_grant_object - ( p_base_object => treat(r.base_object as t_named_object) + oracle_tools.t_object_grant_object + ( p_base_object => treat(r.base_object as oracle_tools.t_named_object) , p_object_schema => r.object_schema , p_grantee => r.grantee , p_privilege => r.privilege @@ -4036,7 +4130,7 @@ $end ); end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_schema_object_tab); $end @@ -4111,23 +4205,23 @@ $end when 'SYNONYM' then l_schema_object_tab(l_schema_object_tab.last) := - t_synonym_object - ( p_base_object => treat(r.base_object as t_named_object) + oracle_tools.t_synonym_object + ( p_base_object => treat(r.base_object as oracle_tools.t_named_object) , p_object_schema => r.object_schema , p_object_name => r.object_name ); when 'COMMENT' then l_schema_object_tab(l_schema_object_tab.last) := - t_comment_object - ( p_base_object => treat(r.base_object as t_named_object) + oracle_tools.t_comment_object + ( p_base_object => treat(r.base_object as oracle_tools.t_named_object) , p_object_schema => r.object_schema , p_column_name => r.column_name ); end case; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_schema_object_tab); $end @@ -4138,8 +4232,9 @@ $end , c.owner as object_schema , case when c.constraint_type = 'R' then 'REF_CONSTRAINT' else 'CONSTRAINT' end as object_type , c.constraint_name as object_name -$if pkg_ddl_util.c_#138707615_1 $then + , c.constraint_type , c.search_condition +$if oracle_tools.pkg_ddl_util.c_#138707615_1 $then , case c.constraint_type when 'C' then ( select cc.column_name @@ -4165,7 +4260,7 @@ $end O (with read only, on a view) */ and c.constraint_type in ('C', 'P', 'U', 'R') -$if not(pkg_ddl_util.c_#138707615_1) $then +$if not(oracle_tools.pkg_ddl_util.c_#138707615_1) $then -- exclude system generated not null constraints and ( c.constraint_name not like 'SYS\_C%' escape '\' or c.constraint_type <> 'C' or @@ -4197,7 +4292,7 @@ $end ) = 1 ) loop -$if pkg_ddl_util.c_#138707615_1 $then +$if oracle_tools.pkg_ddl_util.c_#138707615_1 $then -- We do NOT want a NOT NULL constraint, named or not. -- Since search_condition is a LONG we must use PL/SQL to filter if r.search_condition is not null and @@ -4206,7 +4301,7 @@ $if pkg_ddl_util.c_#138707615_1 $then then -- This is a not null constraint. -- Since search_condition has only one column, any column name is THE column name. -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'ignoring not null constraint: owner: %s; table: %s; constraint: %s; search_condition: %s' @@ -4226,28 +4321,32 @@ $end when 'REF_CONSTRAINT' then l_schema_object_tab(l_schema_object_tab.last) := - t_ref_constraint_object - ( p_base_object => treat(r.base_object as t_named_object) + oracle_tools.t_ref_constraint_object + ( p_base_object => treat(r.base_object as oracle_tools.t_named_object) , p_object_schema => r.object_schema , p_object_name => r.object_name + , p_constraint_type => r.constraint_type + , p_column_names => null ); when 'CONSTRAINT' then l_schema_object_tab(l_schema_object_tab.last) := - t_constraint_object - ( p_base_object => treat(r.base_object as t_named_object) + oracle_tools.t_constraint_object + ( p_base_object => treat(r.base_object as oracle_tools.t_named_object) , p_object_schema => r.object_schema , p_object_name => r.object_name + , p_constraint_type => r.constraint_type + , p_search_condition => r.search_condition ); end case; -$if pkg_ddl_util.c_#138707615_1 $then +$if oracle_tools.pkg_ddl_util.c_#138707615_1 $then end if; $end end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_schema_object_tab); $end @@ -4272,7 +4371,7 @@ $end select t.owner as object_schema , 'TRIGGER' as object_type , t.trigger_name as object_name -/* GJP 20170106 see t_schema_object.chk() +/* GJP 20170106 see oracle_tools.t_schema_object.chk() -- when the trigger is based on an object in another schema, no base info , case when t.owner = t.table_owner then t.table_owner end as base_object_schema , case when t.owner = t.table_owner then t.base_object_type end as base_object_type @@ -4303,7 +4402,7 @@ $end loop longops_show(l_longops_rec); l_schema_object_tab.extend(1); - t_schema_object.create_schema_object + oracle_tools.t_schema_object.create_schema_object ( p_object_schema => r.object_schema , p_object_type => r.object_type , p_object_name => r.object_name @@ -4315,7 +4414,7 @@ $end ); end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_schema_object_tab); $end @@ -4323,7 +4422,7 @@ $end ( -- indexes select i.owner as object_schema , i.index_name as object_name -/* GJP 20170106 see t_schema_object.chk() +/* GJP 20170106 see oracle_tools.t_schema_object.chk() -- when the index is based on an object in another schema, no base info , case when i.owner = i.table_owner then i.table_owner end as base_object_schema , case when i.owner = i.table_owner then i.table_type end as base_object_type @@ -4355,9 +4454,9 @@ $end longops_show(l_longops_rec); l_schema_object_tab.extend(1); l_schema_object_tab(l_schema_object_tab.last) := - t_index_object + oracle_tools.t_index_object ( p_base_object => - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => r.base_object_schema , p_object_type => r.base_object_type , p_object_name => r.base_object_name @@ -4368,7 +4467,7 @@ $end ); end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(l_schema_object_tab); $end @@ -4376,7 +4475,7 @@ $end then -- every object in l_named_object_tab has been checked already by oracle_tools.pkg_ddl_util.schema_object_matches_filter() - -- combine and filter based on the map function of t_schema_object and its subtypes + -- combine and filter based on the map function of oracle_tools.t_schema_object and its subtypes -- GPA 2017-01-27 For performance reasons do not use DISTINCT since the sets should be unique and distinct already p_schema_object_tab := l_named_object_tab multiset union /*distinct*/ l_schema_object_tab; else @@ -4406,13 +4505,13 @@ $end longops_done(l_longops_rec); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then check_duplicates(p_schema_object_tab); $end cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."output", 'cardinality(p_schema_object_tab): %s', cardinality(p_schema_object_tab)); dbug.leave; $end @@ -4421,7 +4520,7 @@ $end when others then cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end raise; @@ -4434,10 +4533,14 @@ $end , p_object_names_include in t_numeric_boolean , p_grantor_is_schema in t_numeric_boolean_nn ) - return t_schema_object_tab + return oracle_tools.t_schema_object_tab pipelined is - l_schema_object_tab t_schema_object_tab; + l_schema_object_tab oracle_tools.t_schema_object_tab; + l_program constant t_module := 'GET_SCHEMA_OBJECT'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt + + -- dbms_application_info stuff + l_longops_rec t_longops_rec := longops_init(p_target_desc => l_program, p_op_name => 'fetch', p_units => 'objects'); begin oracle_tools.pkg_ddl_util.get_schema_object ( p_schema => p_schema @@ -4452,13 +4555,24 @@ $end for i_idx in l_schema_object_tab.first .. l_schema_object_tab.last loop pipe row (l_schema_object_tab(i_idx)); + longops_show(l_longops_rec); end loop; end if; + longops_done(l_longops_rec); + return; + exception + when no_data_needed + then + null; -- not a real error, just a way to some cleanup + + when no_data_found + then + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); end get_schema_object; procedure get_member_ddl - ( p_schema_ddl in t_schema_ddl - , p_member_ddl_tab out nocopy t_schema_ddl_tab + ( p_schema_ddl in oracle_tools.t_schema_ddl + , p_member_ddl_tab out nocopy oracle_tools.t_schema_ddl_tab ) is -- attribute/column data @@ -4506,13 +4620,13 @@ $end l_type_method_tab t_type_method_tab; l_argument_tab t_argument_object_tab; - l_member_object t_type_attribute_object; - l_type_method_object t_type_method_object; - l_member_ddl t_schema_ddl; + l_member_object oracle_tools.t_type_attribute_object; + l_type_method_object oracle_tools.t_type_method_object; + l_member_ddl oracle_tools.t_schema_ddl; l_table_ddl_clob clob := null; l_member_ddl_clob clob := null; - l_data_default t_text_tab; + l_data_default oracle_tools.t_text_tab; l_data_default_clob clob := null; l_pos pls_integer; @@ -4542,12 +4656,12 @@ $end end if; end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || 'GET_MEMBER_DDL'); p_schema_ddl.print(); $end - p_member_ddl_tab := t_schema_ddl_tab(); + p_member_ddl_tab := oracle_tools.t_schema_ddl_tab(); dbms_lob.createtemporary(l_table_ddl_clob, true); dbms_lob.createtemporary(l_member_ddl_clob, true); @@ -4604,7 +4718,7 @@ order by member#'; dbms_lob.trim(l_table_ddl_clob, 0); - pkg_str_util.text2clob + oracle_tools.pkg_str_util.text2clob ( pi_text_tab => p_schema_ddl.ddl_tab(1).text -- CREATE TABLE statement , pio_clob => l_table_ddl_clob , pi_append => false @@ -4616,7 +4730,7 @@ order by fetch l_cursor bulk collect into l_member_tab; close l_cursor; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_member_tab.count: %s', l_member_tab.count); $end @@ -4625,7 +4739,7 @@ $end <> for i_idx in l_member_tab.first .. l_member_tab.last loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_member_tab(%s); member#: %s; member_name: %s', i_idx, l_member_tab(i_idx).member#, l_member_tab(i_idx).member_name); $end case p_schema_ddl.obj.object_type() @@ -4633,8 +4747,8 @@ $end then begin l_member_object := - t_type_attribute_object - ( p_base_object => treat(p_schema_ddl.obj as t_named_object) + oracle_tools.t_type_attribute_object + ( p_base_object => treat(p_schema_ddl.obj as oracle_tools.t_named_object) , p_member# => l_member_tab(i_idx).member# , p_member_name => l_member_tab(i_idx).member_name , p_data_type_name => l_member_tab(i_idx).data_type_name @@ -4646,9 +4760,9 @@ $end , p_character_set_name => l_member_tab(i_idx).character_set_name ); - l_member_ddl := t_type_attribute_ddl(l_member_object); + l_member_ddl := oracle_tools.t_type_attribute_ddl(l_member_object); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_member_ddl.print(); $end @@ -4657,10 +4771,10 @@ $end exception when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.on_error; $end - raise_application_error(-20000, 'attribute [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, 'attribute [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); end; when 'TABLE' @@ -4669,18 +4783,18 @@ $end if l_member_tab(i_idx).default_length > 0 then dbms_lob.trim(l_data_default_clob, 0); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_member_tab(i_idx).data_default , pio_clob => l_data_default_clob ); - l_data_default := pkg_str_util.clob2text(l_data_default_clob); + l_data_default := oracle_tools.pkg_str_util.clob2text(l_data_default_clob); else l_data_default := null; end if; l_member_object := - t_table_column_object - ( p_base_object => treat(p_schema_ddl.obj as t_named_object) + oracle_tools.t_table_column_object + ( p_base_object => treat(p_schema_ddl.obj as oracle_tools.t_named_object) , p_member# => l_member_tab(i_idx).member# , p_member_name => l_member_tab(i_idx).member_name , p_data_type_name => l_member_tab(i_idx).data_type_name @@ -4700,7 +4814,7 @@ $end dbms_lob.trim(l_member_ddl_clob, 0); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => 'ALTER TABLE "' || p_schema_ddl.obj.object_schema() || '"."' || p_schema_ddl.obj.object_name() || '"' || "ADD" -- no ADD COLUMN , pio_clob => l_member_ddl_clob ); @@ -4724,7 +4838,7 @@ $end l_pos := dbms_lob.instr(lob_loc => l_table_ddl_clob, pattern => l_pattern, offset => l_start); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_pattern: %s; l_start: %s; l_pos: %s', l_pattern, l_start, l_pos); $end @@ -4745,7 +4859,7 @@ $end l_pos := dbms_lob.instr(lob_loc => l_table_ddl_clob, pattern => l_pattern, offset => l_start); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_pattern: %s; l_start: %s; l_pos: %s', l_pattern, l_start, l_pos); $end @@ -4754,7 +4868,7 @@ $end if i_idx < l_member_tab.last then -- strip command and whitespace before "" - while dbms_lob.substr(lob_loc => l_table_ddl_clob, amount => 1, offset => l_pos - 1) in (',', ' ', chr(9), chr(10), chr(13)) + while oracle_tools.pkg_str_util.dbms_lob_substr(p_clob => l_table_ddl_clob, p_amount => 1, p_offset => l_pos - 1) in (',', ' ', chr(9), chr(10), chr(13)) loop l_pos := l_pos - 1; end loop; @@ -4771,17 +4885,17 @@ $end if c_use_sqlterminator then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => chr(10) || '/' , pio_clob => l_member_ddl_clob ); end if; -- use the default constructor so we can determine the DDL - l_member_ddl := t_table_column_ddl(l_member_object, t_ddl_tab()); + l_member_ddl := oracle_tools.t_table_column_ddl(l_member_object, oracle_tools.t_ddl_tab()); l_member_ddl.add_ddl ( p_verb => 'ALTER' - , p_text => pkg_str_util.clob2text(l_member_ddl_clob) + , p_text => oracle_tools.pkg_str_util.clob2text(l_member_ddl_clob) ); l_start := l_pos; -- next start position for search @@ -4789,7 +4903,7 @@ $end raise program_error; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_member_ddl.print(); $end @@ -4800,10 +4914,10 @@ $end exception when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.on_error; $end - raise_application_error(-20000, 'column [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, 'column [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); end; end case; end loop member_loop; @@ -4832,7 +4946,7 @@ order by fetch l_cursor bulk collect into l_type_method_tab; close l_cursor; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_type_method_tab.count: %s', l_type_method_tab.count); $end @@ -4858,7 +4972,7 @@ order by for i_idx in l_type_method_tab.first .. l_type_method_tab.last loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_type_method_tab(%s); member#: %s; member_name: %s', i_idx, l_type_method_tab(i_idx).member#, l_type_method_tab(i_idx).member_name); $end begin @@ -4871,8 +4985,8 @@ $end close l_cursor; l_type_method_object := - t_type_method_object - ( p_base_object => treat(p_schema_ddl.obj as t_named_object) + oracle_tools.t_type_method_object + ( p_base_object => treat(p_schema_ddl.obj as oracle_tools.t_named_object) , p_member# => l_type_method_tab(i_idx).member# , p_member_name => l_type_method_tab(i_idx).member_name , p_method_type => l_type_method_tab(i_idx).method_type @@ -4884,9 +4998,9 @@ $end , p_arguments => l_argument_tab ); - l_member_ddl := t_type_method_ddl(l_type_method_object); + l_member_ddl := oracle_tools.t_type_method_ddl(l_type_method_object); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_member_ddl.print(); $end @@ -4897,10 +5011,10 @@ $end exception when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.on_error; $end - raise_application_error(-20000, 'attribute [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, 'attribute [' || i_idx || ']: ' || l_member_tab(i_idx).member_name, true); end; end loop; end if; @@ -4908,14 +5022,14 @@ $end cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end exception when others then cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end raise; @@ -4927,7 +5041,7 @@ $end ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'DO_CHK (1)'); dbug.print(dbug."input", 'p_object_type: %s; p_value: %s', p_object_type, dbug.cast_to_varchar2(p_value)); $end @@ -4946,7 +5060,7 @@ $end else g_chk_tab(p_object_type) := case - when p_object_type = 'OBJECT_GRANT' -- too slow, see T_OBJECT_GRANT_OBJECT + when p_object_type = 'OBJECT_GRANT' -- too slow, see oracle_tools.t_object_grant_object then 0 when p_value then 1 @@ -4954,7 +5068,7 @@ $end end; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -4971,14 +5085,14 @@ $end is l_value boolean; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'DO_CHK (2)'); dbug.print(dbug."input", 'p_object_type: %s', p_object_type); $end l_value := case when g_chk_tab.exists(p_object_type) and g_chk_tab(p_object_type) = 1 then true else false end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', l_value); dbug.leave; $end @@ -4987,12 +5101,12 @@ $end end do_chk; procedure chk_schema_object - ( p_schema_object in t_schema_object + ( p_schema_object in oracle_tools.t_schema_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'CHK_SCHEMA_OBJECT (1)'); dbug.print(dbug."input", 'p_schema_object:'); p_schema_object.print(); @@ -5000,13 +5114,13 @@ $end if p_schema_object.object_type() is null then - raise_application_error(-20000, 'Object type should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object type should not be empty'); elsif p_schema_object.dict2metadata_object_type() = p_schema_object.object_type() then null; -- ok else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Object type (' || p_schema_object.object_type() || ') should be equal to this DBMS_METADATA object type (' || @@ -5018,7 +5132,7 @@ $end if (p_schema_object.base_object_type() is null) != (p_schema_object.base_object_schema() is null) then raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Base object type (' || p_schema_object.base_object_type() || ') and base object schema (' || @@ -5030,7 +5144,7 @@ $end if (p_schema_object.base_object_name() is null) != (p_schema_object.base_object_schema() is null) then raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Base object name (' || p_schema_object.base_object_name() || ') and base object schema (' || @@ -5039,7 +5153,7 @@ $end ); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; exception when others @@ -5050,12 +5164,12 @@ $end end chk_schema_object; procedure chk_schema_object - ( p_dependent_or_granted_object in t_dependent_or_granted_object + ( p_dependent_or_granted_object in oracle_tools.t_dependent_or_granted_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'CHK_SCHEMA_OBJECT (2)'); $end @@ -5065,60 +5179,60 @@ $end then null; -- ok else - raise_application_error(-20000, 'Object schema should be empty or ' || p_schema); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema should be empty or ' || p_schema); end if; if p_dependent_or_granted_object.base_object$ is null then - raise_application_error(-20000, 'Base object should not be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object should not be empty.'); end if; -- GPA 2017-01-18 too strict for triggers, synonyms, indexes, etc. -/* + /* if p_dependent_or_granted_object.base_object_schema() = p_schema then null; -- ok else - raise_application_error(-20000, 'Base object schema must be ' || p_schema); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema must be ' || p_schema); end if; -*/ + */ if p_dependent_or_granted_object.base_object_schema() is null then - raise_application_error(-20000, 'Base object schema should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema should not be empty'); end if; if p_dependent_or_granted_object.base_object_type() is null then - raise_application_error(-20000, 'Base object type should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object type should not be empty'); end if; if p_dependent_or_granted_object.base_object_name() is null then - raise_application_error(-20000, 'Base object name should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object name should not be empty'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.leave; -exception - when others - then - dbug.leave_on_error; - raise; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; $end end chk_schema_object; procedure chk_schema_object - ( p_named_object in t_named_object + ( p_named_object in oracle_tools.t_named_object , p_schema in varchar2 ) is -$if pkg_ddl_util.c_#140920801 $then - -- Capture invalid objects before releasing to next enviroment. - l_status all_objects.status%type := null; +$if oracle_tools.pkg_ddl_util.c_#140920801 $then + -- Capture invalid objects before releasing to next enviroment. + l_status all_objects.status%type := null; $end begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'CHK_SCHEMA_OBJECT (3)'); $end @@ -5126,14 +5240,14 @@ $end if p_named_object.object_name() is null then - raise_application_error(-20000, 'Object name should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object name should not be empty'); end if; if p_named_object.object_schema() = p_schema then null; -- ok else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Object schema (' || p_named_object.object_schema() || ') must be ' || @@ -5141,44 +5255,44 @@ $end ); end if; -$if pkg_ddl_util.c_#140920801 $then +$if oracle_tools.pkg_ddl_util.c_#140920801 $then - -- Capture invalid objects before releasing to next enviroment. - if do_chk(p_named_object.object_type()) and p_named_object.network_link() is null - then - begin - select obj.status - into l_status - from all_objects obj - where obj.owner = p_named_object.object_schema() - and obj.object_type = p_named_object.dict_object_type() - and obj.object_name = p_named_object.object_name() - ; - if l_status = 'VALID' - then - null; - else - raise value_error; - end if; - exception - when no_data_found - then null; + -- Capture invalid objects before releasing to next enviroment. + if oracle_tools.pkg_ddl_util.do_chk(p_named_object.object_type()) and p_named_object.network_link() is null + then + begin + select obj.status + into l_status + from all_objects obj + where obj.owner = p_named_object.object_schema() + and obj.object_type = p_named_object.dict_object_type() + and obj.object_name = p_named_object.object_name() + ; + if l_status = 'VALID' + then + null; + else + raise value_error; + end if; + exception + when no_data_found + then null; - when value_error - then - raise_application_error - ( -20000 - , 'Object status (' || - l_status || - ') must be VALID' - , true - ); - end; - end if; + when value_error + then + raise_application_error + ( oracle_tools.pkg_ddl_error.c_object_not_valid + , 'Object status (' || + l_status || + ') must be VALID' + , true + ); + end; + end if; $end -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; exception when others @@ -5189,30 +5303,30 @@ $end end chk_schema_object; procedure chk_schema_object - ( p_constraint_object in t_constraint_object + ( p_constraint_object in oracle_tools.t_constraint_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'CHK_SCHEMA_OBJECT (4)'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => p_constraint_object, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => p_constraint_object, p_schema => p_schema); if p_constraint_object.object_schema() = p_schema then null; -- ok else - raise_application_error(-20000, 'Object schema (' || p_constraint_object.object_schema() || ') must be ' || p_schema); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema (' || p_constraint_object.object_schema() || ') must be ' || p_schema); end if; if p_constraint_object.base_object_schema() is null then - raise_application_error(-20000, 'Base object schema should not be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema should not be empty.'); end if; if p_constraint_object.constraint_type() is null then - raise_application_error(-20000, 'Constraint type should not be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Constraint type should not be empty.'); end if; case @@ -5220,27 +5334,27 @@ $end then if p_constraint_object.column_names() is null then - raise_application_error(-20000, 'Column names should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Column names should not be empty'); end if; if p_constraint_object.search_condition() is not null then - raise_application_error(-20000, 'Search condition should be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Search condition should be empty'); end if; when p_constraint_object.constraint_type() in ('C') then if p_constraint_object.column_names() is not null then - raise_application_error(-20000, 'Column names should be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Column names should be empty'); end if; if p_constraint_object.search_condition() is null then - raise_application_error(-20000, 'Search condition should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Search condition should not be empty'); end if; end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; exception when others @@ -5258,7 +5372,7 @@ $end p_object_type in t_metadata_object_type , p_object_names in t_object_names , p_object_names_include in t_numeric_boolean - , p_object_types_to_check in t_text_tab + , p_object_types_to_check in oracle_tools.t_text_tab -- database values , p_metadata_object_type in t_metadata_object_type , p_object_name in t_object_name @@ -5270,12 +5384,12 @@ $end is l_result t_numeric_boolean_nn := 0; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'SCHEMA_OBJECT_MATCHES_FILTER'); dbug.print ( dbug."input" - , 'p_object_types_to_check.count: %s; p_metadata_object_type: %s; p_object_name: %s; p_metadata_base_object_type: %s; p_base_object_name: %s' - , p_object_types_to_check.count + , 'cardinality(p_object_types_to_check): %s; p_metadata_object_type: %s; p_object_name: %s; p_metadata_base_object_type: %s; p_base_object_name: %s' + , cardinality(p_object_types_to_check) , p_metadata_object_type , p_object_name , p_metadata_base_object_type @@ -5304,7 +5418,7 @@ $end then l_result := 0; - when p_metadata_object_type not member of p_object_types_to_check + when p_object_types_to_check is not null and p_metadata_object_type not member of p_object_types_to_check then l_result := 1; -- anything is fine @@ -5334,7 +5448,7 @@ $end l_result := 0; end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_result); dbug.leave; $end @@ -5349,7 +5463,7 @@ $end deterministic is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then check_object_type(p_object_type); $end @@ -5366,19 +5480,19 @@ $end procedure get_exclude_name_expr_tab ( p_object_type in varchar2 , p_object_name in varchar2 default null - , p_exclude_name_expr_tab out nocopy t_text_tab + , p_exclude_name_expr_tab out nocopy oracle_tools.t_text_tab ) is begin if not(g_object_exclude_name_expr_tab.exists(p_object_type)) then - p_exclude_name_expr_tab := t_text_tab(); + p_exclude_name_expr_tab := oracle_tools.t_text_tab(); else if p_object_name is null then p_exclude_name_expr_tab := g_object_exclude_name_expr_tab(p_object_type); else - p_exclude_name_expr_tab := t_text_tab(); + p_exclude_name_expr_tab := oracle_tools.t_text_tab(); for i_idx in g_object_exclude_name_expr_tab(p_object_type).first .. g_object_exclude_name_expr_tab(p_object_type).last loop if p_object_name like g_object_exclude_name_expr_tab(p_object_type)(i_idx) escape '\' @@ -5399,9 +5513,9 @@ $end deterministic is l_result integer; - l_exclude_name_expr_tab t_text_tab; + l_exclude_name_expr_tab oracle_tools.t_text_tab; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.enter(g_package_prefix || 'IS_EXCLUDE_NAME_EXPR'); dbug.print(dbug."input", 'p_object_type: %s; p_object_name: %s', p_object_type, p_object_name); $end @@ -5409,7 +5523,7 @@ $end get_exclude_name_expr_tab(p_object_type => p_object_type, p_object_name => p_object_name, p_exclude_name_expr_tab => l_exclude_name_expr_tab); l_result := sign(l_exclude_name_expr_tab.count); -- when 0 return 0; when > 0 return 1 -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_result); dbug.leave; $end @@ -5422,12 +5536,14 @@ $end */ function get_schema_ddl ( p_schema in t_schema_nn - , p_new_schema in t_schema + , p_object_type in t_metadata_object_type + , p_object_names in t_object_names + , p_object_names_include in t_numeric_boolean , p_use_schema_export in t_numeric_boolean_nn - , p_schema_object_tab in t_schema_object_tab + , p_schema_object_tab in oracle_tools.t_schema_object_tab , p_transform_param_list in varchar2 ) - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined is -- ORA-31642: the following SQL statement fails: @@ -5520,6 +5636,7 @@ $end where l.object_type || 'X' = t.object_type || 'X' -- null == null and l.object_schema || 'X' = t.object_schema || 'X' and l.base_object_schema || 'X' = t.base_object_schema || 'X' + and l.object_name is not null ) as oracle_tools.t_text_tab ) as object_name_tab , cast @@ -5555,7 +5672,7 @@ $end l_transform_param_tab t_transform_param_tab; - l_program constant varchar2(30 char) := 'GET_SCHEMA_DDL'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt + l_program constant t_module := 'GET_SCHEMA_DDL'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt -- dbms_application_info stuff l_longops_rec t_longops_rec; @@ -5565,10 +5682,10 @@ $end procedure init is - l_schema_object t_schema_object; - l_ref_constraint_object t_ref_constraint_object; + l_schema_object oracle_tools.t_schema_object; + l_ref_constraint_object oracle_tools.t_ref_constraint_object; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program || '.INIT'); $end @@ -5581,45 +5698,22 @@ $end begin l_schema_object := p_schema_object_tab(i_idx); - if p_new_schema is not null - then - -- If we are going to move to another schema, adjust all schema attributes because the DDL generated - -- will also be changed due to dbms_metadata.set_remap_param() being called. - if l_schema_object.object_schema() = p_schema - then - l_schema_object.object_schema(p_new_schema); - end if; - if l_schema_object.base_object_schema() = p_schema - then - l_schema_object.base_object_schema(p_new_schema); - end if; - if l_schema_object is of (t_ref_constraint_object) - then - l_ref_constraint_object := treat(l_schema_object as t_ref_constraint_object); - if l_ref_constraint_object.ref_object_schema() = p_schema - then - l_ref_constraint_object.ref_object_schema(p_new_schema); - l_schema_object := l_ref_constraint_object; - end if; - end if; - end if; - - l_schema_object.chk(nvl(p_new_schema, p_schema)); + l_schema_object.chk(p_schema); l_object_key := l_schema_object.id(); if not l_object_lookup_tab.exists(l_object_key) then - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( p_obj => l_schema_object - , p_ddl_tab => t_ddl_tab() + , p_ddl_tab => oracle_tools.t_ddl_tab() , p_schema_ddl => l_object_lookup_tab(l_object_key).schema_ddl ); else raise dup_val_on_index; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then l_schema_object.print(); $end @@ -5638,19 +5732,24 @@ $end end if; exception when others - then raise_application_error(-20000, 'Object id: ' || l_schema_object.id() || chr(10) || 'Object signature: ' || l_object_key, true); + then raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, 'Object id: ' || l_schema_object.id() || chr(10) || 'Object signature: ' || l_object_key, true); end; end loop; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; $end end init; procedure find_next_params is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program || '.FIND_NEXT_PARAMS'); $end -- now we are going to find an object type which has at least one object not ready @@ -5666,10 +5765,10 @@ $end while l_object_key is not null loop if not(l_object_lookup_tab(l_object_key).ready) and - l_object_key like t_schema_object.id('%', l_params_tab(l_params_idx).object_type, '%', '%', '%', '%', '%', '%', '%', '%') + l_object_key like oracle_tools.t_schema_object.id('%', l_params_tab(l_params_idx).object_type, '%', '%', '%', '%', '%', '%', '%', '%') then -- we must process this handle -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."warning" , 'Object %s not ready for schema %s and type %s' @@ -5684,7 +5783,7 @@ $end l_object_key := l_object_lookup_tab.next(l_object_key); end loop object_loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."info" , 'All objects found for schema %s and type %s' @@ -5693,12 +5792,17 @@ $if cfg_pkg.c_debugging $then ); $end end loop find_next_params_loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; + exception + when others + then + dbug.leave_on_error; + raise; $end end find_next_params; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then procedure chk is begin @@ -5720,27 +5824,31 @@ $if cfg_pkg.c_debugging $then then null; else - raise_application_error(-20000, 'No DDL retrieved for object ' || l_object_key); + raise_application_error(oracle_tools.pkg_ddl_error.c_no_ddl_retrieved, 'No DDL retrieved for object ' || l_object_key); end if; l_object_key := l_object_lookup_tab.next(l_object_key); end loop; dbug.leave; - end chk; -$end - + exception + when others + then + dbug.leave_on_error; + raise; + end chk; +$end + procedure cleanup is begin md_close(l_handle); end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); dbug.print ( dbug."input" - , 'p_schema: %s; p_new_schema: %s; p_use_schema_export: %s; p_schema_object_tab.count: %s' + , 'p_schema: %s; p_use_schema_export: %s; p_schema_object_tab.count: %s' , p_schema - , p_new_schema , p_use_schema_export , case when p_schema_object_tab is not null then p_schema_object_tab.count end ); @@ -5763,6 +5871,22 @@ $end r_params := l_params_tab(l_params_idx); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging > 1 $then + dbug.print + ( dbug."debug" + , 'r_params.object_type: %s; r_params.object_schema: %s; r_params.base_object_schema: %s: r_params.object_name_tab.count: %s; r_params.base_object_name_tab.count: %s' + , r_params.object_type + , r_params.object_schema + , r_params.base_object_schema + , r_params.object_name_tab.count + , r_params.base_object_name_tab.count + ); + dbug.print + ( dbug."debug" + , 'r_params.nr_objects: %s' + , r_params.nr_objects + ); +$end declare -- dbms_application_info stuff l_longops_type_rec t_longops_rec := @@ -5787,7 +5911,6 @@ $end , p_object_name_tab => r_params.object_name_tab , p_base_object_schema => r_params.base_object_schema , p_base_object_name_tab => r_params.base_object_name_tab - , p_new_object_schema => p_new_schema , p_transform_param_tab => l_transform_param_tab , p_handle => l_handle ); @@ -5809,12 +5932,15 @@ $end loop parse_object ( p_schema => p_schema - , p_new_schema => p_new_schema + , p_object_type => p_object_type + , p_object_names => p_object_names + , p_object_names_include => p_object_names_include , p_ku$_ddl => l_ddl_tab(i_ku$ddls_idx) , p_constraint_lookup_tab => l_constraint_lookup_tab , p_object_lookup_tab => l_object_lookup_tab , p_object_key => l_object_key ); + if l_object_key is not null then -- some checks @@ -5847,11 +5973,11 @@ $end exception when dup_val_on_index then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.on_error; $end raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_duplicate_item , 'Duplicate objects to be retrieved: type: ' || r_params.object_type || '; schema: ' || r_params.object_schema || '; base schema: ' || r_params.base_object_schema ); @@ -5861,7 +5987,7 @@ $end when others then -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.on_error; $end md_close(l_handle); @@ -5880,13 +6006,13 @@ $end longops_done(l_longops_open_rec); longops_done(l_longops_rec); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then chk; $end cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end @@ -5894,10 +6020,25 @@ $end return; -- essential for a pipelined function exception + when no_data_needed + then + cleanup; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; +$end + + when no_data_found + then + cleanup; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave_on_error; +$end + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); + when others then cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end raise; @@ -5918,12 +6059,11 @@ $end , p_transform_param_list in varchar2 ) is -$if not(dbms_db_version.ver_le_10) $then l_cursor sys_refcursor; -$end l_network_link all_db_links.db_link%type := null; + l_error_backtrace varchar2(32767 char) := null; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || 'SET_DISPLAY_DDL_SCHEMA_ARGS'); dbug.print(dbug."input" ,'p_schema: %s; p_new_schema: %s; p_sort_objects_by_deps: %s; p_object_type: %s; p_object_names: %s' @@ -5942,45 +6082,25 @@ $end if p_network_link is null then -$if dbms_db_version.ver_le_10 $then - select value(t) as schema_ddl - bulk collect - into g_schema_ddl_tab - from table - ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( p_schema - , p_new_schema - , p_sort_objects_by_deps - , p_object_type - , p_object_names - , p_object_names_include - , null -- p_network_link - , p_grantor_is_schema - , p_transform_param_list - ) - ) t; -$else open l_cursor for select value(t) as schema_ddl from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( p_schema - , p_new_schema - , p_sort_objects_by_deps - , p_object_type - , p_object_names - , p_object_names_include - , null -- p_network_link - , p_grantor_is_schema - , p_transform_param_list + ( p_schema => p_schema + , p_new_schema => p_new_schema + , p_sort_objects_by_deps => p_sort_objects_by_deps + , p_object_type => p_object_type + , p_object_names => p_object_names + , p_object_names_include => p_object_names_include + , p_network_link => null -- p_network_link + , p_grantor_is_schema => p_grantor_is_schema + , p_transform_param_list => p_transform_param_list ) ) t; -- PLS-00994: Cursor Variables cannot be declared as part of a package g_cursor := dbms_sql.to_cursor_number(l_cursor); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'sid: %s; g_cursor: %s', sys_context('userenv','sid'), g_cursor); -$end - $end else -- check whether database link exists @@ -5990,14 +6110,14 @@ $end if l_network_link is null then raise program_error; - else - l_network_link := '@' || l_network_link; end if; declare - l_statement constant varchar2(4000 char) := q'[ -begin - oracle_tools.pkg_ddl_util.set_display_ddl_schema_args]' || l_network_link || q'[ + l_statement constant varchar2(4000 char) := + utl_lms.format_message + ( ' +begin + oracle_tools.pkg_ddl_util.set_display_ddl_schema_args@%s ( p_schema => :b1 , p_new_schema => :b2 , p_sort_objects_by_deps => :b3 @@ -6008,17 +6128,32 @@ begin , p_grantor_is_schema => :b7 , p_transform_param_list => :b8 ); -end;]'; +exception + when others + then + :b9 := dbms_utility.format_error_backtrace; + raise; +end;' + , l_network_link + ); begin + oracle_tools.api_pkg.dbms_output_enable(l_network_link); + oracle_tools.api_pkg.dbms_output_clear(l_network_link); execute immediate l_statement - using p_schema, p_new_schema, p_sort_objects_by_deps, p_object_type, p_object_names, p_object_names_include, p_grantor_is_schema, p_transform_param_list; + using p_schema, p_new_schema, p_sort_objects_by_deps, p_object_type, p_object_names, p_object_names_include, p_grantor_is_schema, p_transform_param_list, out l_error_backtrace; + oracle_tools.api_pkg.dbms_output_flush(l_network_link); exception when others - then raise_application_error(-20000, l_statement, true); + then + oracle_tools.api_pkg.dbms_output_flush(l_network_link); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."error", 'error backtrace: %s', l_error_backtrace); +$end + raise_application_error(oracle_tools.pkg_ddl_error.c_execute_via_db_link, l_statement, true); end; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -6035,29 +6170,22 @@ $end -- Remark 2: A call to display_ddl_schema() with a database linke will invoke set_display_ddl_schema() at the remote database. */ function get_display_ddl_schema - return t_schema_ddl_tab + return oracle_tools.t_schema_ddl_tab pipelined is -$if not(dbms_db_version.ver_le_10) $then l_cursor sys_refcursor; - l_schema_ddl t_schema_ddl; -$end + l_schema_ddl oracle_tools.t_schema_ddl; + l_program constant t_module := 'GET_DISPLAY_DDL_SCHEMA'; -- geen schema omdat l_program in dbms_application_info wordt gebruikt + + -- dbms_application_info stuff + l_longops_rec t_longops_rec := longops_init(p_target_desc => l_program, p_op_name => 'fetch', p_units => 'objects'); begin -$if cfg_pkg.c_debugging $then - dbug.enter(g_package_prefix || 'GET_DISPLAY_DDL_SCHEMA'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || l_program); $end -$if dbms_db_version.ver_le_10 $then - if g_schema_ddl_tab is not null and g_schema_ddl_tab.count > 0 - then - for i_idx in g_schema_ddl_tab.first .. g_schema_ddl_tab.last - loop - pipe row (g_schema_ddl_tab(i_idx)); - end loop; - end if; -$else -- PLS-00994: Cursor Variables cannot be declared as part of a package -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."info", 'sid: %s; g_cursor: %s', sys_context('userenv','sid'), g_cursor); $end if g_cursor is null @@ -6070,451 +6198,254 @@ $end fetch l_cursor into l_schema_ddl; exit when l_cursor%notfound; pipe row (l_schema_ddl); + longops_show(l_longops_rec); end loop; close l_cursor; -$end -$if cfg_pkg.c_debugging $then + longops_done(l_longops_rec); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end + exception + when no_data_found + then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave_on_error; +$end + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); end get_display_ddl_schema; /* - -- Sorteer objecten op volgorde van afhankelijkheden. + -- Sort objects on dependencies */ function sort_objects_by_deps - ( p_cursor in sys_refcursor + ( p_schema_object_tab in oracle_tools.t_schema_object_tab , p_schema in t_schema_nn ) - return t_sort_objects_by_deps_tab + return oracle_tools.t_schema_object_tab pipelined is - -- bepaal dependencies gebaseerd op PL/SQL - cursor c_dependencies(b_schema in varchar2) is - select t.* - from ( select t.owner as object_owner - ,t.type as object_type - ,t.name as object_name - ,t.referenced_owner - ,t.referenced_type - ,t.referenced_name - from all_dependencies t - where t.owner = b_schema - and t.owner = t.referenced_owner - and t.referenced_link_name is null - union -$if not(pkg_ddl_util.c_#138707615_2) $then - -- bepaal dependencies gebaseerd op foreign key constraints - select t1.owner as object_owner - ,'TABLE' as object_type - ,t1.table_name as object_name - ,t2.owner as referenced_owner - ,'TABLE' as referenced_type - ,t2.table_name as referenced_name - from all_constraints t1 - inner join all_constraints t2 - on t2.owner = t1.r_owner - and t2.constraint_name = t1.r_constraint_name - where t1.owner = b_schema - and t1.owner = t2.owner /* same schema */ - and t1.constraint_type = 'R' + cursor c_dependencies is + with allowed_types as + ( select t.column_value as type + from table(g_schema_md_object_type_tab) t + ), deps as + ( select oracle_tools.t_schema_object.create_schema_object + ( d.owner + , oracle_tools.t_schema_object.dict2metadata_object_type(d.type) + , d.name + ) as obj -- a named object + , oracle_tools.t_schema_object.create_schema_object + ( d.referenced_owner + , oracle_tools.t_schema_object.dict2metadata_object_type(d.referenced_type) + , d.referenced_name + ) as ref_obj -- a named object + from all_dependencies d + where d.owner = p_schema + and d.referenced_owner = p_schema + -- ignore database links + and d.referenced_link_name is null + -- GJP 2021-08-30 Ignore synonyms: they will be created early like this (no dependencies hence dsort will put them in front) + and d.type != 'SYNONYM' + and d.referenced_type != 'SYNONYM' + and oracle_tools.t_schema_object.dict2metadata_object_type(d.type) in ( select t.type from allowed_types t ) + and oracle_tools.t_schema_object.dict2metadata_object_type(d.referenced_type) in ( select t.type from allowed_types t ) + union all +$if not(oracle_tools.pkg_ddl_util.c_#138707615_2) $then + -- dependencies based on foreign key constraints + select oracle_tools.t_schema_object.create_schema_object + ( t1.owner + , 'TABLE' -- already meta + , t1.table_name + ) as obj -- a named object + , oracle_tools.t_schema_object.create_schema_object + ( t2.owner + , 'TABLE' -- already meta + , t2.table_name + ) as ref_obj -- a named object + from all_constraints t1 + inner join all_constraints t2 + on t2.owner = t1.r_owner and t2.constraint_name = t1.r_constraint_name + where t1.owner = p_schema + and t1.owner = t2.owner /* same schema */ + and t1.constraint_type = 'R' $else - -- more simple: just the constraints - select c.owner as object_owner - ,'REF_CONSTRAINT' as object_type - ,c.constraint_name as object_name - ,c.r_owner as referenced_owner - ,'CONSTRAINT' as referenced_type - ,c.r_constraint_name as referenced_name - from all_constraints c - where c.owner = b_schema - and c.constraint_type = 'R' -$end - union - -- bepaal dependencies gebaseerd op indexen van een tabel - select i.owner as object_owner - ,'INDEX' as object_type - ,i.index_name as object_name - ,i.table_owner as referenced_owner - ,'TABLE' as referenced_type - ,i.table_name as referenced_name - from all_indexes i - where i.owner = b_schema - union - -- bepaal dependencies gebaseerd op indexen van een materialized view (niet PREBUILT) - select t1.owner as object_owner - ,'INDEX' as object_type - ,t1.index_name as object_name - ,t1.table_owner as referenced_owner - ,'MATERIALIZED VIEW' as referenced_type - ,t1.table_name as referenced_name - from all_indexes t1 - inner join all_mviews t2 - on t2.owner = t1.table_owner - and t2.mview_name = t1.table_name - where t1.owner = b_schema - and t2.build_mode != 'PREBUILT' - union - -- bepaal dependencies gebaseerd op objecten waarnaar wordt verwezen door synoniemen - select t1.owner as object_owner - ,'SYNONYM' as object_type - ,t1.synonym_name as object_name - ,t2.owner as referenced_owner - ,t2.object_type as referenced_type - ,t2.object_name as referenced_name - from all_synonyms t1 - inner join all_objects t2 - on t2.owner = t1.table_owner - and t2.object_name = t1.table_name - and t2.generated = 'N' -- GPA 2016-12-19 #136334705 - where t2.owner = b_schema - and t2.object_type not like '% BODY' - and t2.object_type != 'LOB' - union - -- bepaal dependencies gebaseerd op grants naar objecten -$if dbms_db_version.version >= 12 $then - -- from Oracle 12 on there is a type column in all_tab_privs - select t1.table_schema as owner - ,'GRANT' as object_type - ,t1.table_name as object_name - ,t1.table_schema as referenced_owner - ,t1.type as referenced_type - ,t1.table_name as referenced_name - from all_tab_privs t1 - where t1.table_schema = b_schema - and t1.type not like '% BODY' - and t1.type != 'LOB' -$else - select t1.table_schema as owner - ,'GRANT' as object_type - ,t1.table_name as object_name - ,t2.owner as referenced_owner - ,t2.object_type as referenced_type - ,t2.object_name as referenced_name - from all_tab_privs t1 - inner join all_objects t2 - on t2.owner = t1.table_schema - and t2.object_name = t1.table_name - and t2.generated = 'N' -- GPA 2016-12-19 #136334705 - where t2.owner = b_schema - and t2.object_type not like '% BODY' - and t2.object_type != 'LOB' -$end - union - -- bepaal dependencies gebaseerd op prebuilt tables - select t1.owner as object_owner - ,'MATERIALIZED VIEW' as object_type - ,t1.mview_name as object_name - ,t2.owner as referenced_owner - ,'TABLE' as referenced_type - ,t2.table_name as referenced_name - from all_mviews t1 - inner join all_tables t2 - on t2.owner = t1.owner - and t2.table_name = t1.mview_name - where t2.owner = b_schema - and t1.build_mode = 'PREBUILT' - union - -- bepaal dependencies gebaseerd op table comments - select t1.owner as object_owner - ,'COMMENT' as object_type - ,t1.table_name as object_name - ,t1.owner as referenced_owner - ,t1.table_type as referenced_type - ,t1.table_name as referenced_name - from all_tab_comments t1 - -- some SYS comments have no parent table/view - inner join all_objects t2 - on t2.owner = t1.owner and t2.object_name = t1.table_name and t2.generated = 'N' -- GPA 2016-12-19 #136334705 - where t1.owner = b_schema - union - -- bepaal dependencies gebaseerd op column comments - select t1.owner as object_owner - ,'COMMENT' as object_type - ,t1.table_name as object_name - ,t1.owner as referenced_owner - ,t2.object_type as referenced_type - ,t1.table_name as referenced_name - from all_col_comments t1 - -- some SYS comments have no parent table/view - inner join all_objects t2 - on t2.owner = t1.owner and t2.object_name = t1.table_name and t2.generated = 'N' -- GPA 2016-12-19 #136334705 - where t1.owner = b_schema - union - -- bepaal dependencies van tabellen/views met een type als attribuut - select t2.owner as object_owner - ,t2.object_type as object_type - ,t2.object_name as object_name - ,t1.data_type_owner as referenced_owner - ,'TYPE' as referenced_type - ,t1.data_type as referenced_name - from all_tab_columns t1 - inner join all_objects t2 - on t2.owner = t1.owner - and t2.object_name = t1.table_name - and t2.generated = 'N' -- GPA 2016-12-19 #136334705 - where t2.owner = b_schema - and t1.data_type_owner is not null - union - -- bepaal dependencies van constraints naar indexen - select t1.owner as object_owner - ,case t1.constraint_type when 'R' then 'REF_CONSTRAINT' else 'CONSTRAINT' end as object_type - ,t1.constraint_name as object_name - ,t1.index_owner as referenced_owner - ,'INDEX' as referenced_type - ,t1.index_name as referenced_name - from all_constraints t1 - where t1.owner = b_schema - and t1.index_owner is not null - and t1.index_name is not null - ) t - -- use subquery scalar cache - where ( select oracle_tools.pkg_ddl_util.is_exclude_name_expr(oracle_tools.t_schema_object.dict2metadata_object_type(t.object_type), t.object_name) from dual ) = 0 - and ( select oracle_tools.pkg_ddl_util.is_exclude_name_expr(oracle_tools.t_schema_object.dict2metadata_object_type(t.referenced_type), t.referenced_name) from dual ) = 0 + -- more simple: just the constraints + select oracle_tools.t_schema_object.create_schema_object + ( c.owner + , 'REF_CONSTRAINT' -- already meta + , c.constraint_name + , tc.owner + , oracle_tools.t_schema_object.dict2metadata_object_type(tc.object_type) + , tc.object_name + ) as obj -- belongs to a base table/mv + , oracle_tools.t_schema_object.create_schema_object + ( c.r_owner + , 'CONSTRAINT' -- already meta + , c.r_constraint_name + , tr.owner + , oracle_tools.t_schema_object.dict2metadata_object_type(tr.object_type) + , tr.object_name + ) as ref_obj -- belongs to a base table/mv + from all_constraints c + inner join all_objects tc + on tc.owner = c.owner and tc.object_name = c.table_name + inner join all_constraints r + on r.owner = c.r_owner and r.constraint_name = c.r_constraint_name + inner join all_objects tr + on tr.owner = r.owner and tr.object_name = r.table_name + where c.owner = p_schema + and c.constraint_type = 'R' + and oracle_tools.t_schema_object.dict2metadata_object_type(tc.object_type) in ( select t.type from allowed_types t ) + and oracle_tools.t_schema_object.dict2metadata_object_type(tr.object_type) in ( select t.type from allowed_types t ) +$end + union all + -- dependencies based on prebuilt tables + select oracle_tools.t_schema_object.create_schema_object + ( t1.owner + , 'MATERIALIZED_VIEW' -- already meta + , t1.mview_name + ) as obj -- a named object + , oracle_tools.t_schema_object.create_schema_object + ( t2.owner + , 'TABLE' -- already meta + , t2.table_name + ) as ref_obj -- a named object + from all_mviews t1 + inner join all_tables t2 + on t2.owner = t1.owner and t2.table_name = t1.mview_name + where t2.owner = p_schema + and t1.build_mode = 'PREBUILT' + union all + -- dependencies from constraints to indexes + select oracle_tools.t_schema_object.create_schema_object + ( c.owner + , case c.constraint_type when 'R' then 'REF_CONSTRAINT' else 'CONSTRAINT' end + , c.constraint_name + , tc.owner + , oracle_tools.t_schema_object.dict2metadata_object_type(tc.object_type) + , tc.object_name + ) as obj -- a named object + , oracle_tools.t_schema_object.create_schema_object + ( c.index_owner + , 'INDEX' + , c.index_name + , i.table_owner + , oracle_tools.t_schema_object.dict2metadata_object_type(i.table_type) + , i.table_name + ) as ref_obj -- a named object + from all_constraints c + inner join all_objects tc + on tc.owner = c.owner and tc.object_name = c.table_name + inner join all_indexes i + on i.owner = c.index_owner and i.index_name = c.index_name + where c.owner = p_schema + and c.index_owner is not null + and c.index_name is not null + and oracle_tools.t_schema_object.dict2metadata_object_type(tc.object_type) in ( select t.type from allowed_types t ) + and oracle_tools.t_schema_object.dict2metadata_object_type(i.table_type) in ( select t.type from allowed_types t ) + ) + select t1.* + from deps t1 + inner join ( select value(t2) as obj from table(p_schema_object_tab) t2 ) t2 + on t2.obj = t1.obj + inner join ( select value(t3) as ref_obj from table(p_schema_object_tab) t3 ) t3 + on t3.ref_obj = t1.ref_obj ; - l_object_tab dbms_sql.varchar2_table; -- objects returned by p_cursor - l_object_lookup_tab t_object_natural_tab; -- objects returned by p_cursor - l_object_by_dep_tab dbms_sql.varchar2_table; -- hoe eerder, hoe minder dependencies + type t_schema_object_lookup_tab is table of oracle_tools.t_schema_object index by t_object; - -- l_object_dependency_tab(obj1)(obj2) = true means obj1 depends on obj2 + -- l_schema_object_lookup_tab(object.id) = object; + l_schema_object_lookup_tab t_schema_object_lookup_tab; + + -- l_object_dependency_tab(obj1)(obj2) = true means obj1 must be created before obj2 l_object_dependency_tab t_object_dependency_tab; - l_owner all_dependencies.owner%type; - l_type t_metadata_object_type; - l_name t_object_name; - l_referenced_owner all_dependencies.referenced_owner%type; - l_referenced_type all_dependencies.referenced_type%type; - l_referenced_name t_object_name; + l_object_by_dep_tab dbms_sql.varchar2_table; - l_object t_object; - l_object_dependency t_object; - l_idx pls_integer; - - l_program constant varchar2(30 char) := 'SORT_OBJECTS_BY_DEPS'; + l_schema_object oracle_tools.t_schema_object; + + l_program constant t_module := 'SORT_OBJECTS_BY_DEPS'; -- dbms_application_info stuff l_longops_rec t_longops_rec := longops_init(p_target_desc => l_program, p_units => 'objects'); - - procedure add_dependencies - is - l_owner_tab dbms_sql.varchar2_table; - l_type_tab dbms_sql.varchar2_table; - l_name_tab dbms_sql.varchar2_table; - l_referenced_owner_tab dbms_sql.varchar2_table; - l_referenced_type_tab dbms_sql.varchar2_table; - l_referenced_name_tab dbms_sql.varchar2_table; - begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter(g_package_prefix || l_program || '.ADD_DEPENDENCIES'); -$end - open c_dependencies(p_schema); - fetch c_dependencies - bulk collect - into l_owner_tab - , l_type_tab - , l_name_tab - , l_referenced_owner_tab - , l_referenced_type_tab - , l_referenced_name_tab; - close c_dependencies; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", 'number of dependencies: %s', l_owner_tab.count); -$end - - if l_owner_tab.count > 0 - then - for i_idx in l_owner_tab.first .. l_owner_tab.last - loop - l_owner := l_owner_tab(i_idx); - l_type := l_type_tab(i_idx); - l_name := l_name_tab(i_idx); - l_referenced_owner := l_referenced_owner_tab(i_idx); - l_referenced_type := l_referenced_type_tab(i_idx); - l_referenced_name := l_referenced_name_tab(i_idx); - - -- sanity checks - if l_owner is null - then - raise program_error; - elsif l_type is null - then - raise program_error; - elsif l_name is null - then - raise program_error; - elsif l_referenced_owner is null - then - raise program_error; - elsif l_referenced_type is null - then - raise program_error; - elsif l_referenced_name is null - then - raise program_error; - end if; - - l_object := get_object(l_owner, t_schema_object.dict2metadata_object_type(l_type), l_name); - l_object_dependency := get_object(l_referenced_owner - ,t_schema_object.dict2metadata_object_type(l_referenced_type) - ,l_referenced_name); - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", '%s depends on %s', l_object, l_object_dependency); -$end - - -- Zowel object als dependency moeten aangeleverd zijn. - if not(l_object_lookup_tab.exists(l_object)) - then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", '%s not delivered', l_object); -$else - null; -$end - elsif not(l_object_lookup_tab.exists(l_object_dependency)) - then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", '%s not delivered', l_object_dependency); -$else - null; -$end - else - -- l_object hangt af van l_object_dependency. - l_object_dependency_tab(l_object_dependency)(l_object) := null; - end if; - end loop; - end if; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.leave; - exception - when program_error - then - dbug.print(dbug."error", 'l_owner: %s; l_type: %s; l_name: %s', l_owner, l_type, l_name); - dbug.print(dbug."error", 'l_referenced_owner: %s; l_referenced_type: %s; l_referenced_name: %s', l_referenced_owner, l_referenced_type, l_referenced_name); - dbug.leave_on_error; - raise; -$end - end add_dependencies; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); - dbug.print(dbug."input", 'p_schema: %s', p_schema); + dbug.print(dbug."input", 'p_schema: %s; p_schema_object_tab.count: %s', p_schema, p_schema_object_tab.count); + dbug.print(dbug."input", 'p_schema_object_tab(1).id: %s', case when p_schema_object_tab.count > 0 then p_schema_object_tab(1).id end); $end - -- cursor p_cursor is already open - <> - loop - fetch p_cursor - into l_owner - ,l_type - ,l_name; - - exit fetch_loop when p_cursor%notfound; - - l_object_tab(l_object_tab.count + 1) := get_object(l_owner, l_type, l_name); - l_object_lookup_tab(l_object_tab(l_object_tab.count + 0)) := 1; - end loop fetch_loop; - - close p_cursor; + if p_schema_object_tab.count > 0 + then + for i_idx in p_schema_object_tab.first .. p_schema_object_tab.last + loop + l_schema_object_lookup_tab(p_schema_object_tab(i_idx).id) := p_schema_object_tab(i_idx); + -- objects without dependencies must be part of this list too + l_object_dependency_tab(p_schema_object_tab(i_idx).id) := c_object_no_dependencies_tab; + end loop; + end if; - add_dependencies; + for r in c_dependencies + loop + -- object depends on object dependency so the latter must be there first + l_object_dependency_tab(r.ref_obj.id)(r.obj.id) := null; + end loop; - begin - tsort(l_object_dependency_tab, l_object_by_dep_tab); - exception - when e_not_a_directed_acyclic_graph - then - l_object_by_dep_tab := l_object_tab; - end; + dsort(l_object_dependency_tab, l_object_by_dep_tab); if l_object_by_dep_tab.count > 0 then - declare - l_str_tab dbms_sql.varchar2a; - l_sort_objects_by_deps_rec t_sort_objects_by_deps_rec := t_sort_objects_by_deps_rec(null, null, null, null, 0); - begin - for i_idx in l_object_by_dep_tab.first .. l_object_by_dep_tab.last - loop - l_object := l_object_by_dep_tab(i_idx); - - pkg_str_util.split(p_str => l_object, p_delimiter => '.', p_str_tab => l_str_tab); - - l_sort_objects_by_deps_rec.object_schema := l_str_tab(1); -- trim('"' from l_str_tab(1)); - l_sort_objects_by_deps_rec.object_type := l_str_tab(2); - l_sort_objects_by_deps_rec.object_name := l_str_tab(3); -- trim('"' from l_str_tab(3)); - l_sort_objects_by_deps_rec.dependency_list := null; - -- GPA 2016-12-12 #135961579 - l_sort_objects_by_deps_rec.nr := l_sort_objects_by_deps_rec.nr + 1; - - pipe row(l_sort_objects_by_deps_rec); - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print - ( dbug."info" - , 'l_sort_objects_by_deps_rec; object_schema: %s; object_type: %s; object_name: %s; nr: %s' - , l_sort_objects_by_deps_rec.object_schema - , l_sort_objects_by_deps_rec.object_type - , l_sort_objects_by_deps_rec.object_name - , l_sort_objects_by_deps_rec.nr - ); -$end + for i_idx in l_object_by_dep_tab.first .. l_object_by_dep_tab.last + loop + l_schema_object := l_schema_object_lookup_tab(l_object_by_dep_tab(i_idx)); + + pipe row(l_schema_object); - longops_show(l_longops_rec); - end loop; - end; + longops_show(l_longops_rec); + end loop; end if; + -- GJP 2021-08-28 + -- TO DO: rest of objects + -- 100% longops_done(l_longops_rec); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end return; -- essential for a pipelined function exception - when no_data_needed then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.leave_on_error; + when no_data_needed + then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; $end null; -- not a real error, just a way to some cleanup when no_data_found -- verdwijnt anders in het niets omdat het een pipelined function betreft die al data ophaalt - then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then + then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end - raise program_error; + raise_application_error(oracle_tools.pkg_ddl_error.c_reraise_with_backtrace, l_program, true); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - when others then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + when others + then dbug.leave_on_error; raise; $end end sort_objects_by_deps; - procedure init_clob is - begin - dbms_lob.trim(g_clob, 0); - end init_clob; - - procedure append_clob(p_line in varchar2) is - begin - dbms_lob.writeappend(lob_loc => g_clob, amount => length(p_line || chr(10)), buffer => p_line || chr(10)); - end append_clob; - - function get_clob return clob is - begin - return g_clob; - end get_clob; - procedure migrate_schema_ddl - ( p_source in t_schema_ddl - , p_target in t_schema_ddl - , p_schema_ddl in out nocopy t_schema_ddl + ( p_source in oracle_tools.t_schema_ddl + , p_target in oracle_tools.t_schema_ddl + , p_schema_ddl in out nocopy oracle_tools.t_schema_ddl ) is l_line_tab dbms_sql.varchar2a; @@ -6531,19 +6462,19 @@ $end null; end cleanup; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'MIGRATE_SCHEMA_DDL'); $end - pkg_str_util.text2clob(p_source.ddl_tab(1).text, l_source_text); - pkg_str_util.text2clob(p_target.ddl_tab(1).text, l_target_text); + oracle_tools.pkg_str_util.text2clob(p_source.ddl_tab(1).text, l_source_text); + oracle_tools.pkg_str_util.text2clob(p_target.ddl_tab(1).text, l_target_text); - pkg_str_util.split + oracle_tools.pkg_str_util.split ( p_str => l_source_text , p_delimiter => chr(10) , p_str_tab => l_source_line_tab ); - pkg_str_util.split + oracle_tools.pkg_str_util.split ( p_str => l_target_text , p_delimiter => chr(10) , p_str_tab => l_target_line_tab @@ -6567,86 +6498,20 @@ $end cleanup; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end exception when others then cleanup; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave_on_error; $end raise; end migrate_schema_ddl; - function modify_ddl_text - ( p_ddl_text in clob - , p_schema in t_schema_nn - , p_new_schema in t_schema - , p_object_type in t_metadata_object_type - ) - return clob - is - l_ddl_text clob := null; - begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter(g_package_prefix || 'MODIFY_DDL_TEXT'); - dbug.print - ( dbug."input" - , 'p_schema: %s; p_new_schema: %s; p_object_type: %s; p_ddl_text: %s' - , p_schema - , p_new_schema - , p_object_type - , substr(p_ddl_text, 1, 255) - ); -$end - - l_ddl_text := p_ddl_text; - - /* - ON ""."
" must be replaced by ON "EMPTY"."
" - - CREATE OR REPLACE EDITIONABLE TRIGGER "EMPTY"."" - BEFORE INSERT OR DELETE OR UPDATE ON ""."
" - REFERENCING FOR EACH ROW - */ - if p_schema <> p_new_schema - then - l_ddl_text := - replace - ( replace - ( replace - ( l_ddl_text - , '"' || p_schema || '"' - , '"' || p_new_schema || '"' - ) - , ' ' || p_schema || '.' - , ' ' || p_new_schema || '.' - ) - , ' ' || lower(p_schema) || '.' - , ' ' || lower(p_new_schema) || '.' - ) - ; - end if; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."output", 'return: %s', substr(l_ddl_text, 1, 255)); - dbug.leave; -$end - - return l_ddl_text; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - exception - when others - then - dbug.leave_on_error; - raise; -$end - end modify_ddl_text; - -$if cfg_pkg.c_testing $then +$if oracle_tools.cfg_pkg.c_testing $then /* -- GPA 2015-12-22 @@ -6671,7 +6536,7 @@ $if cfg_pkg.c_testing $then ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'SKIP_WS_LINES_AROUND'); dbug.print(dbug."input", 'p_text_tab.count: %s; p_text_tab.first: %s; p_text_tab.last: %s', p_text_tab.count, p_text_tab.first, p_text_tab.last); $end @@ -6682,7 +6547,7 @@ $end loop if p_first <= p_last then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", 'p_text_tab(%s): "%s"', p_first, case when p_text_tab.exists(p_first) then p_text_tab(p_first) else '' end); $end if p_text_tab.exists(p_first) and trim(p_text_tab(p_first)) is null @@ -6730,7 +6595,7 @@ $end end if; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'p_text_tab.count: %s; p_first: %s; p_last: %s', p_text_tab.count, p_first, p_last); dbug.leave; exception @@ -6755,7 +6620,7 @@ $end return clob is l_metadata_object_type constant t_metadata_object_type := - t_schema_object.dict2metadata_object_type + oracle_tools.t_schema_object.dict2metadata_object_type ( case when p_object_type in ('TYPE', 'PACKAGE') then p_object_type || '_SPEC' @@ -6778,7 +6643,7 @@ $end return null; end; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.enter(g_package_prefix || 'GET_SOURCE'); dbug.print(dbug."input", 'p_owner: %s; p_object_type: %s; p_object_name: %s', p_owner, p_object_type, p_object_name); $end @@ -6786,7 +6651,7 @@ $end -- set transformation parameters for the dbms_metadata.get_xxx functions md_set_transform_param; - pkg_str_util.split + oracle_tools.pkg_str_util.split ( p_str => get_ddl , p_delimiter => chr(10) , p_str_tab => p_line_tab @@ -6796,7 +6661,7 @@ $end skip_ws_lines_around(p_line_tab, p_first, p_last); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'p_line_tab.count: %s; p_first: %s; p_last: %s', p_line_tab.count, p_first, p_last); dbug.leave; exception @@ -6819,9 +6684,11 @@ $end is l_idx1 pls_integer := p_first1; l_idx2 pls_integer := p_first2; + l_line1 varchar2(32767 char); + l_line2 varchar2(32767 char); l_result boolean := true; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || 'EQ'); dbug.print(dbug."input", 'p_line1_tab.count: %s; p_first1: %s; p_last1: %s', p_line1_tab.count, p_first1, p_last1); dbug.print(dbug."input", 'p_line2_tab.count: %s; p_first2: %s; p_last2: %s', p_line2_tab.count, p_first2, p_last2); @@ -6833,7 +6700,7 @@ $end null; else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'p_first1: ' || p_first1 || '; p_line1_tab.first: ' || p_line1_tab.first || '; p_last1: ' || p_last1 || '; p_line1_tab.last: ' || p_line1_tab.last ); @@ -6845,7 +6712,7 @@ $end null; else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'p_first2: ' || p_first2 || '; p_line2_tab.first: ' || p_line2_tab.first || '; p_last2: ' || p_last2 || '; p_line2_tab.last: ' || p_line2_tab.last ); @@ -6854,18 +6721,24 @@ $end <> while l_result and (l_idx1 <= p_last1 or l_idx2 <= p_last2) loop - if (l_idx1 <= p_last1 and l_idx2 <= p_last2) and - ( ( ( not(p_line1_tab.exists(l_idx1)) or p_line1_tab(l_idx1) is null ) and - ( not(p_line2_tab.exists(l_idx2)) or p_line2_tab(l_idx2) is null ) ) or - ( p_line1_tab.exists(l_idx1) and - p_line2_tab.exists(l_idx2) and - p_line1_tab(l_idx1) = p_line2_tab(l_idx2) ) ) + l_line1 := case when l_idx1 <= p_last1 and p_line1_tab.exists(l_idx1) then p_line1_tab(l_idx1) else null end; + l_line2 := case when l_idx2 <= p_last2 and p_line2_tab.exists(l_idx2) then p_line2_tab(l_idx2) else null end; + if ( l_line1 is null and l_line2 is null ) or l_line1 = l_line2 then null; -- lines equal + elsif l_line1 is null and l_line2 like 'ALTER TRIGGER % ENABLE' or + l_line2 is null and l_line1 like 'ALTER TRIGGER % ENABLE' + then + -- GJP 2021-08-27 Ignore this special case + -- + -- warning: difference found: + -- warning: p_line1_tab(38): "" + -- warning: p_line2_tab(39): "ALTER TRIGGER "ORACLE_TOOLS"."UI_APEX_MESSAGES_TRG" ENABLE" + null; else -- one line does not exist or the lines are not equal l_result := false; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."warning" , 'difference found:' @@ -6874,13 +6747,13 @@ $if cfg_pkg.c_debugging $then ( dbug."warning" , 'p_line1_tab(%s): "%s"' , l_idx1 - , case when p_line1_tab.exists(l_idx1) then p_line1_tab(l_idx1) else '' end + , l_line1 ); dbug.print ( dbug."warning" , 'p_line2_tab(%s): "%s"' , l_idx2 - , case when p_line2_tab.exists(l_idx2) then p_line2_tab(l_idx2) else '' end + , l_line2 ); $end end if; @@ -6888,14 +6761,14 @@ $end l_idx2 := l_idx2 + 1; end loop line_loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print(dbug."output", 'return: %s', l_result); dbug.leave; $end return l_result; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then exception when others then @@ -6904,21 +6777,72 @@ $if cfg_pkg.c_debugging $then $end end eq; --- $if cfg_pkg.c_testing $then + procedure cleanup_empty + is + l_drop_schema_ddl_tab oracle_tools.t_schema_ddl_tab; + l_network_link_target constant t_network_link := g_empty; -- in order to have the same privileges + l_program constant t_module := 'CLEANUP_EMPTY'; + begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.enter(l_program); +$end + + uninstall + ( p_schema_target => g_empty + , p_network_link_target => l_network_link_target + ); - -- test functions - procedure ut_setup + -- drop objects which are excluded in get_schema_object() + l_drop_schema_ddl_tab := oracle_tools.t_schema_ddl_tab(); + for r in + ( select oracle_tools.t_schema_ddl.create_schema_ddl + ( p_obj => oracle_tools.t_named_object.create_named_object + ( p_object_type => o.object_type + , p_object_schema => o.object_schema + , p_object_name => o.object_name + ) + , p_ddl_tab => oracle_tools.t_ddl_tab() + ) as obj + from ( select o.owner as object_schema + , oracle_tools.t_schema_object.dict2metadata_object_type(o.object_type) as object_type + , o.object_name + from all_objects o + where o.owner = g_empty + ) o + where (select oracle_tools.pkg_ddl_util.is_dependent_object_type(p_object_type => o.object_type) from dual) = 0 + ) + loop + l_drop_schema_ddl_tab.extend(1); + create_schema_ddl + ( p_source_schema_ddl => null + , p_target_schema_ddl => r.obj + , p_skip_repeatables => 0 + , p_schema_ddl => l_drop_schema_ddl_tab(l_drop_schema_ddl_tab.last) + ); + end loop; + + execute_ddl(l_drop_schema_ddl_tab, l_network_link_target); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; +$end + exception + when others + then + null; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.leave; +$end + end cleanup_empty; + + procedure ut_cleanup_empty is + pragma autonomous_transaction; + l_found pls_integer; - l_cursor sys_refcursor; - l_loopback_global_name global_name.global_name%type; begin - select t.table_owner - into g_owner_utplsql - from all_synonyms t - where t.table_name = 'UT'; - begin + -- schema EMPTY should exist select 1 into l_found from all_users @@ -6926,12 +6850,52 @@ $end ; exception when no_data_found - then raise_application_error(-20000, 'User EMPTY must exist', true); + then raise_application_error(oracle_tools.pkg_ddl_error.c_missing_schema, 'User EMPTY must exist', true); + end; + + begin + cleanup_empty; + exception + when others + then null; + end; + + -- schema EMPTY should be empty now + begin + select 1 + into l_found + from all_objects o + where o.owner = g_empty + and rownum = 1 + ; + raise too_many_rows; + exception + when no_data_found + then null; + when too_many_rows + then raise_application_error(oracle_tools.pkg_ddl_error.c_schema_not_empty, 'User EMPTY should have NO objects', true); end; + commit; + end ut_cleanup_empty; + + -- test functions + procedure ut_setup + is + pragma autonomous_transaction; + + l_found pls_integer; + l_cursor sys_refcursor; + l_loopback_global_name global_name.global_name%type; + begin + select t.table_owner + into g_owner_utplsql + from all_synonyms t + where t.table_name = 'UT'; + if get_db_link(g_empty) is null then - raise_application_error(-20000, 'Database link EMPTY must exist'); + raise_application_error(oracle_tools.pkg_ddl_error.c_missing_db_link, 'Database link EMPTY must exist'); end if; begin @@ -6954,18 +6918,26 @@ $end exception when no_data_found then - raise_application_error(-20000, 'Private database link LOOPBACK should point to this schema and database.', true); + raise_application_error(oracle_tools.pkg_ddl_error.c_wrong_db_link, 'Private database link LOOPBACK should point to this schema and database.', true); end; + + commit; end ut_setup; procedure ut_teardown is + pragma autonomous_transaction; + begin null; + + commit; end ut_teardown; procedure ut_display_ddl_schema is + pragma autonomous_transaction; + l_line1_tab dbms_sql.varchar2a; l_clob1 clob := null; l_first1 pls_integer := null; @@ -6975,7 +6947,7 @@ $end l_first2 pls_integer := null; l_last2 pls_integer := null; - l_schema_ddl_tab t_schema_ddl_tab; + l_schema_ddl_tab oracle_tools.t_schema_ddl_tab; l_schema t_schema; l_object_names_include t_numeric_boolean; @@ -6995,20 +6967,20 @@ $end select value(t) from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( b_schema - , b_new_schema - , b_sort_objects_by_deps - , b_object_type - , b_object_names - , b_object_names_include - , b_network_link - , b_grantor_is_schema + ( p_schema => b_schema + , p_new_schema => b_new_schema + , p_sort_objects_by_deps => b_sort_objects_by_deps + , p_object_type => b_object_type + , p_object_names => b_object_names + , p_object_names_include => b_object_names_include + , p_network_link => b_network_link + , p_grantor_is_schema => b_grantor_is_schema ) ) t ; -- dbms_application_info stuff - l_program constant varchar2(61 char) := 'UT_DISPLAY_DDL_SCHEMA'; + l_program constant t_module := 'UT_DISPLAY_DDL_SCHEMA'; l_longops_rec t_longops_rec; c_no_exception_raised constant integer := -20001; @@ -7016,7 +6988,7 @@ $end procedure chk ( p_description in varchar2 , p_sqlcode_expected in integer - , p_schema in varchar2 default user + , p_schema in varchar2 default g_owner , p_new_schema in varchar2 default null , p_sort_objects_by_deps in number default 0 , p_object_type in varchar2 default null @@ -7027,7 +6999,7 @@ $end ) is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program || '.CHK'); dbug.print ( dbug."input" @@ -7066,7 +7038,7 @@ $end when others then if c_display_ddl_schema%isopen then close c_display_ddl_schema; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end ut.expect(sqlcode, l_program || '#' || p_description).to_equal(p_sqlcode_expected); @@ -7101,7 +7073,7 @@ $end end if; end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); $end @@ -7146,9 +7118,9 @@ $end ( p_description => 'Sort_objects_by_deps (' || r.column_value || ')' , p_sqlcode_expected => case when r.column_value is null then -6502 -- VALUE_ERROR want NATURALN staat null niet toe - when r.column_value in (0, 1) then c_object_names_wrong + when r.column_value in (0, 1) then oracle_tools.pkg_ddl_error.c_object_names_wrong when r.column_value < 0 then -6502 -- VALUE_ERROR want NATURALN staat negatieve getallen niet toe - else c_numeric_boolean_wrong + else oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong end , p_sort_objects_by_deps => r.column_value , p_object_names => 'ABC' @@ -7157,13 +7129,13 @@ $end chk ( p_description => 'Indien p_object_names niet leeg is en p_object_names_include leeg.' - , p_sqlcode_expected => c_object_names_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_object_names_wrong , p_object_names => 'ABC' ); chk ( p_description => 'Indien p_object_names niet leeg is en p_object_names_include niet leeg en niet in (0, 1).' - , p_sqlcode_expected => c_numeric_boolean_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong , p_object_names => 'ABC' , p_object_names_include => 2 ); @@ -7177,7 +7149,7 @@ $end chk ( p_description => 'Indien p_object_names leeg is en p_object_names_include niet leeg.' - , p_sqlcode_expected => c_object_names_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_object_names_wrong , p_object_names => null , p_object_names_include => 0 ); @@ -7201,7 +7173,7 @@ $end when r.column_value is null then -6502 -- VALUE_ERROR want NATURALN staat null niet toe when r.column_value in (0, 1) then c_no_exception_raised when r.column_value < 0 then -6502 -- VALUE_ERROR want NATURALN staat negatieve getallen niet toe - else c_numeric_boolean_wrong + else oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong end , p_grantor_is_schema => r.column_value , p_object_names => 'ABC' @@ -7209,7 +7181,7 @@ $end ); end loop; - -- The PKG_DDL_UTIL PACKAGE_SPEC must be created first for an empty schema + -- The oracle_tools.pkg_ddl_util PACKAGE_SPEC must be created first for an empty schema begin if l_clob1 is not null then @@ -7219,23 +7191,23 @@ $end ( select u.text from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( g_owner - , null - , 1 - , null - , g_package - , 1 - , null - , 0 + ( p_schema => g_owner + , p_new_schema => null + , p_sort_objects_by_deps => 1 + , p_object_type => null + , p_object_names => g_package + , p_object_names_include => 1 + , p_network_link => null + , p_grantor_is_schema => 0 ) ) t , table(t.ddl_tab) u where t.obj.object_type() <> 'OBJECT_GRANT' ) loop - pkg_str_util.text2clob(r.text, l_clob1, true); + oracle_tools.pkg_str_util.text2clob(r.text, l_clob1, true); end loop; - pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line1_tab, p_delimiter => chr(10)); + oracle_tools.pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line1_tab, p_delimiter => chr(10)); if l_clob2 is not null then @@ -7245,23 +7217,23 @@ $end ( select u.text from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( g_owner - , g_empty - , 1 - , null - , g_package - , 1 - , null - , 0 + ( p_schema => g_owner + , p_new_schema => g_empty + , p_sort_objects_by_deps => 1 + , p_object_type => null + , p_object_names => g_package + , p_object_names_include => 1 + , p_network_link => null + , p_grantor_is_schema => 0 ) ) t , table(t.ddl_tab) u where t.obj.object_type() <> 'OBJECT_GRANT' ) loop - pkg_str_util.text2clob(r.text, l_clob2, true); + oracle_tools.pkg_str_util.text2clob(r.text, l_clob2, true); end loop; - pkg_str_util.split(p_str => l_clob2, p_str_tab => l_line2_tab, p_delimiter => chr(10)); + oracle_tools.pkg_str_util.split(p_str => l_clob2, p_str_tab => l_line2_tab, p_delimiter => chr(10)); if (l_line1_tab.first is null and l_line2_tab.first is null) or l_line1_tab.first = l_line2_tab.first then @@ -7275,19 +7247,9 @@ $end if l_line1_tab.exists(i_line_idx) and l_line2_tab.exists(i_line_idx) then - begin - l_line1_tab(i_line_idx) := modify_ddl_text(p_ddl_text => l_line1_tab(i_line_idx), p_schema => g_owner, p_new_schema => g_empty); + l_line1_tab(i_line_idx) := modify_ddl_text(p_ddl_text => l_line1_tab(i_line_idx), p_schema => g_owner, p_new_schema => g_empty); - ut.expect(l_line1_tab(i_line_idx), l_program || '#' || g_owner || '#' || g_package || '#line ' || i_line_idx).to_equal(l_line2_tab(i_line_idx)); -$if cfg_pkg.c_debugging $then - exception - when others - then - dbug.print(dbug."info", 'l_line1_tab(%s): %s', i_line_idx, l_line1_tab(i_line_idx)); - dbug.print(dbug."info", 'l_line2_tab(%s): %s', i_line_idx, l_line2_tab(i_line_idx)); - raise; -$end - end; + ut.expect(l_line1_tab(i_line_idx), l_program || '#' || g_owner || '#' || g_package || '#line ' || i_line_idx).to_equal(l_line2_tab(i_line_idx)); elsif l_line1_tab.exists(i_line_idx) then ut.expect(l_line1_tab(i_line_idx), l_program || '#' || g_owner || '#' || g_package || '#line ' || i_line_idx).to_be_null(); @@ -7343,7 +7305,7 @@ $end l_longops_rec := longops_init(p_op_name => 'Test', p_units => 'objects', p_target_desc => l_program, p_totalwork => r.total); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."info" , 'r.owner: %s; r.object_type: %s; r.object_name: %s' @@ -7368,14 +7330,14 @@ $end , u.text from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( r.owner - , null - , 0 - , oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type) - , r.object_name - , 1 - , case when i_try = 2 then g_loopback end - , 0 + ( p_schema => r.owner + , p_new_schema => null + , p_sort_objects_by_deps => 0 + , p_object_type => oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type) + , p_object_names => r.object_name + , p_object_names_include => 1 + , p_network_link=> case when i_try = 2 then g_loopback end + , p_grantor_is_schema => 0 ) ) t , table(t.ddl_tab) u @@ -7396,7 +7358,7 @@ $end , u.ddl#() ) loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."info" , 'r_text.object_schema: %s; r_text.object_type: %s; r_text.object_name: %s' @@ -7406,12 +7368,12 @@ $if cfg_pkg.c_debugging $then ); $end - pkg_str_util.text2clob(r_text.text, l_clob1, true); + oracle_tools.pkg_str_util.text2clob(r_text.text, l_clob1, true); end loop; -- Copy all lines from l_clob1 to l_line1_tab but skip empty lines for comments. -- So we use an intermediary l_line2_tab first. - pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line2_tab, p_delimiter => chr(10)); + oracle_tools.pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line2_tab, p_delimiter => chr(10)); l_line1_tab.delete; for i_idx in l_line2_tab.first .. l_line2_tab.last loop @@ -7456,14 +7418,16 @@ $end cleanup; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end exception when others then cleanup; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave_on_error; $end raise; @@ -7471,6 +7435,8 @@ $end procedure ut_display_ddl_schema_diff is + pragma autonomous_transaction; + l_line1_tab dbms_sql.varchar2a; l_clob1 clob := null; l_first1 pls_integer := null; @@ -7479,7 +7445,7 @@ $end l_first2 pls_integer := null; l_last2 pls_integer := null; - l_schema_ddl_tab t_schema_ddl_tab; + l_schema_ddl_tab oracle_tools.t_schema_ddl_tab; cursor c_display_ddl_schema_diff ( b_object_type in varchar2 @@ -7495,20 +7461,20 @@ $end select value(t) from table ( oracle_tools.pkg_ddl_util.display_ddl_schema_diff - ( b_object_type - , b_object_names - , b_object_names_include - , b_schema_source - , b_schema_target - , b_network_link_source - , b_network_link_target - , b_skip_repeatables + ( p_object_type => b_object_type + , p_object_names => b_object_names + , p_object_names_include => b_object_names_include + , p_schema_source => b_schema_source + , p_schema_target => b_schema_target + , p_network_link_source => b_network_link_source + , p_network_link_target => b_network_link_target + , p_skip_repeatables => b_skip_repeatables ) ) t ; -- dbms_application_info stuff - l_program constant varchar2(61 char) := 'UT_DISPLAY_DDL_SCHEMA_DIFF'; + l_program constant t_module := 'UT_DISPLAY_DDL_SCHEMA_DIFF'; l_longops_rec t_longops_rec; c_no_exception_raised constant integer := -20001; @@ -7519,15 +7485,15 @@ $end , p_object_type in varchar2 default null , p_object_names in varchar2 default null , p_object_names_include in number default null - , p_schema_source in varchar2 default user - , p_schema_target in varchar2 default user + , p_schema_source in varchar2 default g_owner + , p_schema_target in varchar2 default g_owner , p_network_link_source in varchar2 default null , p_network_link_target in varchar2 default null , p_skip_repeatables in number default 1 ) is begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program || '.CHK'); dbug.print ( dbug."input" @@ -7567,7 +7533,7 @@ $end when others then if c_display_ddl_schema_diff%isopen then close c_display_ddl_schema_diff; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end ut.expect(sqlcode, l_program || '#' || p_description).to_equal(p_sqlcode_expected); @@ -7583,19 +7549,19 @@ $end end if; end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); $end chk ( p_description => 'Indien p_object_names niet leeg is en p_object_names_include leeg.' - , p_sqlcode_expected => c_object_names_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_object_names_wrong , p_object_names => 'ABC' ); chk ( p_description => 'Indien p_object_names niet leeg is en p_object_names_include niet leeg en niet in (0, 1).' - , p_sqlcode_expected => c_numeric_boolean_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong , p_object_names => 'ABC' , p_object_names_include => 2 ); @@ -7609,13 +7575,13 @@ $end chk ( p_description => 'Indien p_object_names leeg is en p_object_names_include niet leeg.' - , p_sqlcode_expected => c_object_names_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_object_names_wrong , p_object_names_include => 1 ); chk ( p_description => 'Indien p_schema_source leeg is en p_network_link_source niet leeg.' - , p_sqlcode_expected => c_schema_wrong + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_schema_wrong , p_schema_source => null , p_network_link_source => g_dbname ); @@ -7640,20 +7606,20 @@ $end chk ( p_description => 'source en target zijn gelijk.' - , p_sqlcode_expected => c_source_and_target_equal - , p_schema_source => user - , p_schema_target => user + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_source_and_target_equal + , p_schema_source => g_owner + , p_schema_target => g_owner ); chk ( p_description => 'p_network_link_source niet leeg en onbekend.' - , p_sqlcode_expected => c_database_link_does_not_exist + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_database_link_does_not_exist , p_network_link_source => 'ABC' ); chk ( p_description => 'p_network_link_target niet leeg en onbekend.' - , p_sqlcode_expected => c_database_link_does_not_exist + , p_sqlcode_expected => oracle_tools.pkg_ddl_error.c_database_link_does_not_exist , p_network_link_target => 'ABC' ); @@ -7677,7 +7643,7 @@ $end when r.column_value is null then -6502 -- VALUE_ERROR want NATURALN staat null niet toe when r.column_value in (0, 1) then c_no_exception_raised when r.column_value < 0 then -6502 -- VALUE_ERROR want NATURALN staat negatieve getallen niet toe - else c_numeric_boolean_wrong + else oracle_tools.pkg_ddl_error.c_numeric_boolean_wrong end , p_skip_repeatables => r.column_value , p_object_names => 'ABC' @@ -7739,7 +7705,7 @@ $end l_longops_rec := longops_init(p_op_name => 'Test', p_units => 'objects', p_target_desc => l_program, p_totalwork => r.total); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."info" , 'r.owner: %s; r.object_type: %s; r.object_name: %s' @@ -7756,30 +7722,24 @@ $end then dbms_lob.trim(l_clob1, 0); end if; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'try %s; retrieving l_line1_tab', i_try); +$end + for r_text in ( select t.obj.object_schema() as object_schema , t.obj.object_type() as object_type , t.obj.object_name() as object_name , u.text -$if dbms_db_version.ver_le_10 $then - from table(oracle_tools.pkg_ddl_util.display_ddl_schema_diff( oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type) - , r.object_name - , 1 - , r.owner - , g_empty - , case when i_try = 2 then g_loopback end - , case when i_try = 2 then g_loopback end - , 0)) t -$else from table(oracle_tools.pkg_ddl_util.display_ddl_schema_diff( p_object_type => oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type) - , p_object_names => r.object_name - , p_object_names_include => 1 - , p_schema_source => r.owner - , p_schema_target => g_empty - , p_network_link_source => case when i_try = 2 then g_loopback end - , p_network_link_target => case when i_try = 2 then g_loopback end - , p_skip_repeatables => 0)) t -$end + , p_object_names => r.object_name + , p_object_names_include => 1 + , p_schema_source => r.owner + , p_schema_target => g_empty + , p_network_link_source => case when i_try = 2 then g_loopback end + , p_network_link_target => case when i_try = 2 then g_loopback end + , p_skip_repeatables => 0)) t , table(t.ddl_tab) u where u.verb() != '--' -- no comments and t.obj.object_type() = oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type) @@ -7798,7 +7758,7 @@ $end , u.ddl#() ) loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.print ( dbug."info" , 'r_text.object_schema: %s; r_text.object_type: %s; r_text.object_name: %s' @@ -7806,13 +7766,20 @@ $if cfg_pkg.c_debugging $then , r_text.object_type , r_text.object_name ); + if cardinality(r_text.text) > 0 + then + for i_line_idx in r_text.text.first .. r_text.text.last + loop + dbug.print(dbug."info", 'line1: %s', r_text.text(i_line_idx)); + end loop; + end if; $end - pkg_str_util.text2clob(r_text.text, l_clob1, true); + oracle_tools.pkg_str_util.text2clob(r_text.text, l_clob1, true); end loop; -- Copy all lines from l_clob1 to l_line1_tab but skip empty lines for comments. -- So we use an intermediary l_line2_tab first. - pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line2_tab, p_delimiter => chr(10)); + oracle_tools.pkg_str_util.split(p_str => l_clob1, p_str_tab => l_line2_tab, p_delimiter => chr(10)); l_line1_tab.delete; for i_idx in l_line2_tab.first .. l_line2_tab.last loop @@ -7833,6 +7800,10 @@ $end skip_ws_lines_around(l_line1_tab, l_first1, l_last1); end if; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'try %s; retrieving l_line2_tab', i_try); +$end + get_source(p_owner => r.owner ,p_object_type => r.object_type ,p_object_name => r.object_name @@ -7853,35 +7824,31 @@ $end then for i_line_idx in l_first2 .. l_last2 loop +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print + ( dbug."info" + , 'line2: %s' + , l_line2_tab(i_line_idx) + ); +$end l_line2_tab(i_line_idx) := modify_ddl_text ( p_ddl_text => l_line2_tab(i_line_idx) , p_schema => r.owner , p_new_schema => g_empty - , p_object_type => r.object_type ); end loop; end if; - begin - ut.expect(eq(l_line1_tab, l_first1, l_last1, l_line2_tab, l_first2, l_last2), l_program || '#' || r.owner || '#' || r.object_type || '#' || r.object_name || '#eq').to_be_true(); -$if cfg_pkg.c_debugging $then - exception - when others - then - dbug.print(dbug."warning", 'l_line1_tab'); - print(l_line1_tab, l_first1, l_last1); - dbug.print(dbug."warning", 'l_line2_tab'); - print(l_line2_tab, l_first2, l_last2); - raise; -$end - end; + ut.expect(eq(l_line1_tab, l_first1, l_last1, l_line2_tab, l_first2, l_last2), l_program || '#' || r.owner || '#' || r.object_type || '#' || r.object_name || '#' || i_try || '#eq').to_be_true(); end loop try_loop; longops_show(l_longops_rec); end loop; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -7893,25 +7860,31 @@ $end procedure ut_object_type_order is + pragma autonomous_transaction; + begin null; + + commit; end ut_object_type_order; procedure ut_dict2metadata_object_type is + pragma autonomous_transaction; + l_metadata_object_type t_metadata_object_type; - l_program constant varchar2(61 char) := 'UT_DICT2METADATA_OBJECT_TYPE'; + l_program constant t_module := 'UT_DICT2METADATA_OBJECT_TYPE'; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); $end -- null as parameter - ut.expect(t_schema_object.dict2metadata_object_type(to_char(null)), l_program || '#null').to_be_null(); + ut.expect(oracle_tools.t_schema_object.dict2metadata_object_type(to_char(null)), l_program || '#null').to_be_null(); -- ABC XYZ as parameter - ut.expect(t_schema_object.dict2metadata_object_type('ABC XYZ'), l_program || '#ABC XYZ').to_equal('ABC_XYZ'); + ut.expect(oracle_tools.t_schema_object.dict2metadata_object_type('ABC XYZ'), l_program || '#ABC XYZ').to_equal('ABC_XYZ'); for r in (select distinct t.object_type from all_objects t where t.generated = 'N' /* GPA 2016-12-19 #136334705 */ order by t.object_type) loop @@ -7926,28 +7899,32 @@ $end replace(r.object_type, ' ', '_') end; - ut.expect(t_schema_object.dict2metadata_object_type(r.object_type), l_program || '#' || r.object_type).to_equal(l_metadata_object_type); + ut.expect(oracle_tools.t_schema_object.dict2metadata_object_type(r.object_type), l_program || '#' || r.object_type).to_equal(l_metadata_object_type); end loop; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; $end end ut_dict2metadata_object_type; procedure ut_is_a_repeatable is - l_program constant varchar2(61 char) := 'UT_IS_A_REPEATABLE'; - l_object_type_tab t_text_tab; + pragma autonomous_transaction; + + l_program constant t_module := 'UT_IS_A_REPEATABLE'; + l_object_type_tab oracle_tools.t_text_tab; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); $end -- null as parameter - ut.expect(t_schema_object.is_a_repeatable(to_char(null)), l_program || '#null').to_be_null(); + ut.expect(oracle_tools.t_schema_object.is_a_repeatable(to_char(null)), l_program || '#null').to_be_null(); -- ABC XYZ as parameter - ut.expect(t_schema_object.is_a_repeatable('ABC XYZ'), l_program || '#ABC XYZ').to_be_null(); + ut.expect(oracle_tools.t_schema_object.is_a_repeatable('ABC XYZ'), l_program || '#ABC XYZ').to_be_null(); for i_try in 1 .. 3 loop @@ -7962,7 +7939,7 @@ $end for i_idx in l_object_type_tab.first .. l_object_type_tab.last loop - ut.expect( t_schema_object.is_a_repeatable(l_object_type_tab(i_idx)) + ut.expect( oracle_tools.t_schema_object.is_a_repeatable(l_object_type_tab(i_idx)) , l_program || '#' || i_try || '#' || l_object_type_tab(i_idx) ).to_equal( case when l_object_type_tab(i_idx) in ('CLUSTER' @@ -7992,7 +7969,9 @@ $end end loop; end loop; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -8004,24 +7983,26 @@ $end procedure ut_get_schema_object is - l_schema_object_tab0 t_schema_object_tab; - l_schema_object_tab1 t_schema_object_tab; + pragma autonomous_transaction; + + l_schema_object_tab0 oracle_tools.t_schema_object_tab; + l_schema_object_tab1 oracle_tools.t_schema_object_tab; l_schema t_schema; - l_object_info_tab t_object_info_tab; + l_object_info_tab oracle_tools.t_object_info_tab; l_object_names_include t_numeric_boolean; l_object_names t_object_names; l_count pls_integer; - l_program constant varchar2(61 char) := 'UT_GET_SCHEMA_OBJECT'; + l_program constant t_module := 'UT_GET_SCHEMA_OBJECT'; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(g_package_prefix || l_program); $end -$if pkg_ddl_util.c_get_queue_ddl $then +$if oracle_tools.pkg_ddl_util.c_get_queue_ddl $then -- check queue tables for r in @@ -8141,7 +8122,9 @@ $end end if; end loop; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -8153,19 +8136,26 @@ $end procedure ut_synchronize is - l_drop_schema_ddl_tab t_schema_ddl_tab; - l_diff_schema_ddl_tab t_schema_ddl_tab; + pragma autonomous_transaction; + + l_drop_schema_ddl_tab oracle_tools.t_schema_ddl_tab; + l_diff_schema_ddl_tab oracle_tools.t_schema_ddl_tab; l_schema t_schema; l_network_link_source t_network_link; l_network_link_target constant t_network_link := g_empty; -- in order to have the same privileges + -- GJP 2021-09-02 + c_object_type constant t_metadata_object_type := null; -- 'TYPE_SPEC'; + c_object_names constant t_object_name := null; -- 'EXCELTABLEIMPL'; + c_object_names_include constant t_numeric_boolean := null; -- 1; + cursor c_display_ddl_schema_diff - ( b_object_type in t_metadata_object_type default null - , b_object_names in t_object_names default null - , b_object_names_include in t_numeric_boolean default null - , b_schema_source in t_schema default user - , b_schema_target in t_schema default user + ( b_object_type in t_metadata_object_type default c_object_type + , b_object_names in t_object_names default c_object_names + , b_object_names_include in t_numeric_boolean default c_object_names_include + , b_schema_source in t_schema default g_owner + , b_schema_target in t_schema default g_owner , b_network_link_source in t_network_link default null , b_network_link_target in t_network_link default null , b_skip_repeatables in t_numeric_boolean default 1 @@ -8174,14 +8164,14 @@ $end select value(t) from table ( oracle_tools.pkg_ddl_util.display_ddl_schema_diff - ( b_object_type - , b_object_names - , b_object_names_include - , b_schema_source - , b_schema_target - , b_network_link_source - , b_network_link_target - , b_skip_repeatables + ( p_object_type => b_object_type + , p_object_names => b_object_names + , p_object_names_include => b_object_names_include + , p_schema_source => b_schema_source + , p_schema_target => b_schema_target + , p_network_link_source => b_network_link_source + , p_network_link_target => b_network_link_target + , p_skip_repeatables => b_skip_repeatables ) ) t , table(t.ddl_tab) u @@ -8190,62 +8180,14 @@ $end l_count pls_integer; - l_program constant varchar2(61) := g_package || '.UT_SYNCHRONIZE'; + l_program constant t_module := g_package || '.UT_SYNCHRONIZE'; procedure cleanup is begin -$if cfg_pkg.c_debugging $then - dbug.enter(l_program||'.CLEANUP'); -$end - - uninstall - ( p_schema_target => g_empty - , p_network_link_target => l_network_link_target - ); - - -- drop objects which are excluded in get_schema_object() - l_drop_schema_ddl_tab := t_schema_ddl_tab(); - for r in - ( select oracle_tools.t_schema_ddl.create_schema_ddl - ( p_obj => oracle_tools.t_named_object.create_named_object - ( p_object_type => o.object_type - , p_object_schema => o.object_schema - , p_object_name => o.object_name - ) - , p_ddl_tab => oracle_tools.t_ddl_tab() - ) as obj - from ( select o.owner as object_schema - , t_schema_object.dict2metadata_object_type(o.object_type) as object_type - , o.object_name - from all_objects o - where o.owner = g_empty - ) o - where (select oracle_tools.pkg_ddl_util.is_dependent_object_type(p_object_type => o.object_type) from dual) = 0 - ) - loop - l_drop_schema_ddl_tab.extend(1); - create_schema_ddl - ( p_source_schema_ddl => null - , p_target_schema_ddl => r.obj - , p_skip_repeatables => 0 - , p_schema_ddl => l_drop_schema_ddl_tab(l_drop_schema_ddl_tab.last) - ); - end loop; - - execute_ddl(l_drop_schema_ddl_tab, l_network_link_target); - -$if cfg_pkg.c_debugging $then - dbug.leave; -$end - exception - when others then - null; -$if cfg_pkg.c_debugging $then - dbug.leave; -$end + null; -- special beforetest annotation will take care of cleaning EMPTY end cleanup; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(l_program); $end @@ -8265,42 +8207,55 @@ $end loop case i_try when 1 + then + l_schema := g_owner; + l_network_link_source := null; -- this is l_schema + + when 2 -- GJP 2021-08-31 then l_schema := g_owner; l_network_link_source := g_loopback; -- this is l_schema end case; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'step 1'); +$end + /* step 1 */ - begin - cleanup; -- empty EMPTY + cleanup; -- empty EMPTY - select count(*) - into l_count - from all_objects t - where t.owner = g_empty - and pkg_ddl_util.is_exclude_name_expr(oracle_tools.t_schema_object.dict2metadata_object_type(t.object_type), t.object_name) = 0; + select count(*) + into l_count + from all_objects t + where t.owner = g_empty + and oracle_tools.pkg_ddl_util.is_exclude_name_expr(oracle_tools.t_schema_object.dict2metadata_object_type(t.object_type), t.object_name) = 0; - ut.expect(l_count, l_program || '#cleanup' || '#' || i_try).to_equal(0); -$if cfg_pkg.c_debugging $then - exception - when others - then - for r in - ( select o.object_type - , o.object_name - from all_objects o - where o.owner = g_empty - order by - o.object_type - , o.object_name - ) - loop - dbug.print(dbug."warning", 'object_type: %s; object_name: %s', r.object_type, r.object_name); - end loop; - raise; + ut.expect(l_count, l_program || '#cleanup' || '#' || i_try).to_equal(0); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + if l_count != 0 + then + dbug.print(dbug."error", 'schema %s should not contain objects', g_empty); + for r in + ( select o.object_type + , o.object_name + from all_objects o + where o.owner = g_empty + order by + o.object_type + , o.object_name + ) + loop + dbug.print(dbug."error", 'object_type: %s; object_name: %s', r.object_type, r.object_name); + end loop; + raise_application_error(oracle_tools.pkg_ddl_error.c_schema_not_empty, g_empty); + end if; $end - end; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'step 2'); +$end /* step 2 */ select count(*) @@ -8311,22 +8266,32 @@ $end ut.expect(l_count, l_program || '#no public synonyms' || '#' || i_try).to_equal(0); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'step 3'); +$end + /* step 3 */ synchronize - ( p_object_type => null - , p_object_names => null - , p_object_names_include => null + ( p_object_type => c_object_type + , p_object_names => c_object_names + , p_object_names_include => c_object_names_include , p_schema_source => l_schema , p_schema_target => g_empty , p_network_link_source => l_network_link_source , p_network_link_target => l_network_link_target ); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'step 4'); +$end /* step 4 */ -- Bereken de verschillen, i.e. de CREATE statements. -- Gebruik database links om aan te loggen met de juiste gebruiker. - open c_display_ddl_schema_diff( b_schema_source => l_schema + open c_display_ddl_schema_diff( b_object_type => c_object_type + , b_object_names => c_object_names + , b_object_names_include => c_object_names_include + , b_schema_source => l_schema , b_schema_target => g_empty , b_network_link_source => l_network_link_source , b_network_link_target => l_network_link_target @@ -8334,6 +8299,10 @@ $end fetch c_display_ddl_schema_diff bulk collect into l_diff_schema_ddl_tab; close c_display_ddl_schema_diff; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'step 5'); +$end + /* step 5 */ /* see step 2: there are no public synonyms */ @@ -8344,28 +8313,27 @@ $end -- ORA-01720: grant option does not exist for '.PARTY' remove_object_grants(l_diff_schema_ddl_tab); - begin - ut.expect(l_diff_schema_ddl_tab.count, l_program || '#differences' || '#' || i_try).to_equal(0); -$if cfg_pkg.c_debugging $then - exception - when others - then - dbug.on_error; - if l_diff_schema_ddl_tab.count > 0 - then - for i_idx in l_diff_schema_ddl_tab.first .. l_diff_schema_ddl_tab.last - loop - l_diff_schema_ddl_tab(i_idx).print(); - end loop; - end if; - raise; + ut.expect(l_diff_schema_ddl_tab.count, l_program || '#differences' || '#' || i_try).to_equal(0); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + if l_diff_schema_ddl_tab.count > 0 + then + dbug.print(dbug."error", 'schema DDL differences found'); + for i_idx in l_diff_schema_ddl_tab.first .. l_diff_schema_ddl_tab.last + loop + dbug.print(dbug."error", 'schema DDL %s', i_idx); + l_diff_schema_ddl_tab(i_idx).print(); + end loop; + raise_application_error(-20000, 'schema DDL differences found'); + end if; $end - end; cleanup; end loop; -$if cfg_pkg.c_debugging $then + commit; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -8378,20 +8346,112 @@ $end procedure ut_sort_objects_by_deps is + pragma autonomous_transaction; + + l_graph t_graph; + l_result dbms_sql.varchar2_table; + l_idx pls_integer; + l_schema t_schema; - l_schema_object_tab t_schema_object_tab; - l_object_info_tab oracle_tools.t_object_info_tab; - l_sort_objects_by_deps_tab1 t_sort_objects_by_deps_tab; - l_sort_objects_by_deps_tab2 t_sort_objects_by_deps_tab; - l_program constant varchar2(61) := g_package_prefix || 'UT_SORT_OBJECTS_BY_DEPS'; + l_schema_object_tab1 oracle_tools.t_schema_object_tab; + l_schema_object_tab2 oracle_tools.t_schema_object_tab; + l_expected t_object; + + l_program constant t_module := g_package_prefix || 'UT_SORT_OBJECTS_BY_DEPS'; begin -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.enter(l_program); $end - null; + l_graph('1')('2') := 1; + l_graph('1')('3') := 1; + l_graph('1')('4') := 1; + l_graph('2')('1') := 1; + l_graph('2')('3') := 1; + l_graph('2')('4') := 1; + l_graph('3')('1') := 1; + l_graph('3')('2') := 1; + l_graph('3')('4') := 1; + l_graph('4')('1') := 1; + l_graph('4')('2') := 1; + l_graph('4')('3') := 1; + + dsort + ( l_graph + , l_result + ); + + ut.expect(l_result.count, l_program || '#0#count').to_equal(4); + l_idx := l_result.first; + while l_idx is not null + loop + ut.expect(l_result(l_idx), l_program || '#0#' || to_char(1 + l_idx - l_result.first)).to_equal(to_char(1 + l_result.last - l_idx)); + l_idx := l_result.next(l_idx); + end loop; + + for i_test in 1..2 + loop + get_schema_object + ( p_schema => g_owner + , p_object_type => null + , p_object_names => case i_test when 1 then 'PKG_DDL_UTIL,PKG_STR_UTIL' when 2 then 'T_NAMED_OBJECT,T_DEPENDENT_OR_GRANTED_OBJECT,T_SCHEMA_OBJECT' END + , p_object_names_include => 1 + , p_schema_object_tab => l_schema_object_tab1 + ); + + select value(t) + bulk collect + into l_schema_object_tab2 + from table + ( oracle_tools.pkg_ddl_util.sort_objects_by_deps + ( p_schema_object_tab => l_schema_object_tab1 + , p_schema => g_owner + ) + ) t; + + ut.expect(l_schema_object_tab1.count, l_program || '#' || i_test || '#count#1').not_to_equal(0); + ut.expect(l_schema_object_tab2.count, l_program || '#' || i_test || '#count#2').to_equal(l_schema_object_tab1.count); + + if l_schema_object_tab2.count > 0 + then + for i_idx in l_schema_object_tab2.first .. l_schema_object_tab2.last + loop + l_expected := + case i_test + when 1 + then + case i_idx + when 1 then g_owner || ':PACKAGE_SPEC:PKG_STR_UTIL:::::::' + when 2 then g_owner || ':PACKAGE_SPEC:PKG_DDL_UTIL:::::::' + when 3 then g_owner || ':PACKAGE_BODY:PKG_STR_UTIL:::::::' + when 4 then g_owner || ':PACKAGE_BODY:PKG_DDL_UTIL:::::::' + when 5 then ':OBJECT_GRANT::' || g_owner || '::PKG_STR_UTIL::PUBLIC:EXECUTE:NO' + when 6 then ':OBJECT_GRANT::' || g_owner || '::PKG_DDL_UTIL::PUBLIC:EXECUTE:NO' + end + + when 2 + then + case i_idx + when 1 then g_owner || ':TYPE_SPEC:T_SCHEMA_OBJECT:::::::' + when 2 then g_owner || ':TYPE_SPEC:T_NAMED_OBJECT:::::::' + when 3 then g_owner || ':TYPE_SPEC:T_DEPENDENT_OR_GRANTED_OBJECT:::::::' + when 4 then g_owner || ':TYPE_BODY:T_SCHEMA_OBJECT:::::::' + when 5 then g_owner || ':TYPE_BODY:T_NAMED_OBJECT:::::::' + when 6 then g_owner || ':TYPE_BODY:T_DEPENDENT_OR_GRANTED_OBJECT:::::::' + when 7 then ':OBJECT_GRANT::' || g_owner || '::T_SCHEMA_OBJECT::PUBLIC:EXECUTE:NO' + when 8 then ':OBJECT_GRANT::' || g_owner || '::T_NAMED_OBJECT::PUBLIC:EXECUTE:NO' + when 9 then ':OBJECT_GRANT::' || g_owner || '::T_DEPENDENT_OR_GRANTED_OBJECT::PUBLIC:EXECUTE:NO' + end + end; + + ut.expect(l_schema_object_tab2(i_idx).id, l_program || '#' || i_test || '#' || i_idx || '#id').to_equal(l_expected); + end loop; + end if; + end loop; + + commit; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then dbug.leave; exception when others @@ -8401,70 +8461,88 @@ $if cfg_pkg.c_debugging $then $end end ut_sort_objects_by_deps; -$else -- $if cfg_pkg.c_testing $then - - -- test functions - procedure ut_setup - is - begin - raise program_error; - end ut_setup; - - procedure ut_teardown - is - begin - raise program_error; - end ut_teardown; - - procedure ut_display_ddl_schema - is - begin - raise program_error; - end ut_display_ddl_schema; - - procedure ut_display_ddl_schema_diff - is - begin - raise program_error; - end ut_display_ddl_schema_diff; - - procedure ut_object_type_order - is - begin - raise program_error; - end ut_object_type_order; - - procedure ut_dict2metadata_object_type - is - begin - raise program_error; - end ut_dict2metadata_object_type; - - procedure ut_is_a_repeatable - is - begin - raise program_error; - end ut_is_a_repeatable; - - procedure ut_get_schema_object - is - begin - raise program_error; - end ut_get_schema_object; - - procedure ut_synchronize - is - begin - raise program_error; - end ut_synchronize; - - procedure ut_sort_objects_by_deps + procedure ut_modify_ddl_text is + l_text constant varchar2(32767 char) := + chr(10) || -- test multi line + 'oracle_tools' || -- yes + chr(10) || + ' oracle_tools' || -- yes + chr(10) || + 'oracle_tools ' || -- yes + chr(10) || + ' Oracle_tools ' || -- yes (upper) + chr(10) || + ' ORACLE_TOOLS.' || -- yes + chr(10) || + '$oracle_tools' || -- no + chr(10) || + '#oracle_tools' || -- no + chr(10) || + '_oracle_tools' || -- no + chr(10) || + '0oracle_tools' || -- no + chr(10) || + 'aoracle_tools' || -- no + chr(10) || + 'Zoracle_tools' || -- no + chr(10) || + '(oracle_tools)' || -- yes + chr(10) || + ' abcdefghij ' || -- no + chr(10) + ; + l_text_actual constant varchar2(32767 char) := + modify_ddl_text + ( p_ddl_text => l_text + , p_schema => 'ORACLE_TOOLS' + , p_new_schema => g_empty + ); + l_text_expected constant varchar2(32767 char) := + chr(10) || -- test multi line + 'empty' || -- yes + chr(10) || + ' empty' || -- yes + chr(10) || + 'empty ' || -- yes + chr(10) || + ' EMPTY ' || -- yes (upper) + chr(10) || + ' EMPTY.' || -- yes + chr(10) || + '$oracle_tools' || -- no + chr(10) || + '#oracle_tools' || -- no + chr(10) || + '_oracle_tools' || -- no + chr(10) || + '0oracle_tools' || -- no + chr(10) || + 'aoracle_tools' || -- no + chr(10) || + 'Zoracle_tools' || -- no + chr(10) || + '(empty)' || -- yes + chr(10) || + ' abcdefghij ' || -- no + chr(10) + ; begin - raise program_error; - end ut_sort_objects_by_deps; + ut.expect(l_text_actual, 'total').to_equal(l_text_expected); + -- show just the first different index + for i_idx in 1 .. greatest(length(l_text_actual), length(l_text_expected)) + loop + ut.expect(ascii(substr(l_text_actual, i_idx, 1)), 'ascii char at index ' || i_idx).to_equal(ascii(substr(l_text_expected, i_idx, 1))); + if substr(l_text_actual, i_idx, 1) = substr(l_text_expected, i_idx, 1) + then + null; + else + exit; + end if; + end loop; + end ut_modify_ddl_text; -$end -- $if cfg_pkg.c_testing $then +$end -- $if oracle_tools.cfg_pkg.c_testing $then begin -- ensure unicode kees working diff --git a/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_STR_UTIL.sql b/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_STR_UTIL.sql index a562aab7..4261a35d 100644 --- a/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_STR_UTIL.sql +++ b/db/app/ddl/src/full/R__14.ORACLE_TOOLS.PACKAGE_BODY.PKG_STR_UTIL.sql @@ -1,6 +1,79 @@ CREATE OR REPLACE PACKAGE BODY "ORACLE_TOOLS"."PKG_STR_UTIL" IS + g_clob clob; +g_package_prefix constant varchar2(61) := $$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.'; + +$if oracle_tools.cfg_pkg.c_testing $then + +"null" constant varchar2(1) := null; +"null clob" constant clob := null; +"lf" constant varchar2(1) := chr(10); +"cr" constant varchar2(1) := chr(13); +"crlf" constant varchar2(2) := "cr" || "lf"; + +$end + +-- GLOBAL + +function dbms_lob_substr +( p_clob in clob +, p_amount in naturaln +, p_offset in positiven +) +return varchar2 +is + l_offset positiven := p_offset; + l_amount naturaln := p_amount; -- can become 0 + l_buffer varchar2(32767 char) := null; + l_chunk varchar2(32767 char); + l_chunk_length naturaln := 0; -- never null + l_clob_length constant naturaln := nvl(dbms_lob.getlength(p_clob), 0); +begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'DBMS_LOB_SUBSTR'); + dbug.print(dbug."input", 'p_clob length: %s; p_amount: %s; p_offset: %s', l_clob_length, p_amount, p_offset); +$end + + -- read till this entry is full (during testing I got 32764 instead of 32767) + <> + while l_amount > 0 + loop +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'l_offset: %s; l_amount: %s', l_offset, l_amount); +$end + + l_chunk := + dbms_lob.substr + ( lob_loc => p_clob + , offset => l_offset + , amount => l_amount + ); + + l_chunk_length := nvl(length(l_chunk), 0); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'l_chunk_length: %s', l_chunk_length); +$end + + l_buffer := l_buffer || l_chunk; + + -- nothing read: stop; + -- buffer length at least p_amount: stop + exit buffer_loop when l_chunk_length = 0 or length(l_buffer) >= p_amount; + + l_offset := l_offset + l_chunk_length; + l_amount := l_amount - l_chunk_length; + end loop buffer_loop; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.print(dbug."output", 'return length: %s', length(l_buffer)); + dbug.leave; +$end + + return l_buffer; +end dbms_lob_substr; + procedure split ( p_str in varchar2 , p_delimiter in varchar2 := ',' @@ -10,9 +83,9 @@ is l_pos pls_integer; l_start pls_integer; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.SPLIT (1)'); - dbug.print(dbug."input", 'p_str: %s; p_delimiter: %s', p_str, p_delimiter); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'SPLIT (1)'); + dbug.print(dbug."input", 'p_str: %s; p_delimiter: "%s"', p_str, p_delimiter); $end l_start := 1; @@ -30,7 +103,7 @@ $end end if; end loop split_loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'p_str_tab.count: %s', p_str_tab.count); dbug.leave; exception @@ -48,50 +121,43 @@ procedure split ) is l_pos pls_integer; - l_start pls_integer; - l_length pls_integer; + l_start positiven := 1; -- never null + l_str_length constant naturaln := nvl(dbms_lob.getlength(p_str), 0); begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.SPLIT (2)'); - dbug.print(dbug."input", 'p_str length: %s; p_delimiter: %s', dbms_lob.getlength(p_str), p_delimiter); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'SPLIT (2)'); + dbug.print(dbug."input", 'p_str length: %s; p_delimiter: "%s"', l_str_length, p_delimiter); $end - l_start := 1; - l_length := dbms_lob.getlength(p_str); - - if p_delimiter is null + if l_str_length = 0 then - while l_start <= l_length - loop - p_str_tab(p_str_tab.count+1) := - dbms_lob.substr - ( lob_loc => p_str - , offset => l_start - , amount => 32767 -- het is niet erg teveel "amount" op te geven - ); - l_start := l_start + 32767; - end loop split_loop; + p_str_tab(p_str_tab.count+1) := null; else - <> + while l_start <= l_str_length loop - l_pos := dbms_lob.instr(lob_loc => p_str, pattern => p_delimiter, offset => l_start); - if l_pos > 0 - then - p_str_tab(p_str_tab.count+1) := - dbms_lob.substr - ( lob_loc => p_str - , offset => l_start - , amount => l_pos - l_start - ); - l_start := l_pos + length(p_delimiter); - else - p_str_tab(p_str_tab.count+1) := dbms_lob.substr(lob_loc => p_str, offset => l_start); - exit split_loop; - end if; - end loop split_loop; + l_pos := case when p_delimiter is not null then dbms_lob.instr(lob_loc => p_str, pattern => p_delimiter, offset => l_start) else 0 end; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.print(dbug."info", 'l_start: %s; l_pos: %s', l_start, l_pos); +$end + + p_str_tab(p_str_tab.count+1) := + dbms_lob_substr + ( p_clob => p_str + , p_offset => l_start + , p_amount => case when l_pos > 0 then l_pos - l_start else 32767 end + ); + l_start := l_start + nvl(length(p_str_tab(p_str_tab.count+0)), 0) + nvl(length(p_delimiter), 0); + end loop; + -- everything has been read BUT ... + if l_pos > 0 + then + -- the delimiter string is just at the end of p_str, so add another empty line so a join() can reconstruct exactly the same clob + p_str_tab(p_str_tab.count+1) := null; + end if; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'p_str_tab.count: %s', p_str_tab.count); dbug.leave; exception @@ -108,57 +174,74 @@ procedure split , p_str_tab out nocopy t_clob_tab ) is - l_pos pls_integer; - l_start pls_integer; - l_length pls_integer; - l_amount pls_integer; + l_pos naturaln := 0; + l_start positiven := 1; + l_str_length constant naturaln := nvl(dbms_lob.getlength(p_str), 0); + l_amount naturaln := 0; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.SPLIT (3)'); - dbug.print(dbug."input", 'p_str length: %s; p_delimiter: %s', l_length, p_delimiter); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'SPLIT (3)'); + dbug.print(dbug."input", 'p_str length: %s; p_delimiter: "%s"', l_str_length, p_delimiter); $end - l_start := 1; - l_length := dbms_lob.getlength(p_str); + p_str_tab := t_clob_tab(); - if l_length is null + if l_str_length = 0 or p_delimiter is null then - p_str_tab := t_clob_tab(null); + -- copy p_str to first element + p_str_tab.extend(1); + if l_str_length > 0 + then + dbms_lob.createtemporary(p_str_tab(p_str_tab.last), true); + dbms_lob.copy + ( dest_lob => p_str_tab(p_str_tab.last) + , src_lob => p_str + , amount => l_str_length + , dest_offset => 1 + , src_offset => l_start + ); + end if; else - p_str_tab := t_clob_tab(); <> + while l_start <= l_str_length loop l_pos := dbms_lob.instr(lob_loc => p_str, pattern => p_delimiter, offset => l_start); p_str_tab.extend(1); - l_amount := case when l_pos > 0 then l_pos - l_start else l_length + 1 - l_start end; + l_amount := case when l_pos > 0 then l_pos - l_start else l_str_length + 1 - l_start end; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."debug", 'l_start: %s; l_pos: %s; l_amount: %s', l_start, l_pos, l_amount); $end if l_amount > 0 then - dbms_lob.createtemporary(p_str_tab(p_str_tab.last), true); - dbms_lob.copy - ( dest_lob => p_str_tab(p_str_tab.last) - , src_lob => p_str - , amount => l_amount - , dest_offset => 1 - , src_offset => l_start - ); + dbms_lob.createtemporary(p_str_tab(p_str_tab.last), true); + dbms_lob.copy + ( dest_lob => p_str_tab(p_str_tab.last) + , src_lob => p_str + , amount => l_amount + , dest_offset => 1 + , src_offset => l_start + ); end if; if l_pos > 0 then - l_start := l_pos + length(p_delimiter); + l_start := l_pos + length(p_delimiter); else - exit split_loop; + exit split_loop; end if; end loop split_loop; + -- everything has been read BUT ... + if l_pos > 0 + then + -- the delimiter string is just at the end of p_str, so add another empty line so a join() can reconstruct exactly the same clob + p_str_tab.extend(1); + end if; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'p_str_tab.count: %s', case when p_str_tab is not null then p_str_tab.count end); dbug.leave; exception @@ -174,44 +257,44 @@ procedure trim , p_set in varchar2 ) is - l_length constant pls_integer := dbms_lob.getlength(p_str); + l_str_length constant pls_integer := dbms_lob.getlength(p_str); l_start pls_integer := null; l_end pls_integer := null; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.TRIM (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'TRIM (1)'); dbug.print(dbug."input", 'p_str length: %s; p_set: %s', dbms_lob.getlength(p_str), p_set); $end -- een dummy loop om er snel uit te springen en niet teveel if statements te hebben loop -$if cfg_pkg.c_debugging $then - dbug.print(dbug."debug", 'l_length: %s', l_length); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.print(dbug."debug", 'l_str_length: %s', l_str_length); $end - exit when l_length is null or l_length <= 0; + exit when l_str_length is null or l_str_length <= 0; - -- l_length > 0 + -- l_str_length > 0 - for i_start in 1 .. l_length + for i_start in 1 .. l_str_length loop if instr - ( p_set - , dbms_lob.substr - ( lob_loc => p_str - , offset => i_start - , amount => 1 - ) - ) > 0 - then - null; - else - l_start := i_start; - exit; - end if; + ( p_set + , dbms_lob_substr + ( p_clob => p_str + , p_offset => i_start + , p_amount => 1 + ) + ) > 0 + then + null; + else + l_start := i_start; + exit; + end if; end loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."debug", 'l_start: %s', l_start); $end @@ -221,29 +304,29 @@ $end exit; end if; - for i_end in reverse 1 .. l_length + for i_end in reverse 1 .. l_str_length loop if instr - ( p_set - , dbms_lob.substr - ( lob_loc => p_str - , offset => i_end - , amount => 1 - ) - ) > 0 - then - null; - else - l_end := i_end; - exit; - end if; + ( p_set + , dbms_lob_substr + ( p_clob => p_str + , p_offset => i_end + , p_amount => 1 + ) + ) > 0 + then + null; + else + l_end := i_end; + exit; + end if; end loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."debug", 'l_end: %s', l_end); $end - if l_start = 1 and l_end = l_length -- niets gevonden, niets te doen + if l_start = 1 and l_end = l_str_length -- niets gevonden, niets te doen then exit; end if; @@ -270,7 +353,7 @@ $end exit; -- essentieel end loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'p_str length: %s', dbms_lob.getlength(p_str)); dbug.leave; exception @@ -287,8 +370,8 @@ procedure trim ) is begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.TRIM (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'TRIM (2)'); dbug.print(dbug."input", 'p_str_tab.count: %s; p_set: %s', case when p_str_tab is not null then p_str_tab.count end, p_set); $end @@ -308,7 +391,7 @@ $end end loop; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'p_str_tab.count: %s', case when p_str_tab is not null then p_str_tab.count end); dbug.leave; exception @@ -327,8 +410,8 @@ return integer is l_retval pls_integer; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.COMPARE (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'COMPARE (1)'); dbug.print ( dbug."input" , 'p_str1_tab.count: %s; p_str2_tab.count: %s' @@ -351,16 +434,16 @@ $end for i_idx in p_str1_tab.first .. p_str1_tab.last loop l_retval := - case - when p_str1_tab(i_idx) is null and p_str2_tab(i_idx) is null - then 0 - when p_str1_tab(i_idx) is null - then -1 - when p_str2_tab(i_idx) is null - then 1 - else dbms_lob.compare(p_str1_tab(i_idx), p_str2_tab(i_idx)) - end; -$if cfg_pkg.c_debugging $then + case + when p_str1_tab(i_idx) is null and p_str2_tab(i_idx) is null + then 0 + when p_str1_tab(i_idx) is null + then -1 + when p_str2_tab(i_idx) is null + then 1 + else dbms_lob.compare(p_str1_tab(i_idx), p_str2_tab(i_idx)) + end; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print ( dbug."debug" , 'p_str1_tab(%s) length: %s; p_str1_tab(%s) length: %s; l_retval: %s' @@ -375,14 +458,14 @@ $end end loop; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."output", 'return: %s', l_retval); dbug.leave; $end return l_retval; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then exception when others then @@ -403,8 +486,8 @@ is l_str2_length binary_integer; l_char_idx binary_integer; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.COMPARE (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'COMPARE (2)'); dbug.print ( dbug."input" , 'p_str1_tab.count: %s; p_str2_tab.count: %s' @@ -420,11 +503,11 @@ $end loop if l_line_idx > p_str1_tab.count and l_line_idx > p_str2_tab.count then - -- geen enkel verschil gevonden: stop + -- no differnce found: stop exit line_loop; elsif l_line_idx > p_str1_tab.count or l_line_idx > p_str2_tab.count then - -- er is verschil want de ene collectie is groter dan de andere: stop + -- there is a difference since one collection is larger than the other: stop p_first_line_not_equal := l_line_idx; exit line_loop; @@ -434,29 +517,29 @@ $end l_char_idx := 1; <> loop - if (l_str1_length is null or l_char_idx > l_str1_length) and - (l_str2_length is null or l_char_idx > l_str2_length) - then - exit char_loop; - elsif (l_str1_length is null or l_char_idx > l_str1_length) or - (l_str2_length is null or l_char_idx > l_str2_length) or - dbms_lob.substr(lob_loc => p_str1_tab(l_line_idx), offset => l_char_idx, amount => 1) != - dbms_lob.substr(lob_loc => p_str2_tab(l_line_idx), offset => l_char_idx, amount => 1) - then - p_first_line_not_equal := l_line_idx; - p_first_char_not_equal := l_char_idx; - - exit line_loop; -- eerste verschil gevonden: stop - end if; - - l_char_idx := l_char_idx + 1; + if (l_str1_length is null or l_char_idx > l_str1_length) and + (l_str2_length is null or l_char_idx > l_str2_length) + then + exit char_loop; + elsif (l_str1_length is null or l_char_idx > l_str1_length) or + (l_str2_length is null or l_char_idx > l_str2_length) or + dbms_lob_substr(p_clob => p_str1_tab(l_line_idx), p_offset => l_char_idx, p_amount => 1) != + dbms_lob_substr(p_clob => p_str2_tab(l_line_idx), p_offset => l_char_idx, p_amount => 1) + then + p_first_line_not_equal := l_line_idx; + p_first_char_not_equal := l_char_idx; + + exit line_loop; -- first difference found: stop + end if; + + l_char_idx := l_char_idx + 1; end loop char_loop; end if; l_line_idx := l_line_idx + 1; end loop line_loop; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print ( dbug."output" , 'p_first_line_not_equal: %s; p_first_char_not_equal: %s' @@ -478,8 +561,8 @@ procedure append_text ) is begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.APPEND_TEXT (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'APPEND_TEXT (1)'); dbug.print ( dbug."input" , 'pi_buffer (max 100): %s; dbms_lob.getlength(pio_clob): %s' @@ -497,7 +580,7 @@ $end dbms_lob.writeappend(lob_loc => pio_clob, amount => length(pi_buffer), buffer => pi_buffer); end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print ( dbug."output" , 'dbms_lob.getlength(pio_clob): %s' @@ -514,8 +597,8 @@ procedure append_text ) is begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.APPEND_TEXT (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'APPEND_TEXT (2)'); $end begin @@ -527,7 +610,7 @@ $end pio_buffer := pi_text; end; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.leave; $end end append_text; @@ -541,8 +624,8 @@ is l_buffer varchar2(32767 char) := null; l_text varchar2(32767 char); begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.TEXT2CLOB (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'TEXT2CLOB (1)'); dbug.print ( dbug."input" , 'pi_text_tab.count: %s; dbms_lob.getlength(pio_clob): %s; pi_append: %s' @@ -561,7 +644,7 @@ $end then for i_idx in pi_text_tab.first .. pi_text_tab.last loop -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."info", 'i_idx: %s', i_idx); $end l_text := pi_text_tab(i_idx); -- GPA 2016-11-30 Otherwise we get a VALUE_ERROR (?!) @@ -571,7 +654,7 @@ $end -- flush the rest of the buffer oracle_tools.pkg_str_util.append_text(pi_buffer => l_buffer, pio_clob => pio_clob); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.leave; $end end text2clob; @@ -583,8 +666,8 @@ return clob is l_clob clob := null; begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.TEXT2CLOB (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'TEXT2CLOB (2)'); dbug.print ( dbug."input" , 'pi_text_tab.count: %s' @@ -598,7 +681,7 @@ $end , pi_append => false ); -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.leave; $end @@ -615,8 +698,8 @@ is l_first pls_integer := 1; l_last pls_integer := dbms_lob.getlength(pi_clob); begin -$if cfg_pkg.c_debugging $then - dbug.enter('PKG_STR_UTIL.CLOB2TEXT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then + dbug.enter(g_package_prefix || 'CLOB2TEXT'); dbug.print ( dbug."input" , 'pi_clob length: %s; pi_trim: %s' @@ -632,18 +715,18 @@ $end if pi_trim <> 0 then -- skip whitespace at the begin - while l_first <= l_last and dbms_lob.substr(lob_loc => pi_clob, offset => l_first, amount => 1) in (chr(9), chr(10), chr(13), chr(32)) + while l_first <= l_last and dbms_lob_substr(p_clob => pi_clob, p_offset => l_first, p_amount => 1) in (chr(9), chr(10), chr(13), chr(32)) loop l_first := l_first + 1; end loop; -- skip whitespace at the end - while l_first <= l_last and dbms_lob.substr(lob_loc => pi_clob, offset => l_last, amount => 1) in (chr(9), chr(10), chr(13), chr(32)) + while l_first <= l_last and dbms_lob_substr(p_clob => pi_clob, p_offset => l_last, p_amount => 1) in (chr(9), chr(10), chr(13), chr(32)) loop l_last := l_last - 1; end loop; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.print(dbug."info", 'l_first: %s; l_last: %s', l_first, l_last); $end @@ -653,26 +736,279 @@ $end loop l_text_tab.extend(1); l_text_tab(l_text_tab.last) := - dbms_lob.substr - ( lob_loc => pi_clob - , offset => l_first + (i_chunk-1) * 4000 - , amount => case - when i_chunk < ceil((l_last - l_first + 1) / 4000) - then 4000 - else (l_last - l_first + 1) - (i_chunk-1) * 4000 - end + dbms_lob_substr + ( p_clob => pi_clob + , p_offset => l_first + (i_chunk-1) * 4000 + , p_amount => case + when i_chunk < ceil((l_last - l_first + 1) / 4000) + then 4000 + else (l_last - l_first + 1) - (i_chunk-1) * 4000 + end ); end loop; end if; end if; -$if cfg_pkg.c_debugging $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_str_util.c_debugging >= 1 $then dbug.leave; $end return l_text_tab; end clob2text; +$if oracle_tools.cfg_pkg.c_testing $then + +-- test functions + +--%suitepath(DDL) +--%suite + +--%test +procedure ut_split1 +is + l_str_tab dbms_sql.varchar2a; +begin + /* +procedure split +( p_str in varchar2 +, p_delimiter in varchar2 := ',' +, p_str_tab out nocopy dbms_sql.varchar2a +); +*/ + split("null", "null", l_str_tab); + + ut.expect(l_str_tab.count, 'test 1.1').to_equal(1); + ut.expect(l_str_tab(1), 'test 1.2').to_be_null(); + + split("null", "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 2.1').to_equal(1); + ut.expect(l_str_tab(1), 'test 2.2').to_be_null(); + + split("lf" || 'abcd' || "lf" || 'efgh', "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 3.1').to_equal(3); + ut.expect(l_str_tab(1), 'test 3.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 3.2').to_equal('abcd'); + ut.expect(l_str_tab(3), 'test 3.2').to_equal('efgh'); + + split("crlf" || 'abcd' || "crlf" || 'efgh' || "crlf", "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 4.1').to_equal(4); + ut.expect(l_str_tab(1), 'test 4.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 4.3').to_equal('abcd'); + ut.expect(l_str_tab(3), 'test 4.4').to_equal('efgh'); + ut.expect(l_str_tab(4), 'test 4.5').to_be_null(); + + split('abcd' || "crlf" || 'efgh', "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 5.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 5.2').to_equal('abcd'); + ut.expect(l_str_tab(2), 'test 5.3').to_equal('efgh'); +end; + +--%test +procedure ut_split2 +is + l_str_tab dbms_sql.varchar2a; +begin + /* +procedure split +( p_str in clob +, p_delimiter in varchar2 := ',' +, p_str_tab out nocopy dbms_sql.varchar2a +); +*/ + dbms_lob.trim(g_clob, 0); + + split("null clob", null, l_str_tab); + + ut.expect(l_str_tab.count, 'test 1.1').to_equal(1); + ut.expect(l_str_tab(1), 'test 1.2').to_be_null(); + + split(g_clob, "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 2.1').to_equal(1); + ut.expect(l_str_tab(1), 'test 2.2').to_be_null(); + + split(to_clob("lf" || 'abcd' || "lf" || 'efgh'), "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 3.1').to_equal(3); + ut.expect(l_str_tab(1), 'test 3.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 3.2').to_equal('abcd'); + ut.expect(l_str_tab(3), 'test 3.2').to_equal('efgh'); + + split(to_clob("crlf" || 'abcd' || "crlf" || 'efgh' || "crlf"), "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 4.1').to_equal(4); + ut.expect(l_str_tab(1), 'test 4.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 4.3').to_equal('abcd'); + ut.expect(l_str_tab(3), 'test 4.4').to_equal('efgh'); + ut.expect(l_str_tab(4), 'test 4.5').to_be_null(); + + split(to_clob('abcd' || "crlf" || 'efgh'), "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 5.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 5.2').to_equal('abcd'); + ut.expect(l_str_tab(2), 'test 5.3').to_equal('efgh'); + + dbms_lob.trim(g_clob, 0); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('a', 32767, 'a'))); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob("crlf")); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('b', 32767, 'b'))); + + split(g_clob, "crlf", l_str_tab); + + ut.expect(dbms_lob.getlength(g_clob), 'test 6.0').to_equal(32767 * 2 + 2); + ut.expect(l_str_tab.count, 'test 6.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 6.2').to_equal(rpad('a', 32767, 'a')); + ut.expect(l_str_tab(2), 'test 6.3').to_equal(rpad('b', 32767, 'b')); + + dbms_lob.trim(g_clob, 0); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('a', 32767, 'a'))); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('b', 32767, 'b'))); + + split(g_clob, null, l_str_tab); + + ut.expect(dbms_lob.getlength(g_clob), 'test 7.0').to_equal(32767 * 2); + ut.expect(l_str_tab.count, 'test 7.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 7.2').to_equal(rpad('a', 32767, 'a')); + ut.expect(l_str_tab(2), 'test 7.3').to_equal(rpad('b', 32767, 'b')); +end; + +--%test +procedure ut_split3 +is + l_str_tab t_clob_tab; +begin + /* +procedure split +( p_str in clob +, p_delimiter in varchar2 := ',' +, p_str_tab out nocopy t_clob_tab +); +*/ + dbms_lob.trim(g_clob, 0); + + split("null clob", null, l_str_tab); + + ut.expect(l_str_tab.count, 'test 1.1').to_equal(1); + ut.expect(dbms_lob.getlength(l_str_tab(1)), 'test 1.2').to_be_null(); + + split(g_clob, "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 2.1').to_equal(1); + ut.expect(dbms_lob.getlength(l_str_tab(1)), 'test 2.2').to_be_null(); + + split(to_clob("lf" || 'abcd' || "lf" || 'efgh'), "lf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 3.1').to_equal(3); + ut.expect(dbms_lob.getlength(l_str_tab(1)), 'test 3.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 3.2').to_equal(to_clob('abcd')); + ut.expect(l_str_tab(3), 'test 3.2').to_equal(to_clob('efgh')); + + split(to_clob("crlf" || 'abcd' || "crlf" || 'efgh' || "crlf"), "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 4.1').to_equal(4); + ut.expect(dbms_lob.getlength(l_str_tab(1)), 'test 4.2').to_be_null(); + ut.expect(l_str_tab(2), 'test 4.3').to_equal(to_clob('abcd')); + ut.expect(l_str_tab(3), 'test 4.4').to_equal(to_clob('efgh')); + ut.expect(dbms_lob.getlength(l_str_tab(4)), 'test 4.5').to_be_null(); + + split(to_clob('abcd' || "crlf" || 'efgh'), "crlf", l_str_tab); + + ut.expect(l_str_tab.count, 'test 5.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 5.2').to_equal(to_clob('abcd')); + ut.expect(l_str_tab(2), 'test 5.3').to_equal(to_clob('efgh')); + + dbms_lob.trim(g_clob, 0); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('a', 32767, 'a'))); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob("crlf")); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('b', 32767, 'b'))); + + split(g_clob, "crlf", l_str_tab); + + ut.expect(dbms_lob.getlength(g_clob), 'test 6.0').to_equal(32767 * 2 + 2); + ut.expect(l_str_tab.count, 'test 6.1').to_equal(2); + ut.expect(l_str_tab(1), 'test 6.2').to_equal(to_clob(rpad('a', 32767, 'a'))); + ut.expect(l_str_tab(2), 'test 6.3').to_equal(to_clob(rpad('b', 32767, 'b'))); + + dbms_lob.trim(g_clob, 0); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('a', 32767, 'a'))); + dbms_lob.append(dest_lob => g_clob, src_lob => to_clob(rpad('b', 32767, 'b'))); + + split(g_clob, null, l_str_tab); + + ut.expect(dbms_lob.getlength(g_clob), 'test 7.0').to_equal(32767 * 2); + ut.expect(l_str_tab.count, 'test 7.1').to_equal(1); + ut.expect(l_str_tab(1), 'test 7.2').to_equal(g_clob); +end; + +--%test +procedure ut_trim1 +is +begin + raise program_error; +end; + +--%test +procedure ut_trim2 +is +begin + raise program_error; +end; + +--%test +procedure ut_compare1 +is +begin + raise program_error; +end; + +--%test +procedure ut_compare2 +is +begin + raise program_error; +end; + +--%test +procedure ut_append_text1 +is +begin + raise program_error; +end; + +--%test +procedure ut_append_text2 +is +begin + raise program_error; +end; + +--%test +procedure ut_text2clob1 +is +begin + raise program_error; +end; + +--%test +procedure ut_text2clob2 +is +begin + raise program_error; +end; + +--%test +procedure ut_clob2text +is +begin + raise program_error; +end; + +$end -- $if oracle_tools.cfg_pkg.c_testing $then + begin dbms_lob.createtemporary(g_clob, true); end pkg_str_util; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_ARGUMENT_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_ARGUMENT_OBJECT.sql index 1be51af6..48207256 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_ARGUMENT_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_ARGUMENT_OBJECT.sql @@ -1,7 +1,7 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_ARGUMENT_OBJECT" AS constructor function t_argument_object -( self in out nocopy t_argument_object +( self in out nocopy oracle_tools.t_argument_object , p_argument# in integer , p_argument_name in varchar2 , p_data_type_name in varchar2 diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CLUSTER_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CLUSTER_OBJECT.sql index 8636d75f..0084e3cd 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CLUSTER_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CLUSTER_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_CLUSTER_OBJECT" AS constructor function t_cluster_object -( self in out nocopy t_cluster_object +( self in out nocopy oracle_tools.t_cluster_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_CLUSTER_OBJECT.T_CLUSTER_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_DDL.sql index d6f6a3b9..c9434eae 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_DDL.sql @@ -1,10 +1,17 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_COMMENT_DDL" AS overriding member procedure uninstall -( self in out nocopy t_comment_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_comment_ddl +, p_target in oracle_tools.t_schema_ddl ) is + l_base_object constant oracle_tools.t_schema_object := + oracle_tools.t_schema_object.create_schema_object + ( p_object_schema => p_target.obj.base_object_schema + , p_object_type => p_target.obj.base_object_type + , p_object_name => p_target.obj.base_object_name + ); + function delete_comment ( p_column_name in varchar2 , p_dict_object_type in varchar2 @@ -18,6 +25,9 @@ is case when p_column_name is not null then 'COLUMN' + -- Note: A VIEW comment is treated as a TABLE comment! + when p_dict_object_type = 'VIEW' + then 'TABLE' else p_dict_object_type end || ' ' || @@ -29,13 +39,31 @@ is q'[ IS '']'; end; begin +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); + dbug.print + ( dbug."input" + , 'p_target.obj.object_schema: %s; p_target.obj.object_type: %s; p_target.obj.object_name: %s' + , p_target.obj.object_schema + , p_target.obj.object_type + , p_target.obj.object_name + ); + dbug.print + ( dbug."input" + , 'p_target.obj.base_object_schema: %s; p_target.obj.base_object_type: %s; p_target.obj.base_object_name: %s' + , p_target.obj.base_object_schema + , p_target.obj.base_object_type + , p_target.obj.base_object_name + ); + p_target.obj.print; +$end -- replace by an empty comment -- GPA 2017-06-28 To avoid COMMENT ON . IS '' if delete_comment ( p_column_name => p_target.obj.column_name() - , p_dict_object_type => p_target.obj.dict_object_type() - , p_fq_object_name => p_target.obj.fq_object_name() + , p_dict_object_type => l_base_object.dict_object_type() + , p_fq_object_name => l_base_object.fq_object_name() ) = delete_comment ( p_column_name => null , p_dict_object_type => null @@ -47,19 +75,29 @@ begin raise program_error; end if; - -- COMMENT ON TABLE "schema"."object" IS '' - -- COMMENT ON VIEW "schema"."object" IS '' - -- COMMENT ON MATERIALIZED VIEW ""."MV_TTSUBSCRIPTION" IS '' - -- COMMENT ON COLUMN "schema"."object"."column" IS '' + -- Syntax: + -- 1) COMMENT ON ( TABLE | MATERIALIZED VIEW ) [ '.' ] IS '' + -- 2) COMMENT ON COLUMN [ '.' ] '.' IS '' + -- + -- Note: A VIEW comment is treated as a TABLE comment! self.add_ddl ( p_verb => 'COMMENT' , p_text => delete_comment ( p_column_name => p_target.obj.column_name() - , p_dict_object_type => p_target.obj.dict_object_type() - , p_fq_object_name => p_target.obj.fq_object_name() + , p_dict_object_type => l_base_object.dict_object_type() + , p_fq_object_name => l_base_object.fq_object_name() ) , p_add_sqlterminator => 0 -- the target text should already contain a sqlterminator (or not) ); + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; +exception + when others + then + dbug.leave_on_error; + raise; +$end end uninstall; end; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_OBJECT.sql index 62c8d9f3..b712959d 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_COMMENT_OBJECT.sql @@ -1,16 +1,16 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_COMMENT_OBJECT" AS constructor function t_comment_object -( self in out nocopy t_comment_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_comment_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_column_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_COMMENT_OBJECT.T_COMMENT_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_object_schema: %s; p_column_name: %s' @@ -25,7 +25,7 @@ $end self.object_schema$ := p_object_schema; self.column_name$ := p_column_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end @@ -53,27 +53,27 @@ end column_name; -- end of getter(s) overriding member procedure chk -( self in t_comment_object +( self in oracle_tools.t_comment_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_COMMENT_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); if self.object_schema() is not null then - raise_application_error(-20000, 'Object schema should be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema should be empty.'); end if; if self.object_name() is not null then - raise_application_error(-20000, 'Object name should be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object name should be empty.'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_DDL.sql index 8126a371..5d7ae40b 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_DDL.sql @@ -1,14 +1,14 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_CONSTRAINT_DDL" AS overriding member procedure migrate -( self in out nocopy t_constraint_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_constraint_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -41,18 +41,18 @@ exception when e_constraint_name_already_used then null; end;]' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; end migrate; overriding member procedure uninstall -( self in out nocopy t_constraint_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_constraint_ddl +, p_target in oracle_tools.t_schema_ddl ) is -$if pkg_ddl_util.c_#138707615_2 $then - l_constraint_object t_constraint_object := treat(p_target.obj as t_constraint_object); +$if oracle_tools.pkg_ddl_util.c_#138707615_2 $then + l_constraint_object oracle_tools.t_constraint_object := treat(p_target.obj as oracle_tools.t_constraint_object); $end begin -- ALTER TABLE cust_table DROP CONSTRAINT fk_cust_table_ref; @@ -65,7 +65,7 @@ begin '"."' || p_target.obj.base_object_name() || '"' || -$if pkg_ddl_util.c_#138707615_2 $then +$if oracle_tools.pkg_ddl_util.c_#138707615_2 $then -- When a primary/unique constraint is dropped, the associated index may be dropped too. -- In that case the DROP INDEX may fail. -- @@ -82,29 +82,29 @@ $if pkg_ddl_util.c_#138707615_2 $then $else ' DROP CONSTRAINT ' || p_target.obj.object_name() $end - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end uninstall; overriding member procedure add_ddl -( self in out nocopy t_constraint_ddl +( self in out nocopy oracle_tools.t_constraint_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer ) is -$if pkg_ddl_util.c_#138707615_2 $then +$if oracle_tools.pkg_ddl_util.c_#138707615_2 $then l_ddl_text clob; $end begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_CONSTRAINT_DDL.ADD_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_verb: %s; p_add_sqlterminator: %s', p_verb, p_add_sqlterminator); $end -$if pkg_ddl_util.c_#138707615_2 $then +$if oracle_tools.pkg_ddl_util.c_#138707615_2 $then -- Primary/unique constraints with USING INDEX syntax may fail. -- @@ -152,25 +152,25 @@ $else $end -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; overriding member procedure execute_ddl -( self in t_constraint_ddl +( self in oracle_tools.t_constraint_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_CONSTRAINT_DDL.EXECUTE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL'); dbug.print(dbug."input", 'self:'); self.print(); $end - t_schema_ddl.execute_ddl(p_schema_ddl => self); + oracle_tools.t_schema_ddl.execute_ddl(p_schema_ddl => self); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end execute_ddl; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_OBJECT.sql index 33bbad8d..c777378a 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_CONSTRAINT_OBJECT.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" AS constructor function t_constraint_object -( self in out nocopy t_constraint_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_constraint_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_constraint_type in varchar2 default null @@ -11,27 +11,28 @@ constructor function t_constraint_object ) return self as result is - l_search_condition varchar2(32767 char) := null; --for LONG conversion begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_CONSTRAINT_OBJECT.T_CONSTRAINT_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); + p_base_object.print; dbug.print(dbug."input", 'p_object_schema: %s; p_object_name: %s', p_object_schema, p_object_name); dbug.print(dbug."input", 'p_constraint_type: %s; p_column_names: %s; p_search_condition: %s', p_constraint_type, p_column_names, p_search_condition); $end - self.base_object$ := p_base_object; - self.network_link$ := null; - self.object_schema$ := p_object_schema; - self.object_name$ := p_object_name; + -- default constructor + self := oracle_tools.t_constraint_object(null, p_object_schema, p_base_object, p_object_name, p_column_names, p_search_condition, p_constraint_type); if p_constraint_type is not null and (p_constraint_type <> 'C' or p_search_condition is not null) then - self.constraint_type$ := p_constraint_type; - l_search_condition := case when p_constraint_type = 'C' then p_search_condition end; + case + when p_constraint_type = 'C' + then null; + else self.search_condition$ := null; + end case; else select c.search_condition , c.constraint_type - into l_search_condition + into self.search_condition$ , self.constraint_type$ from all_constraints c where c.owner = p_object_schema @@ -42,21 +43,45 @@ $end case when self.constraint_type$ in ('P', 'U') then - self.column_names$ := nvl(p_column_names, t_constraint_object.get_column_names(p_object_schema, p_object_name, p_base_object.object_name)); + if self.column_names$ is null + then + self.column_names$ := oracle_tools.t_constraint_object.get_column_names(p_object_schema => p_object_schema, p_object_name => p_object_name, p_table_name => p_base_object.object_name); + end if; self.search_condition$ := null; when self.constraint_type$ in ('C') then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.print(dbug."info", 'l_search_condition: "%s"', l_search_condition); -$end -- Since the search_condition may well be beyond 4000 characters, we just use a hash. -- When the hash for two search conditions is the same, the search condition will normally be the same too self.column_names$ := null; - self.search_condition$ := dbms_utility.get_hash_value(l_search_condition, 37, 1073741824); + self.search_condition$ := dbms_utility.get_hash_value(self.search_condition$, 37, 1073741824); end case; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.leave; +$end + return; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then +exception + when no_data_found + then + raise_application_error + ( oracle_tools.pkg_ddl_error.c_reraise_with_backtrace + , utl_lms.format_message + ( 'p_object_schema: %s; p_object_name: %s' + , p_object_schema + , p_object_name + ) + , true + ); + + when others + then + dbug.leave_on_error; + raise; +$end end; -- begin of getter(s) @@ -137,8 +162,8 @@ return varchar2 is l_column_names varchar2(4000 char) := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_CONSTRAINT_OBJECT.GET_COLUMN_NAMES'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'GET_COLUMN_NAMES'); dbug.print(dbug."input", 'p_object_schema: %s; p_object_name: %s; p_table_name: %s', p_object_schema, p_object_name, p_table_name); $end @@ -153,31 +178,44 @@ $end , cc.column_name ) loop - l_column_names := case when l_column_names is not null then l_column_names || ',' end || '"' || r.column_name || '"'; -- " for pkg_ddl_util.parse_ddl + l_column_names := case when l_column_names is not null then l_column_names || ',' end || '"' || r.column_name || '"'; -- " for oracle_tools.pkg_ddl_util.parse_ddl end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', l_column_names); dbug.leave; $end return l_column_names; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then +exception + when others + then + dbug.leave_on_error; + raise; +$end end get_column_names; overriding member procedure chk -( self in t_constraint_object +( self in oracle_tools.t_constraint_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_CONSTRAINT_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_constraint_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_constraint_object => self, p_schema => p_schema); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; +exception + when others + then + dbug.leave_on_error; + raise; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL.sql index fa1a8aba..42b9d1e7 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL.sql @@ -1,23 +1,23 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_DDL" AS constructor function t_ddl -( self in out nocopy t_ddl +( self in out nocopy oracle_tools.t_ddl , p_ddl# in integer , p_verb in varchar2 -, p_text in t_text_tab +, p_text in oracle_tools.t_text_tab ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_DDL.T_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); $end self.ddl#$ := p_ddl#; self.verb$ := p_verb; self.text := p_text; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -41,30 +41,32 @@ begin end ddl#; member procedure print -( self in t_ddl +( self in oracle_tools.t_ddl ) is -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then l_clob clob := null; l_lines_tab dbms_sql.varchar2a; $end begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then - dbug.enter('T_DDL.PRINT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'PRINT'); dbug.print ( dbug."info" - , 'ddl#: %s; verb: %s' + , 'ddl#: %s; verb: %s; cardinality: %s' , self.ddl#() , self.verb() + , cardinality(self.text) ); +$if oracle_tools.pkg_ddl_util.c_debugging >= 3 $then if cardinality(self.text) > 0 then - pkg_str_util.text2clob + oracle_tools.pkg_str_util.text2clob ( pi_text_tab => self.text , pio_clob => l_clob , pi_append => false ); - pkg_str_util.split + oracle_tools.pkg_str_util.split ( p_str => l_clob , p_delimiter => chr(10) , p_str_tab => l_lines_tab @@ -75,13 +77,14 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then end loop; dbms_lob.freetemporary(l_clob); end if; +$end dbug.leave; $else null; $end end print; -order member function match( p_ddl in t_ddl ) +order member function match( p_ddl in oracle_tools.t_ddl ) return integer deterministic is @@ -89,14 +92,14 @@ begin return compare(p_ddl); end match; -member function compare( p_ddl in t_ddl ) +member function compare( p_ddl in oracle_tools.t_ddl ) return integer deterministic is l_result binary_integer := 0; l_idx binary_integer; - l_text1_tab t_text_tab := null; - l_text2_tab t_text_tab := null; + l_text1_tab oracle_tools.t_text_tab := null; + l_text2_tab oracle_tools.t_text_tab := null; function cmp(p_val1 in varchar2, p_val2 in varchar2) return binary_integer @@ -112,9 +115,37 @@ is else 0 end; end cmp; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + function pos_not_equal(p_text1 in varchar2, p_text2 in varchar2) + return pls_integer + is + begin + if p_text1 is null and p_text2 is null + then + return 0; + elsif p_text1 is null or p_text2 is null + then + dbug.print(dbug.warning, 'equal: "%s"; p_text1 remainder: "%s"; p_text2 remainder: "%s"', null, substr(p_text1, 1, 20), substr(p_text2, 1, 20)); + return 1; + else + for i_idx in 1 .. greatest(length(p_text1), length(p_text2)) + loop + if substr(p_text1, i_idx, 1) = substr(p_text2, i_idx, 1) + then + null; + else + dbug.print(dbug.warning, 'equal: "%s"; p_text1 remainder: "%s"; p_text2 remainder: "%s"', substr(p_text1, 1, i_idx - 1), substr(p_text1, i_idx, 20), substr(p_text2, i_idx, 20)); + return i_idx; + end if; + end loop; + return 0; + end if; + end pos_not_equal; +$end begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_DDL.COMPARE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'COMPARE'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_ddl:'); @@ -164,12 +195,25 @@ $end l_result := +1; end if; +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + if l_result != 0 + then + dbug.print + ( dbug."warning" + , 'idx: %s; result: %s; index not equal: %s' + , l_idx + , l_result + , pos_not_equal(l_text1_tab(l_idx), case when l_idx <= l_text2_tab.last then l_text2_tab(l_idx) end) + ); + end if; +$end + l_idx := l_text1_tab.next(l_idx); end loop; end if; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'result: %s', l_result); dbug.leave; $end @@ -177,7 +221,7 @@ $end return l_result; end compare; -member procedure text_to_compare( self in t_ddl, p_text_tab out nocopy oracle_tools.t_text_tab ) +member procedure text_to_compare( self in oracle_tools.t_ddl, p_text_tab out nocopy oracle_tools.t_text_tab ) is begin p_text_tab := self.text; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL_SEQUENCE.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL_SEQUENCE.sql index 60f41aff..a520d3e4 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL_SEQUENCE.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DDL_SEQUENCE.sql @@ -1,6 +1,6 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_DDL_SEQUENCE" AS -overriding member procedure text_to_compare( self in t_ddl_sequence, p_text_tab out nocopy oracle_tools.t_text_tab ) +overriding member procedure text_to_compare( self in oracle_tools.t_ddl_sequence, p_text_tab out nocopy oracle_tools.t_text_tab ) is l_find_regexp constant varchar2(100) := '( START WITH )(\d+)'; l_repl_regexp constant varchar2(100) := '\1 1'; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DEPENDENT_OR_GRANTED_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DEPENDENT_OR_GRANTED_OBJECT.sql index 34f89859..8fda80c0 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DEPENDENT_OR_GRANTED_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_DEPENDENT_OR_GRANTED_OBJECT.sql @@ -33,7 +33,8 @@ begin end base_object_name; overriding final member procedure base_object_schema -( p_base_object_schema in varchar2 +( self in out nocopy oracle_tools.t_dependent_or_granted_object +, p_base_object_schema in varchar2 ) is begin @@ -41,18 +42,18 @@ begin end base_object_schema; overriding member procedure chk -( self in t_dependent_or_granted_object +( self in oracle_tools.t_dependent_or_granted_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_DEPENDENT_OR_GRANTED_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_FUNCTION_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_FUNCTION_OBJECT.sql index e1d33d96..2c18d4d6 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_FUNCTION_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_FUNCTION_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_FUNCTION_OBJECT" AS constructor function t_function_object -( self in out nocopy t_function_object +( self in out nocopy oracle_tools.t_function_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_FUNCTION_OBJECT.T_FUNCTION_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_DDL.sql index 0bfab4fd..061eac9c 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_DDL.sql @@ -1,16 +1,16 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_INDEX_DDL" AS overriding member procedure migrate -( self in out nocopy t_index_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_index_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is - l_source_index_object t_index_object := treat(p_source.obj as t_index_object); - l_target_index_object t_index_object := treat(p_target.obj as t_index_object); + l_source_index_object oracle_tools.t_index_object := treat(p_source.obj as oracle_tools.t_index_object); + l_target_index_object oracle_tools.t_index_object := treat(p_target.obj as oracle_tools.t_index_object); begin -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -29,7 +29,7 @@ begin '" REBUILD TABLESPACE "' || l_source_index_object.tablespace_name() || '"' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; @@ -65,34 +65,34 @@ exception when e_name_already_used then null; end;]' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; end migrate; overriding member procedure execute_ddl -( self in t_index_ddl +( self in oracle_tools.t_index_ddl ) is -- ORA-00955: name is already used by an existing object e_name_already_used exception; pragma exception_init(e_name_already_used, -955); begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_INDEX_DDL.EXECUTE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL'); dbug.print(dbug."input", 'self:'); self.print(); $end - t_schema_ddl.execute_ddl(p_schema_ddl => self); + oracle_tools.t_schema_ddl.execute_ddl(p_schema_ddl => self); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end exception when e_name_already_used then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end null; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_OBJECT.sql index f5c4c1b9..d7d0a796 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_INDEX_OBJECT.sql @@ -1,47 +1,50 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_INDEX_OBJECT" AS constructor function t_index_object -( self in out nocopy t_index_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_index_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_INDEX_OBJECT.T_INDEX_OBJECT (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || ' (1)'); dbug.print ( dbug."input" - , 'p_base_object.id: %s; p_object_schema: %s; p_object_name: %s' + , 'p_base_object.id: %s; p_object_schema: %s; p_object_name: %s; p_tablespace_name: %s' , p_base_object.id() , p_object_schema , p_object_name + , p_tablespace_name ); $end - self.base_object$ := p_base_object; - self.network_link$ := null; - self.object_schema$ := p_object_schema; - self.object_name$ := p_object_name; - self.column_names$ := t_index_object.get_column_names(p_object_schema, p_object_name); + -- default constructor + self := oracle_tools.t_index_object(null, p_object_schema, p_base_object, p_object_name, null, null); - select ind.tablespace_name - into self.tablespace_name$ - from all_indexes ind - where ind.owner = p_object_schema - and ind.index_name = p_object_name; + self.column_names$ := oracle_tools.t_index_object.get_column_names(p_object_schema => p_object_schema, p_object_name => p_object_name); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then + if self.tablespace_name$ is null + then + select ind.tablespace_name + into self.tablespace_name$ + from all_indexes ind + where ind.owner = p_object_schema + and ind.index_name = p_object_name; + end if; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; -$end +$end return; end; constructor function t_index_object -( self in out nocopy t_index_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_index_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_tablespace_name in varchar2 @@ -49,8 +52,8 @@ constructor function t_index_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_INDEX_OBJECT.T_INDEX_OBJECT (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || ' (2)'); dbug.print ( dbug."input" , 'p_base_object.id: %s; p_object_schema: %s; p_object_name: %s; p_tablespace_name: %s' @@ -65,10 +68,10 @@ $end self.network_link$ := null; self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; - self.column_names$ := t_index_object.get_column_names(p_object_schema, p_object_name); + self.column_names$ := oracle_tools.t_index_object.get_column_names(p_object_schema, p_object_name); self.tablespace_name$ := p_tablespace_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -85,7 +88,7 @@ begin end tablespace_name; member procedure tablespace_name -( self in out nocopy t_index_object +( self in out nocopy oracle_tools.t_index_object , p_tablespace_name in varchar2 ) is @@ -136,7 +139,7 @@ begin -- ORDER_PK ORDERHEADER SEQ 1 -- GPA 20170126 - -- The problem was that t_schema_object.id ignored base info for an INDEX + -- The problem was that oracle_tools.t_schema_object.id ignored base info for an INDEX return self.object_schema || ':' || @@ -161,18 +164,18 @@ return varchar2 is l_column_names varchar2(4000 char) := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_INDEX_OBJECT.GET_COLUMN_NAMES'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'GET_COLUMN_NAMES'); dbug.print(dbug."input", 'p_object_schema: %s; p_object_name: %s', p_object_schema, p_object_name); $end for r in ( select ic.column_name -$if pkg_ddl_util.c_#138550749 $then +$if oracle_tools.pkg_ddl_util.c_#138550749 $then , ie.column_expression $end from all_ind_columns ic -$if pkg_ddl_util.c_#138550749 $then +$if oracle_tools.pkg_ddl_util.c_#138550749 $then left join all_ind_expressions ie on ie.index_owner = ic.index_owner and ie.index_name = ic.index_name and ie.column_position = ic.column_position $end @@ -185,7 +188,7 @@ $end loop l_column_names := case when l_column_names is not null then l_column_names || ',' end || -$if pkg_ddl_util.c_#138550749 $then +$if oracle_tools.pkg_ddl_util.c_#138550749 $then case when r.column_expression is not null then to_char(dbms_utility.get_hash_value(r.column_expression, 37, 1073741824)) @@ -197,7 +200,7 @@ $end ; end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', l_column_names); dbug.leave; $end @@ -206,27 +209,27 @@ $end end get_column_names; overriding member procedure chk -( self in t_index_object +( self in oracle_tools.t_index_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_INDEX_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); if self.object_name() is null then - raise_application_error(-20000, 'Object name should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object name should not be empty'); end if; if self.column_names() is null then - raise_application_error(-20000, 'Column names should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Column names should not be empty'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_JAVA_SOURCE_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_JAVA_SOURCE_OBJECT.sql index 8d0d4804..c4f0dbee 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_JAVA_SOURCE_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_JAVA_SOURCE_OBJECT.sql @@ -1,22 +1,22 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_JAVA_SOURCE_OBJECT" AS constructor function t_java_source_object -( self in out nocopy t_java_source_object +( self in out nocopy oracle_tools.t_java_source_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_JAVA_SOURCE_OBJECT.T_JAVA_SOURCE_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); $end self.network_link$ := null; self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_DDL.sql index 141c67a2..b62f6273 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_DDL.sql @@ -1,21 +1,21 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_DDL" IS overriding member procedure migrate -( self in out nocopy t_materialized_view_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_materialized_view_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is - l_tgt_materialized_view_object t_materialized_view_object := treat(p_target.obj as t_materialized_view_object); - l_schema_ddl_tab t_schema_ddl_tab; + l_tgt_materialized_view_object oracle_tools.t_materialized_view_object := treat(p_target.obj as oracle_tools.t_materialized_view_object); + l_schema_ddl_tab oracle_tools.t_schema_ddl_tab; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_MATERIALIZED_VIEW_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source.obj.id(): %s; p_target.obj.id(): %s', p_source.obj.id(), p_target.obj.id()); $end -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -27,14 +27,14 @@ $end into l_schema_ddl_tab from table ( oracle_tools.pkg_ddl_util.display_ddl_schema - ( l_tgt_materialized_view_object.object_schema() -- p_schema - , null -- p_new_schema - , 0 -- p_sort_objects_by_deps - , 'OBJECT_GRANT' -- p_object_type - , null -- p_object_names - , null -- p_object_names_include - , l_tgt_materialized_view_object.network_link() -- p_network_link - , 0 -- p_grantor_is_schema + ( p_schema => l_tgt_materialized_view_object.object_schema() + , p_new_schema => null + , p_sort_objects_by_deps => 0 + , p_object_type => 'OBJECT_GRANT' + , p_object_names => null + , p_object_names_include => null + , p_network_link=> l_tgt_materialized_view_object.network_link() + , p_grantor_is_schema => 0 ) ) t ; @@ -61,7 +61,7 @@ $end end loop; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_LOG_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_LOG_OBJECT.sql index ccc69505..da549fb4 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_LOG_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_LOG_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_LOG_OBJECT" AS constructor function t_materialized_view_log_object -( self in out nocopy t_materialized_view_log_object +( self in out nocopy oracle_tools.t_materialized_view_log_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_MATERIALIZED_VIEW_LOG_OBJECT.T_MATERIALIZED_VIEW_LOG_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_OBJECT.sql index 60a77a15..766e9d32 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MATERIALIZED_VIEW_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_OBJECT" AS constructor function t_materialized_view_object -( self in out nocopy t_materialized_view_object +( self in out nocopy oracle_tools.t_materialized_view_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_MATERIALIZED_VIEW_OBJECT.T_MATERIALIZED_VIEW_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MEMBER_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MEMBER_OBJECT.sql index 2ad0598d..97445e02 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MEMBER_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_MEMBER_OBJECT.sql @@ -21,8 +21,8 @@ return varchar2 deterministic is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_MEMBER_OBJECT.ID'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ID'); dbug.print(dbug."output", 'return: %s', member_name()); dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_NAMED_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_NAMED_OBJECT.sql index c8782bb1..ee7d89a2 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_NAMED_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_NAMED_OBJECT.sql @@ -12,13 +12,13 @@ final static procedure create_named_object ( p_object_type in varchar2 , p_object_schema in varchar2 , p_object_name in varchar2 -, p_named_object out nocopy t_schema_object +, p_named_object out nocopy oracle_tools.t_schema_object ) is l_object_type oracle_tools.pkg_ddl_util.t_metadata_object_type := p_object_type; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_NAMED_OBJECT.CREATE_NAMED_OBJECT (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_NAMED_OBJECT (1)'); dbug.print ( dbug."input" , 'p_object_type: %s; p_object_schema: %s; p_object_name: %s' @@ -43,32 +43,32 @@ $end end if; case l_object_type - when 'SEQUENCE' then p_named_object := t_sequence_object(p_object_schema, p_object_name); - when 'TYPE_SPEC' then p_named_object := t_type_spec_object(p_object_schema, p_object_name); - when 'CLUSTER' then p_named_object := t_cluster_object(p_object_schema, p_object_name); - when 'TABLE' then p_named_object := t_table_object(p_object_schema, p_object_name, null); - when 'FUNCTION' then p_named_object := t_function_object(p_object_schema, p_object_name); - when 'PACKAGE_SPEC' then p_named_object := t_package_spec_object(p_object_schema, p_object_name); - when 'VIEW' then p_named_object := t_view_object(p_object_schema, p_object_name); - when 'PROCEDURE' then p_named_object := t_procedure_object(p_object_schema, p_object_name); - when 'MATERIALIZED_VIEW' then p_named_object := t_materialized_view_object(p_object_schema, p_object_name); - when 'MATERIALIZED_VIEW_LOG' then p_named_object := t_materialized_view_log_object(p_object_schema, p_object_name); - when 'PACKAGE_BODY' then p_named_object := t_package_body_object(p_object_schema, p_object_name); - when 'TYPE_BODY' then p_named_object := t_type_body_object(p_object_schema, p_object_name); - when 'JAVA_SOURCE' then p_named_object := t_java_source_object(p_object_schema, p_object_name); - when 'REFRESH_GROUP' then p_named_object := t_refresh_group_object(p_object_schema, p_object_name); - when 'PROCOBJ' then p_named_object := t_procobj_object(p_object_schema, p_object_name); - else raise_application_error(-20000, 'Object type "' || l_object_type || '" is not listed here.'); + when 'SEQUENCE' then p_named_object := oracle_tools.t_sequence_object(p_object_schema, p_object_name); + when 'TYPE_SPEC' then p_named_object := oracle_tools.t_type_spec_object(p_object_schema, p_object_name); + when 'CLUSTER' then p_named_object := oracle_tools.t_cluster_object(p_object_schema, p_object_name); + when 'TABLE' then p_named_object := oracle_tools.t_table_object(p_object_schema, p_object_name); + when 'FUNCTION' then p_named_object := oracle_tools.t_function_object(p_object_schema, p_object_name); + when 'PACKAGE_SPEC' then p_named_object := oracle_tools.t_package_spec_object(p_object_schema, p_object_name); + when 'VIEW' then p_named_object := oracle_tools.t_view_object(p_object_schema, p_object_name); + when 'PROCEDURE' then p_named_object := oracle_tools.t_procedure_object(p_object_schema, p_object_name); + when 'MATERIALIZED_VIEW' then p_named_object := oracle_tools.t_materialized_view_object(p_object_schema, p_object_name); + when 'MATERIALIZED_VIEW_LOG' then p_named_object := oracle_tools.t_materialized_view_log_object(p_object_schema, p_object_name); + when 'PACKAGE_BODY' then p_named_object := oracle_tools.t_package_body_object(p_object_schema, p_object_name); + when 'TYPE_BODY' then p_named_object := oracle_tools.t_type_body_object(p_object_schema, p_object_name); + when 'JAVA_SOURCE' then p_named_object := oracle_tools.t_java_source_object(p_object_schema, p_object_name); + when 'REFRESH_GROUP' then p_named_object := oracle_tools.t_refresh_group_object(p_object_schema, p_object_name); + when 'PROCOBJ' then p_named_object := oracle_tools.t_procobj_object(p_object_schema, p_object_name); + else raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object type "' || l_object_type || '" is not listed here.'); end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others then dbug.leave_on_error; raise; -$end +$end end create_named_object; final static function create_named_object @@ -76,28 +76,28 @@ final static function create_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) -return t_named_object +return oracle_tools.t_named_object is - l_named_object t_schema_object; + l_named_object oracle_tools.t_schema_object; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_NAMED_OBJECT.CREATE_NAMED_OBJECT (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_NAMED_OBJECT (2)'); $end - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_type => p_object_type , p_object_schema => p_object_schema , p_object_name => p_object_name , p_named_object => l_named_object ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end - return treat(l_named_object as t_named_object); + return treat(l_named_object as oracle_tools.t_named_object); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then exception when others then @@ -107,18 +107,18 @@ $end end create_named_object; overriding member procedure chk -( self in t_named_object +( self in oracle_tools.t_named_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_NAMED_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_DDL.sql index 3164bda6..d993c99e 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_DDL.sql @@ -1,13 +1,13 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_OBJECT_GRANT_DDL" AS overriding member procedure uninstall -( self in out nocopy t_object_grant_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_object_grant_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_OBJECT_GRANT_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_target:'); @@ -31,13 +31,13 @@ $end , p_add_sqlterminator => 0 -- the target text should already contain a sqlterminator (or not) ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end uninstall; overriding member procedure add_ddl -( self in out nocopy t_object_grant_ddl +( self in out nocopy oracle_tools.t_object_grant_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer @@ -46,8 +46,8 @@ is l_pos1 pls_integer; l_pos2 pls_integer; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_OBJECT_GRANT_DDL.ADD_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_verb: %s; p_add_sqlterminator: %s', p_verb, p_add_sqlterminator); @@ -69,7 +69,7 @@ $end end if; -- Oracle 11g has a new feature - support for generalized invocation - (self as t_schema_ddl).add_ddl + (self as oracle_tools.t_schema_ddl).add_ddl ( p_verb => p_verb , p_text => case when substr(p_text, 1, 2) = '--' /* do not execute comments */ @@ -87,13 +87,13 @@ end;]'*/ , p_add_sqlterminator => p_add_sqlterminator ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; overriding member procedure execute_ddl -( self in t_object_grant_ddl +( self in oracle_tools.t_object_grant_ddl ) is -- ORA-01917: user or role does not exist @@ -109,26 +109,26 @@ is e_ora_02224 exception; pragma exception_init(e_ora_02224, -2224); begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_OBJECT_GRANT_DDL.EXECUTE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL'); dbug.print(dbug."input", 'self:'); self.print(); $end - t_schema_ddl.execute_ddl(p_schema_ddl => self); + oracle_tools.t_schema_ddl.execute_ddl(p_schema_ddl => self); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end exception when e_ora_01917 or e_ora_01927 or e_ora_02204 or e_ora_02224 then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end null; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then when others then dbug.leave_on_error; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_OBJECT.sql index bf3b76ef..ce7e7c82 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_OBJECT_GRANT_OBJECT.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" AS constructor function t_object_grant_object -( self in out nocopy t_object_grant_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_object_grant_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_grantee in varchar2 , p_privilege in varchar2 @@ -11,8 +11,8 @@ constructor function t_object_grant_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_OBJECT_GRANT_OBJECT.T_OBJECT_GRANT_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); p_base_object.print(); dbug.print ( dbug."input" @@ -31,7 +31,7 @@ $end self.privilege$ := p_privilege; self.grantable$ := p_grantable; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -75,55 +75,55 @@ end grantable; -- end of getter(s) overriding member procedure chk -( self in t_object_grant_object +( self in oracle_tools.t_object_grant_object , p_schema in varchar2 ) is -$if pkg_ddl_util.c_#140920801 $then +$if oracle_tools.pkg_ddl_util.c_#140920801 $then pragma autonomous_transaction; -- Capture invalid objects before releasing to next enviroment. l_statement varchar2(4000 char) := null; $end begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_OBJECT_GRANT_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); if self.object_schema() is not null then - raise_application_error(-20000, 'Object schema should be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema should be empty.'); end if; if self.object_name() is not null then - raise_application_error(-20000, 'Object name should be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object name should be empty.'); end if; if self.column_name() is not null then - raise_application_error(-20000, 'Column name should be null.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Column name should be null.'); end if; if self.grantee() is null then - raise_application_error(-20000, 'Grantee should not be null.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Grantee should not be null.'); end if; if self.privilege() is null then - raise_application_error(-20000, 'Privilege should not be null.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Privilege should not be null.'); end if; if self.grantable() is null then - raise_application_error(-20000, 'Grantable should not be null.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Grantable should not be null.'); end if; -$if pkg_ddl_util.c_#140920801 $then +$if oracle_tools.pkg_ddl_util.c_#140920801 $then -- Capture invalid objects before releasing to next enviroment. -- This is implemented by re-granting the grant statement when the grantor is equal to the logged in user. - if pkg_ddl_util.do_chk(self.object_type()) and self.network_link() is null + if oracle_tools.pkg_ddl_util.do_chk(self.object_type()) and self.network_link() is null then begin select 'GRANT ' || @@ -167,7 +167,7 @@ $end $end -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_BODY_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_BODY_OBJECT.sql index feba2381..0814aa62 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_BODY_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_BODY_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_PACKAGE_BODY_OBJECT" AS constructor function t_package_body_object -( self in out nocopy t_package_body_object +( self in out nocopy oracle_tools.t_package_body_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_PACKAGE_BODY_OBJECT.T_PACKAGE_BODY_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_SPEC_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_SPEC_OBJECT.sql index d3c76155..6bb15c00 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_SPEC_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PACKAGE_SPEC_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_PACKAGE_SPEC_OBJECT" AS constructor function t_package_spec_object -( self in out nocopy t_package_spec_object +( self in out nocopy oracle_tools.t_package_spec_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_PACKAGE_SPEC_OBJECT.T_PACKAGE_SPEC_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCEDURE_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCEDURE_OBJECT.sql index 24d40af1..715b4902 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCEDURE_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCEDURE_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_PROCEDURE_OBJECT" AS constructor function t_procedure_object -( self in out nocopy t_procedure_object +( self in out nocopy oracle_tools.t_procedure_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_PROCEDURE_OBJECT.T_PROCEDURE_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_DDL.sql index 270abfbd..6ae0d5c8 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_DDL.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_PROCOBJ_DDL" AS overriding member procedure uninstall -( self in out nocopy t_procobj_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_procobj_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin @@ -12,11 +12,11 @@ begin self.add_ddl ( p_verb => 'DBMS_SCHEDULER.DROP_' || p_target.obj.dict_object_type() , p_text => 'BEGIN DBMS_SCHEDULER.DROP_' || p_target.obj.dict_object_type() || '(''' || p_target.obj.object_name() || '''); END;' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_not_implemented , 'Uninstalling ' || p_target.obj.dict_object_type() || ' ' || p_target.obj.fq_object_name() || ' not implemented.' ); end if; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_OBJECT.sql index 4e8c8a56..cd3ebc41 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_PROCOBJ_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" AS constructor function t_procobj_object -( self in out nocopy t_procobj_object +( self in out nocopy oracle_tools.t_procobj_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_PROCOBJ_OBJECT.T_PROCOBJ_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -18,9 +18,8 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then ); $end - self.network_link$ := null; - self.object_schema$ := p_object_schema; - self.object_name$ := p_object_name; + -- default constructor + self := oracle_tools.t_procobj_object(null, p_object_schema, p_object_name, null); select obj.object_type into self.dict_object_type$ @@ -29,7 +28,7 @@ $end and obj.object_name = p_object_name ; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -53,23 +52,23 @@ begin end object_type; overriding member procedure chk -( self in t_procobj_object +( self in oracle_tools.t_procobj_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_PROCOBJ_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); if self.dict_object_type() is null then - raise_application_error(-20000, 'Dictionary object type should not be null.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Dictionary object type should not be null.'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_DDL.sql index bb008cb0..01316b05 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_DDL.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_REFRESH_GROUP_DDL" AS overriding member procedure uninstall -( self in out nocopy t_refresh_group_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_refresh_group_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin self.add_ddl ( p_verb => 'DBMS_REFRESH.DESTROY' , p_text => 'BEGIN DBMS_REFRESH.DESTROY(''' || p_target.obj.object_name() || '''); END;' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end uninstall; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_OBJECT.sql index c4bd0147..1c635316 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REFRESH_GROUP_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_REFRESH_GROUP_OBJECT" AS constructor function t_refresh_group_object -( self in out nocopy t_refresh_group_object +( self in out nocopy oracle_tools.t_refresh_group_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_REFRESH_GROUP_OBJECT.T_REFRESH_GROUP_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REF_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REF_CONSTRAINT_OBJECT.sql index 09829323..e9fb8068 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REF_CONSTRAINT_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_REF_CONSTRAINT_OBJECT.sql @@ -1,13 +1,13 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" AS constructor function t_ref_constraint_object -( self in out nocopy t_ref_constraint_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_ref_constraint_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_constraint_type in varchar2 default null , p_column_names in varchar2 default null -, p_ref_object in t_named_object default null +, p_ref_object in oracle_tools.t_named_object default null ) return self as result is @@ -30,8 +30,8 @@ is r_con c_con%rowtype; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_REF_CONSTRAINT_OBJECT.T_REF_CONSTRAINT_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_object_schema: %s; p_object_name: %s; p_constraint_type: %s; p_column_names: %s' @@ -47,19 +47,23 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then end if; $end - self.base_object$ := p_base_object; - self.network_link$ := null; - self.object_schema$ := p_object_schema; - self.object_name$ := p_object_name; - self.column_names$ := nvl(p_column_names, t_constraint_object.get_column_names(p_object_schema, p_object_name, p_base_object.object_name())); - self.search_condition$ := null; + -- default constructor + self := oracle_tools.t_ref_constraint_object + ( null + , p_object_schema + , p_base_object + , p_object_name + , nvl(p_column_names, oracle_tools.t_constraint_object.get_column_names(p_object_schema => p_object_schema, p_object_name => p_object_name, p_table_name => p_base_object.object_name())) + , null -- search condition + , p_constraint_type + , p_ref_object + ); -- GPA 2017-01-18 -- one combined query (twice all_constraints and once all_objects) was too slow. if p_constraint_type is not null and p_ref_object is not null then - self.constraint_type$ := p_constraint_type; - self.ref_object$ := p_ref_object; + null; else begin self.constraint_type$ := null; -- to begin with @@ -90,7 +94,7 @@ $end where t.owner = r_con.owner and t.table_name = r_con.table_name ; - self.ref_object$ := t_table_object(l_owner, l_table_name, l_tablespace_name); + self.ref_object$ := oracle_tools.t_table_object(p_object_schema => l_owner, p_object_name => l_table_name, p_tablespace_name => l_tablespace_name); exception when no_data_found then @@ -103,7 +107,7 @@ $end where v.owner = r_con.owner and v.view_name = r_con.table_name ; - self.ref_object$ := t_view_object(l_owner, l_table_name); + self.ref_object$ := oracle_tools.t_view_object(l_owner, l_table_name); end; end if; end if; @@ -123,7 +127,7 @@ $end end; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -149,7 +153,7 @@ begin end ref_object_schema; final member procedure ref_object_schema -( self in out nocopy t_ref_constraint_object +( self in out nocopy oracle_tools.t_ref_constraint_object , p_ref_object_schema in varchar2 ) is @@ -204,23 +208,23 @@ begin end signature; overriding member procedure chk -( self in t_ref_constraint_object +( self in oracle_tools.t_ref_constraint_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_REF_CONSTRAINT_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_constraint_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_constraint_object => self, p_schema => p_schema); if self.ref_object$ is null then - raise_application_error(-20000, 'Reference object should not be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Reference object should not be empty.'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_DDL.sql index ec58e72e..c1ec1ce4 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_DDL.sql @@ -1,60 +1,60 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_SCHEMA_DDL" AS static procedure create_schema_ddl -( p_obj in t_schema_object -, p_ddl_tab in t_ddl_tab -, p_schema_ddl out nocopy t_schema_ddl +( p_obj in oracle_tools.t_schema_object +, p_ddl_tab in oracle_tools.t_ddl_tab +, p_schema_ddl out nocopy oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.CREATE_SCHEMA_DDL (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_SCHEMA_DDL (1)'); $end case - when p_obj is of (t_comment_object) then p_schema_ddl := t_comment_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_index_object) then p_schema_ddl := t_index_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_object_grant_object) then p_schema_ddl := t_object_grant_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_procobj_object) then p_schema_ddl := t_procobj_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_refresh_group_object) then p_schema_ddl := t_refresh_group_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_constraint_object) then p_schema_ddl := t_constraint_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_synonym_object) then p_schema_ddl := t_synonym_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_table_object) then p_schema_ddl := t_table_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_type_spec_object) then p_schema_ddl := t_type_spec_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_materialized_view_object) then p_schema_ddl := t_materialized_view_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_sequence_object) then p_schema_ddl := t_sequence_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_comment_object) then p_schema_ddl := oracle_tools.t_comment_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_index_object) then p_schema_ddl := oracle_tools.t_index_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_object_grant_object) then p_schema_ddl := oracle_tools.t_object_grant_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_procobj_object) then p_schema_ddl := oracle_tools.t_procobj_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_refresh_group_object) then p_schema_ddl := oracle_tools.t_refresh_group_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_constraint_object) then p_schema_ddl := oracle_tools.t_constraint_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_synonym_object) then p_schema_ddl := oracle_tools.t_synonym_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_table_object) then p_schema_ddl := oracle_tools.t_table_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_type_spec_object) then p_schema_ddl := oracle_tools.t_type_spec_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_materialized_view_object) then p_schema_ddl := oracle_tools.t_materialized_view_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_sequence_object) then p_schema_ddl := oracle_tools.t_sequence_ddl(p_obj, p_ddl_tab); -- GPA 2017-03-27 #142494703 The DDL generator should remove leading whitespace before WHEN clauses in triggers because that generates differences. - when p_obj is of (t_trigger_object) then p_schema_ddl := t_trigger_ddl(p_obj, p_ddl_tab); - -- t_table_column_object inherits from t_type_attribute_object - when p_obj is of (t_table_column_object) then p_schema_ddl := t_table_column_ddl(p_obj, p_ddl_tab); - when p_obj is of (t_type_attribute_object) then p_schema_ddl := t_type_attribute_ddl(p_obj, p_ddl_tab); - else p_schema_ddl := t_schema_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_trigger_object) then p_schema_ddl := oracle_tools.t_trigger_ddl(p_obj, p_ddl_tab); + -- oracle_tools.t_table_column_object inherits from oracle_tools.t_type_attribute_object + when p_obj is of (oracle_tools.t_table_column_object) then p_schema_ddl := oracle_tools.t_table_column_ddl(p_obj, p_ddl_tab); + when p_obj is of (oracle_tools.t_type_attribute_object) then p_schema_ddl := oracle_tools.t_type_attribute_ddl(p_obj, p_ddl_tab); + else p_schema_ddl := oracle_tools.t_schema_ddl(p_obj, p_ddl_tab); end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end create_schema_ddl; static function create_schema_ddl -( p_obj in t_schema_object -, p_ddl_tab in t_ddl_tab +( p_obj in oracle_tools.t_schema_object +, p_ddl_tab in oracle_tools.t_ddl_tab ) -return t_schema_ddl +return oracle_tools.t_schema_ddl is - l_schema_ddl t_schema_ddl; + l_schema_ddl oracle_tools.t_schema_ddl; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.CREATE_SCHEMA_DDL (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_SCHEMA_DDL (2)'); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( p_obj => p_obj , p_ddl_tab => p_ddl_tab , p_schema_ddl => l_schema_ddl ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end @@ -62,12 +62,12 @@ $end end create_schema_ddl; member procedure print -( self in t_schema_ddl +( self in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then - dbug.enter('T_SCHEMA_DDL.PRINT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'PRINT'); self.obj.print(); dbug.print(dbug."info", 'cardinality(self.ddl_tab): %s', cardinality(self.ddl_tab)); if self.ddl_tab is not null and self.ddl_tab.count > 0 @@ -85,40 +85,40 @@ $end end print; member procedure add_ddl -( self in out nocopy t_schema_ddl +( self in out nocopy oracle_tools.t_schema_ddl , p_verb in varchar2 -, p_text in t_text_tab +, p_text in oracle_tools.t_text_tab ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.ADD_DDL (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL (1)'); $end self.ddl_tab.extend(1); self.ddl_tab(self.ddl_tab.last) := - t_ddl + oracle_tools.t_ddl ( p_ddl# => self.ddl_tab.last , p_verb => p_verb , p_text => p_text ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; member procedure add_ddl -( self in out nocopy t_schema_ddl +( self in out nocopy oracle_tools.t_schema_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer ) is - l_text_tab t_text_tab; + l_text_tab oracle_tools.t_text_tab; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.ADD_DDL (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL (2)'); $end l_text_tab := oracle_tools.pkg_str_util.clob2text(p_text, 1); -- text @@ -132,12 +132,12 @@ $end , p_text => l_text_tab ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; -order member function match( p_schema_ddl in t_schema_ddl ) +order member function match( p_schema_ddl in oracle_tools.t_schema_ddl ) return integer deterministic is @@ -145,8 +145,8 @@ is l_count1 integer; l_count2 integer; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.MATCH'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MATCH'); $end case @@ -190,7 +190,7 @@ $end end case; end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."output", 'return: %s', l_result); dbug.leave; $end @@ -199,13 +199,13 @@ $end end match; final member procedure install -( self in out nocopy t_schema_ddl -, p_source in t_schema_ddl +( self in out nocopy oracle_tools.t_schema_ddl +, p_source in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.INSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'INSTALL'); $end for i_ddl_idx in p_source.ddl_tab.first .. p_source.ddl_tab.last @@ -216,41 +216,41 @@ $end ); end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end install; static procedure migrate -( p_source in t_schema_ddl -, p_target in t_schema_ddl -, p_schema_ddl in out nocopy t_schema_ddl +( p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl +, p_schema_ddl in out nocopy oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); $end - pkg_ddl_util.migrate_schema_ddl + oracle_tools.pkg_ddl_util.migrate_schema_ddl ( p_source => p_source , p_target => p_target , p_schema_ddl => p_schema_ddl ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; member procedure migrate -( self in out nocopy t_schema_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_schema_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -258,52 +258,52 @@ begin end migrate; member procedure uninstall -( self in out nocopy t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); $end self.add_ddl ( p_verb => 'DROP' , p_text => 'DROP ' || p_target.obj.dict_object_type() || ' ' || p_target.obj.fq_object_name() - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end uninstall; member procedure chk -( self in t_schema_ddl +( self in oracle_tools.t_schema_ddl , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end self.obj.chk(p_schema); if self.ddl_tab is null or self.ddl_tab.count = 0 then - raise_application_error(-20000, 'The number of ddl statements must be at least 1'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'The number of ddl statements must be at least 1'); else for i_idx in self.ddl_tab.first .. self.ddl_tab.last loop if self.ddl_tab(i_idx).text is null or self.ddl_tab(i_idx).text.count = 0 then - raise_application_error(-20000, 'There is no ddl text for ddl statement ' || i_idx); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'There is no ddl text for ddl statement ' || i_idx); end if; end loop; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -319,12 +319,12 @@ is l_verb_tab dbms_sql.varchar2a; l_schema_ddl oracle_tools.t_schema_ddl; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.EXECUTE_DDL (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL (1)'); $end - pkg_str_util.split(p_str => p_id, p_delimiter => ':', p_str_tab => l_part_tab); - pkg_str_util.split(p_str => p_text, p_delimiter => ' ', p_str_tab => l_verb_tab); + oracle_tools.pkg_str_util.split(p_str => p_id, p_delimiter => ':', p_str_tab => l_part_tab); + oracle_tools.pkg_str_util.split(p_str => p_text, p_delimiter => ' ', p_str_tab => l_verb_tab); l_schema_ddl := oracle_tools.t_schema_ddl.create_schema_ddl @@ -344,17 +344,17 @@ $end ); l_schema_ddl.execute_ddl(); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end exception when others then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave_on_error; $end raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_reraise_with_backtrace , '# parts: ' || l_part_tab.count || '; part #0: ' || case when l_part_tab.count >= l_part_tab.first+0 then l_part_tab(l_part_tab.first+0) end || '; part #1: ' || case when l_part_tab.count >= l_part_tab.first+1 then l_part_tab(l_part_tab.first+1) end || @@ -372,18 +372,18 @@ $end end execute_ddl; member procedure execute_ddl -( self in t_schema_ddl +( self in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.EXECUTE_DDL (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL (2)'); self.obj.print(); $end - t_schema_ddl.execute_ddl(p_schema_ddl => self); + oracle_tools.t_schema_ddl.execute_ddl(p_schema_ddl => self); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -392,16 +392,16 @@ exception $end end execute_ddl; -static procedure execute_ddl(p_schema_ddl in t_schema_ddl) +static procedure execute_ddl(p_schema_ddl in oracle_tools.t_schema_ddl) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_DDL.EXECUTE_DDL (3)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'EXECUTE_DDL (3)'); $end execute immediate p_schema_ddl.ddl_tab(1).text(1); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_OBJECT.sql index efc9ac06..d34862db 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SCHEMA_OBJECT.sql @@ -9,7 +9,7 @@ begin end network_link; final member procedure network_link -( self in out nocopy t_schema_object +( self in out nocopy oracle_tools.t_schema_object , p_network_link in varchar2 ) is @@ -26,7 +26,7 @@ begin end object_schema; final member procedure object_schema -( self in out nocopy t_schema_object +( self in out nocopy oracle_tools.t_schema_object , p_object_schema in varchar2 ) is @@ -51,12 +51,12 @@ begin end base_object_schema; member procedure base_object_schema -( self in out nocopy t_schema_object +( self in out nocopy oracle_tools.t_schema_object , p_base_object_schema in varchar2 ) is begin - raise_application_error(-20000, 'An object of type ' || self.object_type() || ' can not set its base_object_schema.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_not_implemented, 'An object of type ' || self.object_type() || ' can not set its base_object_schema.'); end base_object_schema; member function base_object_type @@ -163,7 +163,7 @@ return integer deterministic is begin - return t_schema_object.object_type_order(self.object_type); + return oracle_tools.t_schema_object.object_type_order(self.object_type); end object_type_order; static function id @@ -183,8 +183,8 @@ deterministic is l_id varchar2(4000 char) := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SCHEMA_OBJECT.ID'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ID'); dbug.print(dbug."input", 'p_object_schema: %s; p_object_type: %s; p_object_name: %s', p_object_schema, p_object_type, p_object_name); if not(p_base_object_schema is null and p_base_object_type is null and p_base_object_name is null) then @@ -246,7 +246,7 @@ $end elsif p_object_type in ('INDEX') then l_id := - -- DBMS_METADATA does not need to determine base object, but we do in pkg_ddl_util.parse_ddl() + -- DBMS_METADATA does not need to determine base object, but we do in oracle_tools.pkg_ddl_util.parse_ddl() -- :INDEX:DOCUMENT_PK:::: p_object_schema || ':' || p_object_type || ':' || @@ -325,7 +325,7 @@ $end ; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_id); dbug.leave; $end @@ -338,7 +338,7 @@ return varchar2 deterministic is begin - return t_schema_object.id + return oracle_tools.t_schema_object.id ( p_object_schema => self.object_schema , p_object_type => self.object_type , p_object_name => self.object_name @@ -366,10 +366,10 @@ static function dict2metadata_object_type return varchar2 deterministic is - l_metadata_object_type pkg_ddl_util.t_metadata_object_type; + l_metadata_object_type oracle_tools.pkg_ddl_util.t_metadata_object_type; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SCHEMA_OBJECT.DICT2METADATA_OBJECT_TYPE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'DICT2METADATA_OBJECT_TYPE'); $end l_metadata_object_type := case @@ -385,7 +385,7 @@ $end else replace(p_dict_object_type, ' ', '_') end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -397,14 +397,14 @@ return varchar2 deterministic is begin - return t_schema_object.dict2metadata_object_type(self.object_type); + return oracle_tools.t_schema_object.dict2metadata_object_type(self.object_type); end dict2metadata_object_type; -member procedure print(self in t_schema_object) +member procedure print(self in oracle_tools.t_schema_object) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then - dbug.enter('T_SCHEMA_OBJECT.PRINT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 1 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'PRINT'); dbug.print(dbug."info", 'network link: %s; id: %s', self.network_link(), self.id()); dbug.print(dbug."info", 'signature: %s', self.signature()); dbug.leave; @@ -424,12 +424,14 @@ static procedure create_schema_object , p_grantee in varchar2 default null , p_privilege in varchar2 default null , p_grantable in varchar2 default null -, p_schema_object out nocopy t_schema_object +, p_schema_object out nocopy oracle_tools.t_schema_object ) is + l_base_object_schema all_objects.owner%type := p_base_object_schema; + l_base_object_name all_objects.object_name%type := p_base_object_name; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then - dbug.enter('T_SCHEMA_OBJECT.CREATE_SCHEMA_OBJECT (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_SCHEMA_OBJECT (1)'); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_type: %s; p_object_name: %s' @@ -461,30 +463,60 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then $end case p_object_type - when 'INDEX' + when 'INDEX' -- a named object with a base named object then + -- base_object_type is corrected in create_named_object() + if l_base_object_schema is null or l_base_object_name is null + then + select i.table_owner + , i.table_name + into l_base_object_schema + , l_base_object_name + from all_indexes i + where i.owner = p_object_schema + and i.index_name = p_object_name + and ( l_base_object_schema is null or i.table_owner = l_base_object_schema ) + and ( l_base_object_name is null or i.table_name = l_base_object_name ) + ; + end if; + p_schema_object := - t_index_object + oracle_tools.t_index_object ( p_base_object => - t_named_object.create_named_object - ( p_object_schema => p_base_object_schema + oracle_tools.t_named_object.create_named_object + ( p_object_schema => l_base_object_schema , p_object_type => p_base_object_type - , p_object_name => p_base_object_name + , p_object_name => l_base_object_name ) , p_object_schema => p_object_schema , p_object_name => p_object_name , p_tablespace_name => null ); - when 'TRIGGER' + when 'TRIGGER' -- a named object with a base named object then + -- base_object_type is corrected in create_named_object() + if l_base_object_schema is null or l_base_object_name is null + then + select t.table_owner + , t.table_name + into l_base_object_schema + , l_base_object_name + from all_triggers t + where t.owner = p_object_schema + and t.trigger_name = p_object_name + and ( l_base_object_schema is null or t.table_owner = l_base_object_schema ) + and ( l_base_object_name is null or t.table_name = l_base_object_name ) + ; + end if; + p_schema_object := - t_trigger_object + oracle_tools.t_trigger_object ( p_base_object => - t_named_object.create_named_object - ( p_object_schema => p_base_object_schema + oracle_tools.t_named_object.create_named_object + ( p_object_schema => l_base_object_schema , p_object_type => p_base_object_type - , p_object_name => p_base_object_name + , p_object_name => l_base_object_name ) , p_object_schema => p_object_schema , p_object_name => p_object_name @@ -493,9 +525,9 @@ $end when 'OBJECT_GRANT' then p_schema_object := - t_object_grant_object + oracle_tools.t_object_grant_object ( p_base_object => - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => p_base_object_schema , p_object_type => p_base_object_type , p_object_name => p_base_object_name @@ -509,9 +541,9 @@ $end when 'CONSTRAINT' then p_schema_object := - t_constraint_object + oracle_tools.t_constraint_object ( p_base_object => - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => p_base_object_schema , p_object_type => p_base_object_type , p_object_name => p_base_object_name @@ -523,9 +555,9 @@ $end when 'REF_CONSTRAINT' then p_schema_object := - t_ref_constraint_object + oracle_tools.t_ref_constraint_object ( p_base_object => - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => p_base_object_schema , p_object_type => p_base_object_type , p_object_name => p_base_object_name @@ -534,15 +566,30 @@ $end , p_object_name => p_object_name ); - when 'SYNONYM' + when 'SYNONYM' -- a named object with a base named object then + -- base_object_type is corrected in create_named_object() + if l_base_object_schema is null or l_base_object_name is null + then + select s.table_owner + , s.table_name + into l_base_object_schema + , l_base_object_name + from all_synonyms s + where s.owner = p_object_schema + and s.synonym_name = p_object_name + and ( l_base_object_schema is null or s.table_owner = l_base_object_schema ) + and ( l_base_object_name is null or s.table_name = l_base_object_name ) + ; + end if; + p_schema_object := - t_synonym_object + oracle_tools.t_synonym_object ( p_base_object => - t_named_object.create_named_object - ( p_object_schema => p_base_object_schema + oracle_tools.t_named_object.create_named_object + ( p_object_schema => l_base_object_schema , p_object_type => p_base_object_type - , p_object_name => p_base_object_name + , p_object_name => l_base_object_name ) , p_object_schema => p_object_schema , p_object_name => p_object_name @@ -551,9 +598,9 @@ $end when 'COMMENT' then p_schema_object := - t_comment_object + oracle_tools.t_comment_object ( p_base_object => - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => p_base_object_schema , p_object_type => p_base_object_type , p_object_name => p_base_object_name @@ -586,7 +633,7 @@ $end -- when 'REFRESH_GROUP' -- when 'XMLSCHEMA' -- when 'PROCOBJ' - t_named_object.create_named_object + oracle_tools.t_named_object.create_named_object ( p_object_schema => p_object_schema , p_object_type => p_object_type , p_object_name => p_object_name @@ -594,7 +641,7 @@ $end ); end case; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 1 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -616,15 +663,15 @@ static function create_schema_object , p_privilege in varchar2 default null , p_grantable in varchar2 default null ) -return t_schema_object +return oracle_tools.t_schema_object is - l_schema_object t_schema_object; + l_schema_object oracle_tools.t_schema_object; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_OBJECT.CREATE_SCHEMA_OBJECT (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CREATE_SCHEMA_OBJECT (2)'); $end - t_schema_object.create_schema_object + oracle_tools.t_schema_object.create_schema_object ( p_object_schema => p_object_schema , p_object_type => p_object_type , p_object_name => p_object_name @@ -638,13 +685,13 @@ $end , p_schema_object => l_schema_object ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end return l_schema_object; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; exception when others @@ -708,7 +755,7 @@ return integer deterministic is begin - return t_schema_object.is_a_repeatable(self.object_type()); + return oracle_tools.t_schema_object.is_a_repeatable(self.object_type()); end is_a_repeatable; final member function fq_object_name @@ -724,8 +771,8 @@ is return case when upper(p_object_part) != p_object_part then '"' || p_object_part || '"' else p_object_part end; end get_object_part; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SCHEMA_OBJECT.FQ_OBJECT_NAME'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'FQ_OBJECT_NAME'); $end l_object_name := @@ -734,7 +781,7 @@ $end || get_object_part(object_name()) ; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_object_name); dbug.leave; $end @@ -746,16 +793,16 @@ member function dict_object_type return varchar2 deterministic is - l_dict_object_type pkg_ddl_util.t_dict_object_type; - l_metadata_object_type pkg_ddl_util.t_metadata_object_type; + l_dict_object_type oracle_tools.pkg_ddl_util.t_dict_object_type; + l_metadata_object_type oracle_tools.pkg_ddl_util.t_metadata_object_type; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SCHEMA_OBJECT.DICT_OBJECT_TYPE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'DICT_OBJECT_TYPE'); $end l_metadata_object_type := self.object_type(); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."info", 'l_metadata_object_type: %s', l_metadata_object_type); $end @@ -768,7 +815,7 @@ $end else replace(l_metadata_object_type, '_', ' ') end; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_dict_object_type); dbug.leave; $end @@ -777,18 +824,18 @@ $end end dict_object_type; member procedure chk -( self in t_schema_object +( self in oracle_tools.t_schema_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SCHEMA_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_schema_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_schema_object => self, p_schema => p_schema); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_DDL.sql index e0597a00..31e2181c 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_DDL.sql @@ -1,25 +1,25 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_SEQUENCE_DDL" AS overriding member procedure add_ddl -( self in out nocopy t_sequence_ddl +( self in out nocopy oracle_tools.t_sequence_ddl , p_verb in varchar2 -, p_text in t_text_tab +, p_text in oracle_tools.t_text_tab ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SEQUENCE_DDL.ADD_DDL (1)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL (1)'); $end self.ddl_tab.extend(1); self.ddl_tab(self.ddl_tab.last) := - t_ddl_sequence + oracle_tools.t_ddl_sequence ( /*p_ddl# => */self.ddl_tab.last , /*p_verb => */p_verb , /*p_text => */p_text ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_OBJECT.sql index 8d981c04..52ae4c24 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SEQUENCE_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_SEQUENCE_OBJECT" AS constructor function t_sequence_object -( self in out nocopy t_sequence_object +( self in out nocopy oracle_tools.t_sequence_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SEQUENCE_OBJECT.T_SEQUENCE_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_DDL.sql index 6b288d43..de615321 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_DDL.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_SYNONYM_DDL" AS overriding member procedure uninstall -( self in out nocopy t_synonym_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_synonym_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin @@ -11,13 +11,13 @@ begin self.add_ddl ( p_verb => 'DROP' , p_text => 'DROP PUBLIC SYNONYM "' || p_target.obj.object_name() || '"' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); else self.add_ddl ( p_verb => 'DROP' , p_text => 'DROP ' || p_target.obj.dict_object_type() || ' ' || p_target.obj.fq_object_name() - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_OBJECT.sql index 119f850c..c3a3d159 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_SYNONYM_OBJECT.sql @@ -1,16 +1,16 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_SYNONYM_OBJECT" AS constructor function t_synonym_object -( self in out nocopy t_synonym_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_synonym_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_SYNONYM_OBJECT.T_SYNONYM_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_object_schema: %s; p_object_name: %s' @@ -25,7 +25,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -53,13 +53,13 @@ end object_name; -- end of getter(s) overriding member procedure chk -( self in t_synonym_object +( self in oracle_tools.t_synonym_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_SYNONYM_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); dbug.print(dbug."input", 'self:'); self.print(); $end @@ -67,7 +67,7 @@ $end -- GPA 2017-01-18 -- Do not call -- - -- pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + -- oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); -- -- for a PUBLIC synonym @@ -75,33 +75,33 @@ $end then null; -- ok else - raise_application_error(-20000, 'Object schema must be PUBLIC or ' || p_schema); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema must be PUBLIC or ' || p_schema); end if; if self.object_schema() = 'PUBLIC' then if (self.base_object_schema() is null) then - raise_application_error(-20000, 'Base object schema should not be empty'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema should not be empty'); end if; if self.base_object_schema() = p_schema then null; -- ok else - raise_application_error(-20000, 'Base object schema must be ' || p_schema || ' for a PUBLIC synonym'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema must be ' || p_schema || ' for a PUBLIC synonym'); end if; else if self.object_schema() = p_schema then null; -- ok else - raise_application_error(-20000, 'Object schema must be ' || p_schema || ' for a private synonym'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema must be ' || p_schema || ' for a private synonym'); end if; - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_DDL.sql index 951a09d3..192ca8c6 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_DDL.sql @@ -1,27 +1,27 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TABLE_COLUMN_DDL" AS constructor function t_table_column_ddl -( self in out nocopy t_table_column_ddl -, p_obj in t_schema_object +( self in out nocopy oracle_tools.t_table_column_ddl +, p_obj in oracle_tools.t_schema_object ) return self as result is - l_table_column_object t_table_column_object := treat(p_obj as t_table_column_object); + l_table_column_object oracle_tools.t_table_column_object := treat(p_obj as oracle_tools.t_table_column_object); l_buffer varchar2(32767 char) := null; l_clob clob := null; "ADD" constant varchar2(5) := ' ADD '; - l_data_default t_text_tab; + l_data_default oracle_tools.t_text_tab; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TABLE_COLUMN_DDL.T_TABLE_COLUMN_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); $end self.obj := p_obj; - self.ddl_tab := t_ddl_tab(); + self.ddl_tab := oracle_tools.t_ddl_tab(); /* construct the ALTER TABLE ADD COLUMN here */ - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'ALTER TABLE "' || l_table_column_object.base_object_schema() || '"."' || l_table_column_object.base_object_name() || '"' || "ADD" || '"' || l_table_column_object.column_name() || '" ' , pio_buffer => l_buffer @@ -29,7 +29,7 @@ $end ); -- datatype - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_table_column_object.data_type() , pio_buffer => l_buffer , pio_clob => l_clob @@ -38,7 +38,7 @@ $end -- default? if l_table_column_object.default_length() > 0 and l_table_column_object.data_default() is not null then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => ' DEFAULT ' , pio_buffer => l_buffer , pio_clob => l_clob @@ -46,7 +46,7 @@ $end l_data_default := l_table_column_object.data_default(); for i_idx in l_data_default.first .. l_data_default.last loop - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_data_default(i_idx) , pio_buffer => l_buffer , pio_clob => l_clob @@ -56,7 +56,7 @@ $end if l_table_column_object.nullable() = 'N' then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => ' NOT NULL' , pio_buffer => l_buffer , pio_clob => l_clob @@ -64,7 +64,7 @@ $end end if; -- append the buffer to l_clob (if that has not already been done) - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_buffer , pio_clob => l_clob ); @@ -72,12 +72,12 @@ $end self.add_ddl ( p_verb => 'ALTER' , p_text => l_clob - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); dbms_lob.freetemporary(l_clob); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -85,25 +85,25 @@ $end end; overriding member procedure migrate -( self in out nocopy t_table_column_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_table_column_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is l_buffer varchar2(32767 char) := null; l_clob clob := null; - l_source_table_column_object t_table_column_object := treat(p_source.obj as t_table_column_object); - l_target_table_column_object t_table_column_object := treat(p_target.obj as t_table_column_object); - l_data_default t_text_tab; + l_source_table_column_object oracle_tools.t_table_column_object := treat(p_source.obj as oracle_tools.t_table_column_object); + l_target_table_column_object oracle_tools.t_table_column_object := treat(p_target.obj as oracle_tools.t_table_column_object); + l_data_default oracle_tools.t_text_tab; l_changed boolean; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_COLUMN_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source: %s; p_target: %s', p_source.obj.signature(), p_target.obj.signature()); $end -- invoke the super method - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -115,7 +115,7 @@ $end l_buffer := null; l_changed := false; - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'ALTER TABLE "' || l_source_table_column_object.base_object_schema() || '"."' || l_source_table_column_object.base_object_name() || '"' || ' MODIFY "' || l_source_table_column_object.member_name() || '" ' , pio_buffer => l_buffer @@ -128,7 +128,7 @@ $end -- datatype changed? if l_source_table_column_object.data_type() != l_target_table_column_object.data_type() then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_source_table_column_object.data_type() , pio_buffer => l_buffer , pio_clob => l_clob @@ -141,7 +141,7 @@ $end -- default changed? if l_source_table_column_object.data_default() != l_target_table_column_object.data_default() then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'DEFAULT ' , pio_buffer => l_buffer , pio_clob => l_clob @@ -151,14 +151,14 @@ $end then for i_idx in l_data_default.first .. l_data_default.last loop - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_data_default(i_idx) , pio_buffer => l_buffer , pio_clob => l_clob ); end loop; else - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'NULL' , pio_buffer => l_buffer , pio_clob => l_clob @@ -171,7 +171,7 @@ $end then if l_source_table_column_object.nullable() != l_target_table_column_object.nullable() then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => case l_source_table_column_object.nullable() when 'N' then 'NOT NULL' else 'NULL' end , pio_buffer => l_buffer , pio_clob => l_clob @@ -183,7 +183,7 @@ $end if l_changed then -- append the buffer to l_clob (if that has not already been done) - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_buffer , pio_clob => l_clob ); @@ -191,7 +191,7 @@ $end self.add_ddl ( p_verb => 'ALTER' , p_text => l_clob - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; end loop; @@ -201,19 +201,19 @@ $end dbms_lob.freetemporary(l_clob); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; overriding member procedure uninstall -( self in out nocopy t_table_column_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_table_column_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_COLUMN_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); $end -- ALTER TABLE "owner"."table" DROP COLUMN "column" @@ -227,12 +227,12 @@ $end p_target.obj.base_object_name() || '"' || ' DROP COLUMN "' || - treat(p_target.obj as t_table_column_object).member_name() || + treat(p_target.obj as oracle_tools.t_table_column_object).member_name() || '"' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end uninstall; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_OBJECT.sql index 1672c313..988e39f4 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_COLUMN_OBJECT.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" IS constructor function t_table_column_object -( self in out nocopy t_table_column_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_table_column_object +, p_base_object in oracle_tools.t_named_object , p_member# in integer , p_member_name in varchar2 , p_data_type_name in varchar2 @@ -14,7 +14,7 @@ constructor function t_table_column_object , p_character_set_name in varchar2 , p_nullable in varchar2 , p_default_length in number -, p_data_default in t_text_tab +, p_data_default in oracle_tools.t_text_tab , p_char_col_decl_length in number , p_char_length number , p_char_used in varchar2 @@ -22,8 +22,8 @@ constructor function t_table_column_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TABLE_COLUMN_OBJECT.T_TABLE_COLUMN_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_member#: %s; p_member_name: %s' @@ -50,7 +50,7 @@ $end self.char_length$ := p_char_length; self.char_used$ := p_char_used; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -87,7 +87,7 @@ begin end default_length; member function data_default -return t_text_tab +return oracle_tools.t_text_tab is begin return data_default$; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_DDL.sql index a9ac732b..600f18ac 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_DDL.sql @@ -1,30 +1,30 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TABLE_DDL" IS overriding member procedure migrate -( self in out nocopy t_table_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_table_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is - l_source_table_object t_table_object := treat(p_source.obj as t_table_object); - l_target_table_object t_table_object := treat(p_target.obj as t_table_object); - l_source_member_ddl_tab t_schema_ddl_tab; - l_target_member_ddl_tab t_schema_ddl_tab; - l_table_column_ddl t_schema_ddl; + l_source_table_object oracle_tools.t_table_object := treat(p_source.obj as oracle_tools.t_table_object); + l_target_table_object oracle_tools.t_table_object := treat(p_target.obj as oracle_tools.t_table_object); + l_source_member_ddl_tab oracle_tools.t_schema_ddl_tab; + l_target_member_ddl_tab oracle_tools.t_schema_ddl_tab; + l_table_column_ddl oracle_tools.t_schema_ddl; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source.obj.id(): %s; p_target.obj.id(): %s', p_source.obj.id(), p_target.obj.id()); $end -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print ( dbug."info" , 'l_source_table_object.tablespace_name(): %s; l_target_table_object.tablespace_name(): %s' @@ -46,7 +46,7 @@ $end '" MOVE TABLESPACE "' || l_source_table_object.tablespace_name() || '"' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); -- the table indexes will become unusable after the move tablespace so rebuild them (dynamically) @@ -68,7 +68,7 @@ BEGIN EXECUTE IMMEDIATE R.CMD; END LOOP; END;]' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; @@ -94,39 +94,39 @@ END;]' l_table_column_ddl := null; if r.source_schema_ddl is null then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** target column ***'); r.target_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.target_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_table_column_ddl ); l_table_column_ddl.uninstall(r.target_schema_ddl); elsif r.target_schema_ddl is null then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** source column ***'); r.source_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.source_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_table_column_ddl ); l_table_column_ddl.install(r.source_schema_ddl); elsif r.source_schema_ddl <> r.target_schema_ddl then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** source column ***'); r.source_schema_ddl.print(); dbug.print(dbug."info", '*** target column ***'); r.target_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.source_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_table_column_ddl ); l_table_column_ddl.migrate @@ -145,7 +145,7 @@ $end ); end loop; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then if l_table_column_ddl is not null then dbug.print(dbug."info", '*** result column ***'); @@ -154,34 +154,34 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then $end end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; overriding member procedure uninstall -( self in out nocopy t_table_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_table_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); $end self.add_ddl ( p_verb => 'DROP' , p_text => 'DROP ' || p_target.obj.dict_object_type() || ' ' || p_target.obj.fq_object_name() || ' PURGE' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end uninstall; overriding member procedure add_ddl -( self in out nocopy t_table_ddl +( self in out nocopy oracle_tools.t_table_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer @@ -191,8 +191,8 @@ is l_find_expr constant varchar2(100) := '(SEGMENT CREATION (DEFERRED|IMMEDIATE))'; l_repl_expr constant varchar2(100) := null; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_DDL.ADD_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_verb: %s; p_add_sqlterminator: %s', p_verb, p_add_sqlterminator); @@ -204,7 +204,7 @@ $end , p_add_sqlterminator => p_add_sqlterminator ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_OBJECT.sql index 4caf3da3..d69b44ac 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TABLE_OBJECT.sql @@ -1,38 +1,47 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TABLE_OBJECT" AS constructor function t_table_object -( self in out nocopy t_table_object +( self in out nocopy oracle_tools.t_table_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TABLE_OBJECT.T_TABLE_OBJECT (1)'); - dbug.print(dbug."input", 'p_object_schema: %s; p_object_name: %s', p_object_schema, p_object_name); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || ' (1)'); + dbug.print + ( dbug."input" + , 'p_owner: %s; p_object_schema: %s; p_object_name: %s' + , p_owner + , p_object_schema + , p_object_name + , p_tablespace_name + ); $end - self.network_link$ := null; - self.object_schema$ := p_object_schema; - self.object_name$ := p_object_name; - - begin - -- standard table? - select t.tablespace_name - into self.tablespace_name$ - from all_tables t - where t.owner = p_object_schema - and t.table_name = p_object_name - ; - exception - when no_data_found - then - -- maybe a temporary table - self.tablespace_name$ := null; - end; - -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then + -- non default constructor + self := oracle_tools.t_table_object(p_object_schema, p_object_name, null); + + if self.tablespace_name$ is null + then + begin + -- standard table? + select t.tablespace_name + into self.tablespace_name$ + from all_tables t + where t.owner = p_object_schema + and t.table_name = p_object_name + ; + exception + when no_data_found + then + -- maybe a temporary table + self.tablespace_name$ := null; + end; + end if; + +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."info", 'self.tablespace_name$: %s', self.tablespace_name$); dbug.leave; $end @@ -41,7 +50,7 @@ $end end; constructor function t_table_object -( self in out nocopy t_table_object +( self in out nocopy oracle_tools.t_table_object , p_object_schema in varchar2 , p_object_name in varchar2 , p_tablespace_name in varchar2 @@ -49,8 +58,8 @@ constructor function t_table_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TABLE_OBJECT.T_TABLE_OBJECT (2)'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || ' (2)'); dbug.print(dbug."input", 'p_object_schema: %s; p_object_name: %s; p_tablespace_name: %s', p_object_schema, p_object_name, p_tablespace_name); $end @@ -59,7 +68,7 @@ $end self.object_name$ := p_object_name; self.tablespace_name$ := p_tablespace_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -75,7 +84,7 @@ begin end tablespace_name; member procedure tablespace_name -( self in out nocopy t_table_object +( self in out nocopy oracle_tools.t_table_object , p_tablespace_name in varchar2 ) is @@ -92,20 +101,20 @@ begin end object_type; overriding member procedure chk -( self in t_table_object +( self in oracle_tools.t_table_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TABLE_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_named_object => self, p_schema => p_schema); -- tablespace name may or may not be empty -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_DDL.sql index dd1d85a0..fd84d589 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_DDL.sql @@ -1,7 +1,7 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TRIGGER_DDL" IS overriding member procedure add_ddl -( self in out nocopy t_trigger_ddl +( self in out nocopy oracle_tools.t_trigger_ddl , p_verb in varchar2 , p_text in clob , p_add_sqlterminator in integer @@ -12,8 +12,8 @@ is l_find_expr constant varchar2(100) := '^(\s+)(when\s(|.*[^:a-zA-Z0-9$#_])(old|new)\..*)$'; -- :old or :new is used in trigger body, not the triggering event l_repl_expr constant varchar2(100) := '\2'; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TRIGGER_DDL.ADD_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'ADD_DDL'); dbug.print(dbug."input", 'self:'); self.print(); dbug.print(dbug."input", 'p_verb: %s; p_add_sqlterminator: %s', p_verb, p_add_sqlterminator); @@ -25,7 +25,7 @@ $end , p_add_sqlterminator => p_add_sqlterminator ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end add_ddl; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_OBJECT.sql index e6c26e13..a8bfa86f 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TRIGGER_OBJECT.sql @@ -1,16 +1,16 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TRIGGER_OBJECT" AS constructor function t_trigger_object -( self in out nocopy t_trigger_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_trigger_object +, p_base_object in oracle_tools.t_named_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TRIGGER_OBJECT.T_TRIGGER_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_object_schema: %s; p_object_name: %s' @@ -25,7 +25,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -53,29 +53,29 @@ end object_name; -- end of getter(s) overriding member procedure chk -( self in t_trigger_object +( self in oracle_tools.t_trigger_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TRIGGER_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); if self.object_schema() = p_schema then null; -- ok else - raise_application_error(-20000, 'Object schema (' || self.object_schema() || ') must be ' || p_schema); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Object schema (' || self.object_schema() || ') must be ' || p_schema); end if; if self.base_object_schema() is null then - raise_application_error(-20000, 'Base object schema should not be empty.'); + raise_application_error(oracle_tools.pkg_ddl_error.c_invalid_parameters, 'Base object schema should not be empty.'); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_DDL.sql index 10c45a73..9e033730 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_DDL.sql @@ -1,27 +1,27 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_DDL" AS constructor function t_type_attribute_ddl -( self in out nocopy t_type_attribute_ddl -, p_obj in t_schema_object +( self in out nocopy oracle_tools.t_type_attribute_ddl +, p_obj in oracle_tools.t_schema_object ) return self as result is - l_type_attribute_object t_type_attribute_object := treat(p_obj as t_type_attribute_object); + l_type_attribute_object oracle_tools.t_type_attribute_object := treat(p_obj as oracle_tools.t_type_attribute_object); l_buffer varchar2(32767 char) := null; l_clob clob := null; " ADD " constant varchar2(5) := ' ADD '; - l_data_default t_text_tab; + l_data_default oracle_tools.t_text_tab; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_ATTRIBUTE_DDL.T_TYPE_ATTRIBUTE_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); $end self.obj := p_obj; - self.ddl_tab := t_ddl_tab(); + self.ddl_tab := oracle_tools.t_ddl_tab(); /* construct the ALTER TYPE ADD ATTRIBUTE here */ - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'ALTER TYPE "' || l_type_attribute_object.base_object_schema() || '"."' || l_type_attribute_object.base_object_name() || '"' || " ADD " || 'ATTRIBUTE "' || l_type_attribute_object.member_name() || '" ' || l_type_attribute_object.data_type() , pio_buffer => l_buffer @@ -29,7 +29,7 @@ $end ); -- append the buffer to l_clob (if that has not already been done) - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_buffer , pio_clob => l_clob ); @@ -41,7 +41,7 @@ $end dbms_lob.freetemporary(l_clob); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -49,24 +49,24 @@ $end end; overriding member procedure migrate -( self in out nocopy t_type_attribute_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_type_attribute_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is l_buffer varchar2(32767 char) := null; l_clob clob := null; - l_source_type_attribute_object t_type_attribute_object := treat(p_source.obj as t_type_attribute_object); - l_target_type_attribute_object t_type_attribute_object := treat(p_target.obj as t_type_attribute_object); + l_source_type_attribute_object oracle_tools.t_type_attribute_object := treat(p_source.obj as oracle_tools.t_type_attribute_object); + l_target_type_attribute_object oracle_tools.t_type_attribute_object := treat(p_target.obj as oracle_tools.t_type_attribute_object); l_changed boolean; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_ATTRIBUTE_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source: %s; p_target: %s', p_source.obj.signature(), p_target.obj.signature()); $end -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -74,7 +74,7 @@ $end l_changed := false; - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'ALTER TYPE "' || l_source_type_attribute_object.base_object_schema() || '"."' || l_source_type_attribute_object.base_object_name() || '"' || ' MODIFY "' || l_source_type_attribute_object.member_name() || '" ' , pio_buffer => l_buffer @@ -84,7 +84,7 @@ $end -- datatype changed? if l_source_type_attribute_object.data_type() != l_target_type_attribute_object.data_type() then - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_source_type_attribute_object.data_type() , pio_buffer => l_buffer , pio_clob => l_clob @@ -95,7 +95,7 @@ $end if l_changed then -- append the buffer to l_clob (if that has not already been done) - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_buffer , pio_clob => l_clob ); @@ -103,7 +103,7 @@ $end self.add_ddl ( p_verb => 'ALTER' , p_text => l_clob - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); end if; @@ -112,19 +112,19 @@ $end dbms_lob.freetemporary(l_clob); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end migrate; overriding member procedure uninstall -( self in out nocopy t_type_attribute_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_type_attribute_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_ATTRIBUTE_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); $end -- ALTER type "owner"."type" DROP ATTRIBUTE "column" @@ -138,12 +138,12 @@ $end p_target.obj.base_object_name() || '"' || ' DROP ATTRIBUTE "' || - treat(p_target.obj as t_type_attribute_object).member_name() || + treat(p_target.obj as oracle_tools.t_type_attribute_object).member_name() || '"' - , p_add_sqlterminator => case when pkg_ddl_util.c_use_sqlterminator then 1 else 0 end + , p_add_sqlterminator => case when oracle_tools.pkg_ddl_util.c_use_sqlterminator then 1 else 0 end ); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end uninstall; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_OBJECT.sql index a30d45c5..590cf9fa 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_ATTRIBUTE_OBJECT.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" IS constructor function t_type_attribute_object -( self in out nocopy t_type_attribute_object -, p_base_object in t_named_object +( self in out nocopy oracle_tools.t_type_attribute_object +, p_base_object in oracle_tools.t_named_object , p_member# in integer , p_member_name in varchar2 , p_data_type_name in varchar2 @@ -16,8 +16,8 @@ constructor function t_type_attribute_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_ATTRIBUTE_OBJECT.T_TYPE_ATTRIBUTE_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_member#: %s; p_member_name: %s; p_data_type_name: %s; p_data_type_mod: %s' @@ -49,7 +49,7 @@ $end self.data_scale$ := p_data_scale; self.character_set_name$ := p_character_set_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_BODY_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_BODY_OBJECT.sql index 34e785dd..e2c6a89a 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_BODY_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_BODY_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_BODY_OBJECT" AS constructor function t_type_body_object -( self in out nocopy t_type_body_object +( self in out nocopy oracle_tools.t_type_body_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_BODY_OBJECT.T_TYPE_BODY_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_DDL.sql index 493ed707..242b494a 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_DDL.sql @@ -1,44 +1,44 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_METHOD_DDL" AS constructor function t_type_method_ddl -( self in out nocopy t_type_method_ddl -, p_obj in t_schema_object +( self in out nocopy oracle_tools.t_type_method_ddl +, p_obj in oracle_tools.t_schema_object ) return self as result is - l_type_method_object t_type_method_object := treat(p_obj as t_type_method_object); + l_type_method_object oracle_tools.t_type_method_object := treat(p_obj as oracle_tools.t_type_method_object); l_buffer varchar2(32767 char) := null; l_clob clob := null; " ADD " constant varchar2(6) := ' ADD '; -- so we can replace 'ADD ' by 'DROP' begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_METHOD_DDL.T_TYPE_METHOD_DDL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); $end self.obj := p_obj; - self.ddl_tab := t_ddl_tab(); + self.ddl_tab := oracle_tools.t_ddl_tab(); /* construct the ALTER TYPE ADD METHOD here */ - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => 'ALTER TYPE "' || l_type_method_object.base_object_schema() || '"."' || l_type_method_object.base_object_name() || '"' || " ADD " || chr(10) , pio_buffer => l_buffer , pio_clob => l_clob ); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => l_type_method_object.signature() , pio_buffer => l_buffer , pio_clob => l_clob ); - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_text => chr(10) || 'CASCADE' , pio_buffer => l_buffer , pio_clob => l_clob ); -- append the buffer to l_clob (if that has not already been done) - pkg_str_util.append_text + oracle_tools.pkg_str_util.append_text ( pi_buffer => l_buffer , pio_clob => l_clob ); @@ -48,7 +48,7 @@ $end dbms_lob.freetemporary(l_clob); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -56,19 +56,19 @@ $end end; overriding member procedure migrate -( self in out nocopy t_type_method_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_type_method_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TYPE_METHOD_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source: %s; p_target: %s', p_source.obj.signature(), p_target.obj.signature()); $end -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -77,26 +77,26 @@ $end self.uninstall(p_target => p_target); self.install(p_source => p_source); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; overriding member procedure uninstall -( self in out nocopy t_type_method_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_type_method_ddl +, p_target in oracle_tools.t_schema_ddl ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TYPE_METHOD_DDL.UNINSTALL'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'UNINSTALL'); $end self.ddl_tab := p_target.ddl_tab; self.ddl_tab(1).text(1) := replace(self.ddl_tab(1).text(1), 'ADD ', 'DROP'); -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end uninstall; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_OBJECT.sql index 4278a6e7..d509e109 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_METHOD_OBJECT.sql @@ -1,8 +1,8 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" AS constructor function t_type_method_object -( self in out nocopy t_type_method_object -, p_base_object in t_named_object -- the type specification +( self in out nocopy oracle_tools.t_type_method_object +, p_base_object in oracle_tools.t_named_object -- the type specification , p_member# in integer -- the METHOD_NO , p_member_name in varchar2 -- the METHOD_NAME , p_method_type in varchar2 @@ -16,8 +16,8 @@ constructor function t_type_method_object return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_METHOD_OBJECT.T_TYPE_METHOD_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_base_object.id(): %s; p_member#: %s; p_member_name: %s' @@ -38,7 +38,7 @@ $end self.overriding$ := p_overriding; self.arguments := p_arguments; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end @@ -146,8 +146,8 @@ is l_signature := l_signature || p_text; end add; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_METHOD_OBJECT.SIGNATURE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'SIGNATURE'); $end add(case when self.final() = 'NO' then 'NOT ' end || 'FINAL '); @@ -199,7 +199,7 @@ $end add(case when l_is_constructor then 'SELF AS RESULT' else self.arguments(1).data_type() end); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.print(dbug."output", 'return: %s', l_signature); dbug.leave; $end @@ -208,24 +208,24 @@ $end end signature; overriding member procedure chk -( self in t_type_method_object +( self in oracle_tools.t_type_method_object , p_schema in varchar2 ) is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_METHOD_OBJECT.CHK'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'CHK'); dbug.print(dbug."input", 'p_schema: %s', p_schema); $end - pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); + oracle_tools.pkg_ddl_util.chk_schema_object(p_dependent_or_granted_object => self, p_schema => p_schema); if self.parameters() + self.results() = nvl(cardinality(self.arguments), 0) then null; else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Method (' || self.member_name() || ') has "' || @@ -243,7 +243,7 @@ $end null; else raise_application_error - ( -20000 + ( oracle_tools.pkg_ddl_error.c_invalid_parameters , 'Method (' || self.member_name() || ') must have a TYPE_SPEC as its base object: ' || @@ -251,7 +251,7 @@ $end ); end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end end chk; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_DDL.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_DDL.sql index 16f5b721..6c945219 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_DDL.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_DDL.sql @@ -1,24 +1,24 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_SPEC_DDL" IS overriding member procedure migrate -( self in out nocopy t_type_spec_ddl -, p_source in t_schema_ddl -, p_target in t_schema_ddl +( self in out nocopy oracle_tools.t_type_spec_ddl +, p_source in oracle_tools.t_schema_ddl +, p_target in oracle_tools.t_schema_ddl ) is - l_source_type_spec_object t_type_spec_object := treat(p_source.obj as t_type_spec_object); - l_target_type_spec_object t_type_spec_object := treat(p_target.obj as t_type_spec_object); - l_source_member_ddl_tab t_schema_ddl_tab; - l_target_member_ddl_tab t_schema_ddl_tab; - l_type_attribute_ddl t_schema_ddl; + l_source_type_spec_object oracle_tools.t_type_spec_object := treat(p_source.obj as oracle_tools.t_type_spec_object); + l_target_type_spec_object oracle_tools.t_type_spec_object := treat(p_target.obj as oracle_tools.t_type_spec_object); + l_source_member_ddl_tab oracle_tools.t_schema_ddl_tab; + l_target_member_ddl_tab oracle_tools.t_schema_ddl_tab; + l_type_attribute_ddl oracle_tools.t_schema_ddl; begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then - dbug.enter('T_TYPE_SPEC_DDL.MIGRATE'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT || '.' || 'MIGRATE'); dbug.print(dbug."input", 'p_source.obj.id(): %s; p_target.obj.id(): %s', p_source.obj.id(), p_target.obj.id()); $end -- first the standard things - t_schema_ddl.migrate + oracle_tools.t_schema_ddl.migrate ( p_source => p_source , p_target => p_target , p_schema_ddl => self @@ -46,39 +46,39 @@ $end l_type_attribute_ddl := null; if r.source_schema_ddl is null then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** target column ***'); r.target_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.target_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_type_attribute_ddl ); l_type_attribute_ddl.uninstall(r.target_schema_ddl); elsif r.target_schema_ddl is null then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** source column ***'); r.source_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.source_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_type_attribute_ddl ); l_type_attribute_ddl.install(r.source_schema_ddl); elsif r.source_schema_ddl <> r.target_schema_ddl then -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.print(dbug."info", '*** source column ***'); r.source_schema_ddl.print(); dbug.print(dbug."info", '*** target column ***'); r.target_schema_ddl.print(); $end - t_schema_ddl.create_schema_ddl + oracle_tools.t_schema_ddl.create_schema_ddl ( r.source_schema_ddl.obj - , t_ddl_tab() + , oracle_tools.t_ddl_tab() , l_type_attribute_ddl ); l_type_attribute_ddl.migrate @@ -97,7 +97,7 @@ $end ); end loop; end if; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then if l_type_attribute_ddl is not null then dbug.print(dbug."info", '*** result column ***'); @@ -106,7 +106,7 @@ $if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then $end end loop; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 2 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 2 $then dbug.leave; $end end migrate; diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql index 2e41419b..b33cdfe7 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_TYPE_SPEC_OBJECT" AS constructor function t_type_spec_object -( self in out nocopy t_type_spec_object +( self in out nocopy oracle_tools.t_type_spec_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_TYPE_SPEC_OBJECT.T_TYPE_SPEC_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql index b52fbd25..c7d6931c 100644 --- a/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql +++ b/db/app/ddl/src/full/R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql @@ -1,15 +1,15 @@ CREATE OR REPLACE TYPE BODY "ORACLE_TOOLS"."T_VIEW_OBJECT" AS constructor function t_view_object -( self in out nocopy t_view_object +( self in out nocopy oracle_tools.t_view_object , p_object_schema in varchar2 , p_object_name in varchar2 ) return self as result is begin -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then - dbug.enter('T_VIEW_OBJECT.T_VIEW_OBJECT'); +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then + dbug.enter($$PLSQL_UNIT_OWNER || '.' || $$PLSQL_UNIT); dbug.print ( dbug."input" , 'p_object_schema: %s; p_object_name: %s' @@ -22,7 +22,7 @@ $end self.object_schema$ := p_object_schema; self.object_name$ := p_object_name; -$if cfg_pkg.c_debugging and pkg_ddl_util.c_debugging >= 3 $then +$if oracle_tools.cfg_pkg.c_debugging and oracle_tools.pkg_ddl_util.c_debugging >= 3 $then dbug.leave; $end diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql new file mode 100644 index 00000000..4d7e35c9 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."F_GENERATE_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql new file mode 100644 index 00000000..c6222cb2 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."PKG_DDL_ERROR" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql new file mode 100644 index 00000000..808bc6b0 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_ARGUMENT_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql new file mode 100644 index 00000000..5f3bf987 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_ARGUMENT_OBJECT_TAB" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql new file mode 100644 index 00000000..41b993b5 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_CLUSTER_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql new file mode 100644 index 00000000..05be03f8 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_COMMENT_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql new file mode 100644 index 00000000..0cf6576a --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_COMMENT_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql new file mode 100644 index 00000000..858cb9fc --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_CONSTRAINT_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql new file mode 100644 index 00000000..4358b599 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql new file mode 100644 index 00000000..7b9b2e3e --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_DDL_SEQUENCE" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql new file mode 100644 index 00000000..578c80d5 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_DDL_TAB" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql new file mode 100644 index 00000000..42888f9d --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_DEPENDENT_OR_GRANTED_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql new file mode 100644 index 00000000..cd6cbd3e --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_FUNCTION_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql new file mode 100644 index 00000000..8c398cf1 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_INDEX_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql new file mode 100644 index 00000000..3149d4c7 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_INDEX_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql new file mode 100644 index 00000000..e0bf7e8a --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_JAVA_SOURCE_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql new file mode 100644 index 00000000..09716042 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql new file mode 100644 index 00000000..c7097209 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_LOG_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql new file mode 100644 index 00000000..3fad3ff3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql new file mode 100644 index 00000000..ecfc2b74 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_MEMBER_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql new file mode 100644 index 00000000..8f5029b3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_NAMED_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql new file mode 100644 index 00000000..c712535c --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_GRANT_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql new file mode 100644 index 00000000..d0228f7f --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql new file mode 100644 index 00000000..a8f521c3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_INFO_REC" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql new file mode 100644 index 00000000..d8b08a8d --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_INFO_TAB" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql new file mode 100644 index 00000000..a0cc1fd3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_PACKAGE_BODY_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql new file mode 100644 index 00000000..ceae412f --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_PACKAGE_SPEC_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql new file mode 100644 index 00000000..aee87ff3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_PROCEDURE_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql new file mode 100644 index 00000000..3b25f7ad --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_PROCOBJ_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql new file mode 100644 index 00000000..cfae2a41 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql new file mode 100644 index 00000000..a1b44361 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_REFRESH_GROUP_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql new file mode 100644 index 00000000..079bf2e0 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_REFRESH_GROUP_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql new file mode 100644 index 00000000..3acb0e22 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql new file mode 100644 index 00000000..cf03ce5e --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql new file mode 100644 index 00000000..2fc388d5 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_DDL_TAB" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql new file mode 100644 index 00000000..8f152a3c --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_OBJECT_TAB" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql new file mode 100644 index 00000000..3291c5fd --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SEQUENCE_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql new file mode 100644 index 00000000..c3032de3 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SEQUENCE_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql new file mode 100644 index 00000000..0fd25870 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SYNONYM_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql new file mode 100644 index 00000000..d237bfc6 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_SYNONYM_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql new file mode 100644 index 00000000..064c7a37 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TABLE_COLUMN_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql new file mode 100644 index 00000000..2f912206 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql new file mode 100644 index 00000000..05dc6951 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TABLE_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql new file mode 100644 index 00000000..4785f65c --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TABLE_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql new file mode 100644 index 00000000..c475428b --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TRIGGER_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql new file mode 100644 index 00000000..c53daae4 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TRIGGER_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql new file mode 100644 index 00000000..30eb4b7a --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql new file mode 100644 index 00000000..3d2d42e2 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql new file mode 100644 index 00000000..0fdc3173 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_BODY_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql new file mode 100644 index 00000000..b49bea0b --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_METHOD_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql new file mode 100644 index 00000000..2084d16b --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql new file mode 100644 index 00000000..699358c4 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_SPEC_DDL" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql new file mode 100644 index 00000000..2025b590 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_TYPE_SPEC_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql new file mode 100644 index 00000000..9984cee5 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT EXECUTE ON "ORACLE_TOOLS"."T_VIEW_OBJECT" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql new file mode 100644 index 00000000..4365077f --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT SELECT ON "ORACLE_TOOLS"."V_DISPLAY_DDL_SCHEMA" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql new file mode 100644 index 00000000..1ccb1459 --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT SELECT ON "ORACLE_TOOLS"."V_MY_SCHEMA_DDL_INFO" TO PUBLIC; + diff --git a/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql new file mode 100644 index 00000000..bde7cccf --- /dev/null +++ b/db/app/ddl/src/full/R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql @@ -0,0 +1,4 @@ +call dbms_application_info.set_module('R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql', null); +call dbms_application_info.set_action('SQL statement 1'); +GRANT SELECT ON "ORACLE_TOOLS"."V_MY_SCHEMA_OBJECT_INFO" TO PUBLIC; + diff --git a/db/app/ddl/src/full/install.sql b/db/app/ddl/src/full/install.sql index 845a798a..4d8cf9ad 100644 --- a/db/app/ddl/src/full/install.sql +++ b/db/app/ddl/src/full/install.sql @@ -19,10 +19,6 @@ prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_CONSTRAINT_OBJECT.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL.sql -prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_REC.sql -@@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_REC.sql -prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_TAB.sql -@@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_INFO_TAB.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_SEQUENCE.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_DDL_TAB.sql @@ -83,10 +79,6 @@ prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_DDL.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_SEQUENCE_OBJECT.sql -prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_REC.sql -@@02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_REC.sql -prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_TAB.sql -@@02.ORACLE_TOOLS.TYPE_SPEC.T_SORT_OBJECTS_BY_DEPS_TAB.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_DDL.sql prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_SYNONYM_OBJECT.sql @@ -123,6 +115,8 @@ prompt @@02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql @@02.ORACLE_TOOLS.TYPE_SPEC.T_VIEW_OBJECT.sql prompt @@R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql @@R__08.ORACLE_TOOLS.FUNCTION.F_GENERATE_DDL.sql +prompt @@R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_ERROR.sql +@@R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_ERROR.sql prompt @@R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql @@R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_DDL_UTIL.sql prompt @@R__09.ORACLE_TOOLS.PACKAGE_SPEC.PKG_STR_UTIL.sql @@ -235,15 +229,129 @@ prompt @@R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql @@R__15.ORACLE_TOOLS.TYPE_BODY.T_TYPE_SPEC_OBJECT.sql prompt @@R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql @@R__15.ORACLE_TOOLS.TYPE_BODY.T_VIEW_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.F_GENERATE_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_ERROR.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_UTIL.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_DDL_UTIL.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_STR_UTIL.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.PKG_STR_UTIL.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.P_GENERATE_DDL.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.P_GENERATE_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_ARGUMENT_OBJECT_TAB.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CLUSTER_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_COMMENT_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_CONSTRAINT_OBJECT.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_SEQUENCE.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DDL_TAB.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_DEPENDENT_OR_GRANTED_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_FUNCTION_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_INDEX_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_JAVA_SOURCE_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_LOG_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MATERIALIZED_VIEW_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_MEMBER_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_NAMED_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_GRANT_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_REC.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_OBJECT_INFO_TAB.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_BODY_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PACKAGE_SPEC_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCEDURE_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_PROCOBJ_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REFRESH_GROUP_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_REF_CONSTRAINT_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_DDL_TAB.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SCHEMA_OBJECT_TAB.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SEQUENCE_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_SYNONYM_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_COLUMN_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TABLE_OBJECT.sql prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TEXT_TAB.sql @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TEXT_TAB.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TRIGGER_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_ATTRIBUTE_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_BODY_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_METHOD_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_DDL.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_TYPE_SPEC_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.T_VIEW_OBJECT.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_DISPLAY_DDL_SCHEMA.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_DDL_INFO.sql +prompt @@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql +@@R__18.ORACLE_TOOLS.OBJECT_GRANT.V_MY_SCHEMA_OBJECT_INFO.sql diff --git a/db/app/ddl/src/full/uninstall.sql b/db/app/ddl/src/full/uninstall.sql index 15eda8ba..25bb58f9 100644 --- a/db/app/ddl/src/full/uninstall.sql +++ b/db/app/ddl/src/full/uninstall.sql @@ -1,4 +1,4 @@ -/* perl generate_ddl.pl (version 2021-08-24) --nodynamic-sql --force-view --noremove-output-directory --skip-install-sql --nostrip-source-schema */ +/* perl generate_ddl.pl (version 2021-08-27) --nodynamic-sql --force-view --skip-install-sql --nostrip-source-schema */ /* -- JDBC url : jdbc:oracle:thin:ORACLE_TOOLS@//localhost:1521/orcl @@ -9,6 +9,7 @@ -- object type : -- object names include: 1 -- object names : F_GENERATE_DDL +,PKG_DDL_ERROR ,PKG_DDL_UTIL ,PKG_STR_UTIL ,P_GENERATE_DDL @@ -20,8 +21,6 @@ ,T_CONSTRAINT_DDL ,T_CONSTRAINT_OBJECT ,T_DDL -,T_DDL_INFO_REC -,T_DDL_INFO_TAB ,T_DDL_SEQUENCE ,T_DDL_TAB ,T_DEPENDENT_OR_GRANTED_OBJECT @@ -52,8 +51,6 @@ ,T_SCHEMA_OBJECT_TAB ,T_SEQUENCE_DDL ,T_SEQUENCE_OBJECT -,T_SORT_OBJECTS_BY_DEPS_REC -,T_SORT_OBJECTS_BY_DEPS_TAB ,T_SYNONYM_DDL ,T_SYNONYM_OBJECT ,T_TABLE_COLUMN_DDL @@ -81,491 +78,707 @@ */ -- pkg_ddl_util v4 call dbms_application_info.set_module('uninstall.sql', null); -/* SQL statement 1 (DROP;ORACLE_TOOLS;FUNCTION;F_GENERATE_DDL;;;;;;;;2) */ +/* SQL statement 1 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;FUNCTION;F_GENERATE_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 1'); -DROP FUNCTION ORACLE_TOOLS.F_GENERATE_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."F_GENERATE_DDL" FROM "PUBLIC"; -/* SQL statement 2 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_UTIL;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 2 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_ERROR;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 2'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."PKG_DDL_UTIL" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."PKG_DDL_ERROR" FROM "PUBLIC"; -/* SQL statement 3 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PACKAGE_SPEC;PKG_STR_UTIL;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 3 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_UTIL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 3'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."PKG_STR_UTIL" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."PKG_DDL_UTIL" FROM "PUBLIC"; -/* SQL statement 4 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PROCEDURE;P_GENERATE_DDL;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 4 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PACKAGE_SPEC;PKG_STR_UTIL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 4'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."P_GENERATE_DDL" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."PKG_STR_UTIL" FROM "PUBLIC"; -/* SQL statement 5 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_DDL;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 5 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;PROCEDURE;P_GENERATE_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 5'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."T_DDL" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."P_GENERATE_DDL" FROM "PUBLIC"; -/* SQL statement 6 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 6 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 6'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_OBJECT" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_ARGUMENT_OBJECT" FROM "PUBLIC"; -/* SQL statement 7 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TEXT_TAB;;PUBLIC;EXECUTE;NO;2) */ +/* SQL statement 7 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 7'); -REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TEXT_TAB" FROM "PUBLIC"; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_ARGUMENT_OBJECT_TAB" FROM "PUBLIC"; -/* SQL statement 8 (DROP;ORACLE_TOOLS;PACKAGE_BODY;PKG_DDL_UTIL;;;;;;;;2) */ +/* SQL statement 8 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_CLUSTER_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 8'); -DROP PACKAGE BODY ORACLE_TOOLS.PKG_DDL_UTIL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_CLUSTER_OBJECT" FROM "PUBLIC"; -/* SQL statement 9 (DROP;ORACLE_TOOLS;PACKAGE_BODY;PKG_STR_UTIL;;;;;;;;2) */ +/* SQL statement 9 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 9'); -DROP PACKAGE BODY ORACLE_TOOLS.PKG_STR_UTIL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_COMMENT_DDL" FROM "PUBLIC"; -/* SQL statement 10 (DROP;ORACLE_TOOLS;PROCEDURE;P_GENERATE_DDL;;;;;;;;2) */ +/* SQL statement 10 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 10'); -DROP PROCEDURE ORACLE_TOOLS.P_GENERATE_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_COMMENT_OBJECT" FROM "PUBLIC"; -/* SQL statement 11 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CLUSTER_OBJECT;;;;;;;;2) */ +/* SQL statement 11 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 11'); -DROP TYPE BODY ORACLE_TOOLS.T_CLUSTER_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_CONSTRAINT_DDL" FROM "PUBLIC"; -/* SQL statement 12 (DROP;ORACLE_TOOLS;TYPE_BODY;T_COMMENT_OBJECT;;;;;;;;2) */ +/* SQL statement 12 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 12'); -DROP TYPE BODY ORACLE_TOOLS.T_COMMENT_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_CONSTRAINT_OBJECT" FROM "PUBLIC"; -/* SQL statement 13 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CONSTRAINT_DDL;;;;;;;;2) */ +/* SQL statement 13 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 13'); -DROP TYPE BODY ORACLE_TOOLS.T_CONSTRAINT_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_DDL" FROM "PUBLIC"; -/* SQL statement 14 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CONSTRAINT_OBJECT;;;;;;;;2) */ +/* SQL statement 14 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_DDL_SEQUENCE;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 14'); -DROP TYPE BODY ORACLE_TOOLS.T_CONSTRAINT_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_DDL_SEQUENCE" FROM "PUBLIC"; -/* SQL statement 15 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DDL;;;;;;;;2) */ +/* SQL statement 15 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_DDL_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 15'); -DROP TYPE BODY ORACLE_TOOLS.T_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_DDL_TAB" FROM "PUBLIC"; -/* SQL statement 16 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DEPENDENT_OR_GRANTED_OBJECT;;;;;;;;2) */ +/* SQL statement 16 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_DEPENDENT_OR_GRANTED_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 16'); -DROP TYPE BODY ORACLE_TOOLS.T_DEPENDENT_OR_GRANTED_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_DEPENDENT_OR_GRANTED_OBJECT" FROM "PUBLIC"; -/* SQL statement 17 (DROP;ORACLE_TOOLS;TYPE_BODY;T_FUNCTION_OBJECT;;;;;;;;2) */ +/* SQL statement 17 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_FUNCTION_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 17'); -DROP TYPE BODY ORACLE_TOOLS.T_FUNCTION_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_FUNCTION_OBJECT" FROM "PUBLIC"; -/* SQL statement 18 (DROP;ORACLE_TOOLS;TYPE_BODY;T_INDEX_DDL;;;;;;;;2) */ +/* SQL statement 18 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 18'); -DROP TYPE BODY ORACLE_TOOLS.T_INDEX_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_INDEX_DDL" FROM "PUBLIC"; -/* SQL statement 19 (DROP;ORACLE_TOOLS;TYPE_BODY;T_INDEX_OBJECT;;;;;;;;2) */ +/* SQL statement 19 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 19'); -DROP TYPE BODY ORACLE_TOOLS.T_INDEX_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_INDEX_OBJECT" FROM "PUBLIC"; -/* SQL statement 20 (DROP;ORACLE_TOOLS;TYPE_BODY;T_JAVA_SOURCE_OBJECT;;;;;;;;2) */ +/* SQL statement 20 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_JAVA_SOURCE_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 20'); -DROP TYPE BODY ORACLE_TOOLS.T_JAVA_SOURCE_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_JAVA_SOURCE_OBJECT" FROM "PUBLIC"; -/* SQL statement 21 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_DDL;;;;;;;;2) */ +/* SQL statement 21 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 21'); -DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_DDL" FROM "PUBLIC"; -/* SQL statement 22 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_LOG_OBJECT;;;;;;;;2) */ +/* SQL statement 22 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_LOG_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 22'); -DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_LOG_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_LOG_OBJECT" FROM "PUBLIC"; -/* SQL statement 23 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_OBJECT;;;;;;;;2) */ +/* SQL statement 23 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 23'); -DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_MATERIALIZED_VIEW_OBJECT" FROM "PUBLIC"; -/* SQL statement 24 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MEMBER_OBJECT;;;;;;;;2) */ +/* SQL statement 24 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_MEMBER_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 24'); -DROP TYPE BODY ORACLE_TOOLS.T_MEMBER_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_MEMBER_OBJECT" FROM "PUBLIC"; -/* SQL statement 25 (DROP;ORACLE_TOOLS;TYPE_BODY;T_NAMED_OBJECT;;;;;;;;2) */ +/* SQL statement 25 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_NAMED_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 25'); -DROP TYPE BODY ORACLE_TOOLS.T_NAMED_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_NAMED_OBJECT" FROM "PUBLIC"; -/* SQL statement 26 (DROP;ORACLE_TOOLS;TYPE_BODY;T_OBJECT_GRANT_DDL;;;;;;;;2) */ +/* SQL statement 26 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 26'); -DROP TYPE BODY ORACLE_TOOLS.T_OBJECT_GRANT_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_GRANT_DDL" FROM "PUBLIC"; -/* SQL statement 27 (DROP;ORACLE_TOOLS;TYPE_BODY;T_OBJECT_GRANT_OBJECT;;;;;;;;2) */ +/* SQL statement 27 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 27'); -DROP TYPE BODY ORACLE_TOOLS.T_OBJECT_GRANT_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_GRANT_OBJECT" FROM "PUBLIC"; -/* SQL statement 28 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PACKAGE_BODY_OBJECT;;;;;;;;2) */ +/* SQL statement 28 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_REC;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 28'); -DROP TYPE BODY ORACLE_TOOLS.T_PACKAGE_BODY_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_INFO_REC" FROM "PUBLIC"; -/* SQL statement 29 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PACKAGE_SPEC_OBJECT;;;;;;;;2) */ +/* SQL statement 29 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 29'); -DROP TYPE BODY ORACLE_TOOLS.T_PACKAGE_SPEC_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_OBJECT_INFO_TAB" FROM "PUBLIC"; -/* SQL statement 30 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCEDURE_OBJECT;;;;;;;;2) */ +/* SQL statement 30 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_BODY_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 30'); -DROP TYPE BODY ORACLE_TOOLS.T_PROCEDURE_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_PACKAGE_BODY_OBJECT" FROM "PUBLIC"; -/* SQL statement 31 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCOBJ_DDL;;;;;;;;2) */ +/* SQL statement 31 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_SPEC_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 31'); -DROP TYPE BODY ORACLE_TOOLS.T_PROCOBJ_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_PACKAGE_SPEC_OBJECT" FROM "PUBLIC"; -/* SQL statement 32 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCOBJ_OBJECT;;;;;;;;2) */ +/* SQL statement 32 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_PROCEDURE_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 32'); -DROP TYPE BODY ORACLE_TOOLS.T_PROCOBJ_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_PROCEDURE_OBJECT" FROM "PUBLIC"; -/* SQL statement 33 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REFRESH_GROUP_DDL;;;;;;;;2) */ +/* SQL statement 33 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 33'); -DROP TYPE BODY ORACLE_TOOLS.T_REFRESH_GROUP_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_PROCOBJ_DDL" FROM "PUBLIC"; -/* SQL statement 34 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REFRESH_GROUP_OBJECT;;;;;;;;2) */ +/* SQL statement 34 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 34'); -DROP TYPE BODY ORACLE_TOOLS.T_REFRESH_GROUP_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_PROCOBJ_OBJECT" FROM "PUBLIC"; -/* SQL statement 35 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REF_CONSTRAINT_OBJECT;;;;;;;;2) */ +/* SQL statement 35 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 35'); -DROP TYPE BODY ORACLE_TOOLS.T_REF_CONSTRAINT_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_REFRESH_GROUP_DDL" FROM "PUBLIC"; -/* SQL statement 36 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SCHEMA_DDL;;;;;;;;2) */ +/* SQL statement 36 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 36'); -DROP TYPE BODY ORACLE_TOOLS.T_SCHEMA_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_REFRESH_GROUP_OBJECT" FROM "PUBLIC"; -/* SQL statement 37 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SCHEMA_OBJECT;;;;;;;;2) */ +/* SQL statement 37 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_REF_CONSTRAINT_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 37'); -DROP TYPE BODY ORACLE_TOOLS.T_SCHEMA_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_REF_CONSTRAINT_OBJECT" FROM "PUBLIC"; -/* SQL statement 38 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SEQUENCE_DDL;;;;;;;;2) */ +/* SQL statement 38 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 38'); -DROP TYPE BODY ORACLE_TOOLS.T_SEQUENCE_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_DDL" FROM "PUBLIC"; -/* SQL statement 39 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SEQUENCE_OBJECT;;;;;;;;2) */ +/* SQL statement 39 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 39'); -DROP TYPE BODY ORACLE_TOOLS.T_SEQUENCE_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_DDL_TAB" FROM "PUBLIC"; -/* SQL statement 40 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SYNONYM_DDL;;;;;;;;2) */ +/* SQL statement 40 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 40'); -DROP TYPE BODY ORACLE_TOOLS.T_SYNONYM_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_OBJECT" FROM "PUBLIC"; -/* SQL statement 41 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SYNONYM_OBJECT;;;;;;;;2) */ +/* SQL statement 41 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 41'); -DROP TYPE BODY ORACLE_TOOLS.T_SYNONYM_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SCHEMA_OBJECT_TAB" FROM "PUBLIC"; -/* SQL statement 42 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_COLUMN_DDL;;;;;;;;2) */ +/* SQL statement 42 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 42'); -DROP TYPE BODY ORACLE_TOOLS.T_TABLE_COLUMN_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SEQUENCE_DDL" FROM "PUBLIC"; -/* SQL statement 43 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_COLUMN_OBJECT;;;;;;;;2) */ +/* SQL statement 43 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 43'); -DROP TYPE BODY ORACLE_TOOLS.T_TABLE_COLUMN_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SEQUENCE_OBJECT" FROM "PUBLIC"; -/* SQL statement 44 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_DDL;;;;;;;;2) */ +/* SQL statement 44 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 44'); -DROP TYPE BODY ORACLE_TOOLS.T_TABLE_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SYNONYM_DDL" FROM "PUBLIC"; -/* SQL statement 45 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_OBJECT;;;;;;;;2) */ +/* SQL statement 45 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 45'); -DROP TYPE BODY ORACLE_TOOLS.T_TABLE_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_SYNONYM_OBJECT" FROM "PUBLIC"; -/* SQL statement 46 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TRIGGER_DDL;;;;;;;;2) */ +/* SQL statement 46 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 46'); -DROP TYPE BODY ORACLE_TOOLS.T_TRIGGER_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TABLE_COLUMN_DDL" FROM "PUBLIC"; -/* SQL statement 47 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TRIGGER_OBJECT;;;;;;;;2) */ +/* SQL statement 47 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 47'); -DROP TYPE BODY ORACLE_TOOLS.T_TRIGGER_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TABLE_COLUMN_OBJECT" FROM "PUBLIC"; -/* SQL statement 48 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_ATTRIBUTE_DDL;;;;;;;;2) */ +/* SQL statement 48 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 48'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_ATTRIBUTE_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TABLE_DDL" FROM "PUBLIC"; -/* SQL statement 49 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_ATTRIBUTE_OBJECT;;;;;;;;2) */ +/* SQL statement 49 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 49'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_ATTRIBUTE_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TABLE_OBJECT" FROM "PUBLIC"; -/* SQL statement 50 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_BODY_OBJECT;;;;;;;;2) */ +/* SQL statement 50 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TEXT_TAB;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 50'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_BODY_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TEXT_TAB" FROM "PUBLIC"; -/* SQL statement 51 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_METHOD_DDL;;;;;;;;2) */ +/* SQL statement 51 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 51'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_METHOD_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TRIGGER_DDL" FROM "PUBLIC"; -/* SQL statement 52 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_METHOD_OBJECT;;;;;;;;2) */ +/* SQL statement 52 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 52'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_METHOD_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TRIGGER_OBJECT" FROM "PUBLIC"; -/* SQL statement 53 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_SPEC_DDL;;;;;;;;2) */ +/* SQL statement 53 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 53'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_SPEC_DDL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_DDL" FROM "PUBLIC"; -/* SQL statement 54 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_SPEC_OBJECT;;;;;;;;2) */ +/* SQL statement 54 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 54'); -DROP TYPE BODY ORACLE_TOOLS.T_TYPE_SPEC_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_ATTRIBUTE_OBJECT" FROM "PUBLIC"; -/* SQL statement 55 (DROP;ORACLE_TOOLS;TYPE_BODY;T_VIEW_OBJECT;;;;;;;;2) */ +/* SQL statement 55 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_BODY_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 55'); -DROP TYPE BODY ORACLE_TOOLS.T_VIEW_OBJECT; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_BODY_OBJECT" FROM "PUBLIC"; -/* SQL statement 56 (DROP;ORACLE_TOOLS;VIEW;V_DISPLAY_DDL_SCHEMA;;;;;;;;2) */ +/* SQL statement 56 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 56'); -DROP VIEW ORACLE_TOOLS.V_DISPLAY_DDL_SCHEMA; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_METHOD_DDL" FROM "PUBLIC"; -/* SQL statement 57 (DROP;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_DDL_INFO;;;;;;;;2) */ +/* SQL statement 57 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 57'); -DROP VIEW ORACLE_TOOLS.V_MY_SCHEMA_DDL_INFO; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_METHOD_OBJECT" FROM "PUBLIC"; -/* SQL statement 58 (DROP;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_OBJECT_INFO;;;;;;;;2) */ +/* SQL statement 58 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_DDL;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 58'); -DROP VIEW ORACLE_TOOLS.V_MY_SCHEMA_OBJECT_INFO; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_SPEC_DDL" FROM "PUBLIC"; -/* SQL statement 59 (DROP;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_UTIL;;;;;;;;2) */ +/* SQL statement 59 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 59'); -DROP PACKAGE ORACLE_TOOLS.PKG_DDL_UTIL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_TYPE_SPEC_OBJECT" FROM "PUBLIC"; -/* SQL statement 60 (DROP;ORACLE_TOOLS;PACKAGE_SPEC;PKG_STR_UTIL;;;;;;;;2) */ +/* SQL statement 60 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;TYPE_SPEC;T_VIEW_OBJECT;;PUBLIC;EXECUTE;NO;2) */ call dbms_application_info.set_action('SQL statement 60'); -DROP PACKAGE ORACLE_TOOLS.PKG_STR_UTIL; +REVOKE EXECUTE ON "ORACLE_TOOLS"."T_VIEW_OBJECT" FROM "PUBLIC"; -/* SQL statement 61 (DROP;ORACLE_TOOLS;TYPE_BODY;T_ARGUMENT_OBJECT;;;;;;;;2) */ +/* SQL statement 61 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;VIEW;V_DISPLAY_DDL_SCHEMA;;PUBLIC;SELECT;NO;2) */ call dbms_application_info.set_action('SQL statement 61'); -DROP TYPE BODY ORACLE_TOOLS.T_ARGUMENT_OBJECT; +REVOKE SELECT ON "ORACLE_TOOLS"."V_DISPLAY_DDL_SCHEMA" FROM "PUBLIC"; -/* SQL statement 62 (DROP;ORACLE_TOOLS;TYPE_BODY;T_COMMENT_DDL;;;;;;;;2) */ +/* SQL statement 62 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_DDL_INFO;;PUBLIC;SELECT;NO;2) */ call dbms_application_info.set_action('SQL statement 62'); -DROP TYPE BODY ORACLE_TOOLS.T_COMMENT_DDL; +REVOKE SELECT ON "ORACLE_TOOLS"."V_MY_SCHEMA_DDL_INFO" FROM "PUBLIC"; -/* SQL statement 63 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DDL_SEQUENCE;;;;;;;;2) */ +/* SQL statement 63 (REVOKE;;OBJECT_GRANT;;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_OBJECT_INFO;;PUBLIC;SELECT;NO;2) */ call dbms_application_info.set_action('SQL statement 63'); -DROP TYPE BODY ORACLE_TOOLS.T_DDL_SEQUENCE; +REVOKE SELECT ON "ORACLE_TOOLS"."V_MY_SCHEMA_OBJECT_INFO" FROM "PUBLIC"; -/* SQL statement 64 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_OBJECT;;;;;;;;2) */ +/* SQL statement 64 (DROP;ORACLE_TOOLS;FUNCTION;F_GENERATE_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 64'); -DROP TYPE ORACLE_TOOLS.T_TYPE_METHOD_OBJECT; +DROP FUNCTION ORACLE_TOOLS.F_GENERATE_DDL; -/* SQL statement 65 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT_TAB;;;;;;;;2) */ +/* SQL statement 65 (DROP;ORACLE_TOOLS;PACKAGE_BODY;PKG_DDL_UTIL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 65'); -DROP TYPE ORACLE_TOOLS.T_ARGUMENT_OBJECT_TAB; +DROP PACKAGE BODY ORACLE_TOOLS.PKG_DDL_UTIL; -/* SQL statement 66 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT;;;;;;;;2) */ +/* SQL statement 66 (DROP;ORACLE_TOOLS;PACKAGE_BODY;PKG_STR_UTIL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 66'); -DROP TYPE ORACLE_TOOLS.T_ARGUMENT_OBJECT; +DROP PACKAGE BODY ORACLE_TOOLS.PKG_STR_UTIL; -/* SQL statement 67 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CLUSTER_OBJECT;;;;;;;;2) */ +/* SQL statement 67 (DROP;ORACLE_TOOLS;PROCEDURE;P_GENERATE_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 67'); -DROP TYPE ORACLE_TOOLS.T_CLUSTER_OBJECT; +DROP PROCEDURE ORACLE_TOOLS.P_GENERATE_DDL; -/* SQL statement 68 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_DDL;;;;;;;;2) */ +/* SQL statement 68 (DROP;ORACLE_TOOLS;TYPE_BODY;T_COMMENT_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 68'); -DROP TYPE ORACLE_TOOLS.T_COMMENT_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_COMMENT_OBJECT; -/* SQL statement 69 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_OBJECT;;;;;;;;2) */ +/* SQL statement 69 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CONSTRAINT_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 69'); -DROP TYPE ORACLE_TOOLS.T_COMMENT_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_CONSTRAINT_OBJECT; -/* SQL statement 70 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_DDL;;;;;;;;2) */ +/* SQL statement 70 (DROP;ORACLE_TOOLS;TYPE_BODY;T_INDEX_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 70'); -DROP TYPE ORACLE_TOOLS.T_CONSTRAINT_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_INDEX_OBJECT; -/* SQL statement 71 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REF_CONSTRAINT_OBJECT;;;;;;;;2) */ +/* SQL statement 71 (DROP;ORACLE_TOOLS;TYPE_BODY;T_NAMED_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 71'); -DROP TYPE ORACLE_TOOLS.T_REF_CONSTRAINT_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_NAMED_OBJECT; -/* SQL statement 72 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_OBJECT;;;;;;;;2) */ +/* SQL statement 72 (DROP;ORACLE_TOOLS;TYPE_BODY;T_OBJECT_GRANT_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 72'); -DROP TYPE ORACLE_TOOLS.T_CONSTRAINT_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_OBJECT_GRANT_OBJECT; -/* SQL statement 73 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_SEQUENCE;;;;;;;;2) */ +/* SQL statement 73 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCOBJ_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 73'); -DROP TYPE ORACLE_TOOLS.T_DDL_SEQUENCE; +DROP TYPE BODY ORACLE_TOOLS.T_PROCOBJ_DDL; -/* SQL statement 74 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_DDL;;;;;;;;2) */ +/* SQL statement 74 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCOBJ_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 74'); -DROP TYPE ORACLE_TOOLS.T_INDEX_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_PROCOBJ_OBJECT; -/* SQL statement 75 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_DDL;;;;;;;;2) */ +/* SQL statement 75 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REF_CONSTRAINT_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 75'); -DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_REF_CONSTRAINT_OBJECT; -/* SQL statement 76 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_DDL;;;;;;;;2) */ +/* SQL statement 76 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SCHEMA_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 76'); -DROP TYPE ORACLE_TOOLS.T_OBJECT_GRANT_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_SCHEMA_DDL; -/* SQL statement 77 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_DDL;;;;;;;;2) */ +/* SQL statement 77 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SCHEMA_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 77'); -DROP TYPE ORACLE_TOOLS.T_PROCOBJ_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_SCHEMA_OBJECT; -/* SQL statement 78 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_DDL;;;;;;;;2) */ +/* SQL statement 78 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SYNONYM_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 78'); -DROP TYPE ORACLE_TOOLS.T_REFRESH_GROUP_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_SYNONYM_OBJECT; -/* SQL statement 79 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL_TAB;;;;;;;;2) */ +/* SQL statement 79 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TRIGGER_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 79'); -DROP TYPE ORACLE_TOOLS.T_SCHEMA_DDL_TAB; +DROP TYPE BODY ORACLE_TOOLS.T_TRIGGER_OBJECT; -/* SQL statement 80 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_DDL;;;;;;;;2) */ +/* SQL statement 80 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_METHOD_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 80'); -DROP TYPE ORACLE_TOOLS.T_SEQUENCE_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_METHOD_OBJECT; -/* SQL statement 81 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_DDL;;;;;;;;2) */ +/* SQL statement 81 (DROP;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_ERROR;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 81'); -DROP TYPE ORACLE_TOOLS.T_SYNONYM_DDL; +DROP PACKAGE ORACLE_TOOLS.PKG_DDL_ERROR; -/* SQL statement 82 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_DDL;;;;;;;;2) */ +/* SQL statement 82 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CLUSTER_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 82'); -DROP TYPE ORACLE_TOOLS.T_TABLE_COLUMN_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_CLUSTER_OBJECT; -/* SQL statement 83 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_DDL;;;;;;;;2) */ +/* SQL statement 83 (DROP;ORACLE_TOOLS;TYPE_BODY;T_COMMENT_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 83'); -DROP TYPE ORACLE_TOOLS.T_TABLE_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_COMMENT_DDL; -/* SQL statement 84 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_DDL;;;;;;;;2) */ +/* SQL statement 84 (DROP;ORACLE_TOOLS;TYPE_BODY;T_CONSTRAINT_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 84'); -DROP TYPE ORACLE_TOOLS.T_TRIGGER_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_CONSTRAINT_DDL; -/* SQL statement 85 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_DDL;;;;;;;;2) */ +/* SQL statement 85 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 85'); -DROP TYPE ORACLE_TOOLS.T_TYPE_ATTRIBUTE_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_DDL; -/* SQL statement 86 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_DDL;;;;;;;;2) */ +/* SQL statement 86 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DEPENDENT_OR_GRANTED_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 86'); -DROP TYPE ORACLE_TOOLS.T_TYPE_METHOD_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_DEPENDENT_OR_GRANTED_OBJECT; -/* SQL statement 87 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_DDL;;;;;;;;2) */ +/* SQL statement 87 (DROP;ORACLE_TOOLS;TYPE_BODY;T_FUNCTION_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 87'); -DROP TYPE ORACLE_TOOLS.T_TYPE_SPEC_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_FUNCTION_OBJECT; -/* SQL statement 88 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL;;;;;;;;2) */ +/* SQL statement 88 (DROP;ORACLE_TOOLS;TYPE_BODY;T_INDEX_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 88'); -DROP TYPE ORACLE_TOOLS.T_SCHEMA_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_INDEX_DDL; -/* SQL statement 89 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_TAB;;;;;;;;2) */ +/* SQL statement 89 (DROP;ORACLE_TOOLS;TYPE_BODY;T_JAVA_SOURCE_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 89'); -DROP TYPE ORACLE_TOOLS.T_DDL_TAB; +DROP TYPE BODY ORACLE_TOOLS.T_JAVA_SOURCE_OBJECT; -/* SQL statement 90 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL;;;;;;;;2) */ +/* SQL statement 90 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 90'); -DROP TYPE ORACLE_TOOLS.T_DDL; +DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_DDL; -/* SQL statement 91 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_INFO_TAB;;;;;;;;2) */ +/* SQL statement 91 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_LOG_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 91'); -DROP TYPE ORACLE_TOOLS.T_DDL_INFO_TAB; +DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_LOG_OBJECT; -/* SQL statement 92 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_INFO_REC;;;;;;;;2) */ +/* SQL statement 92 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MATERIALIZED_VIEW_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 92'); -DROP TYPE ORACLE_TOOLS.T_DDL_INFO_REC; +DROP TYPE BODY ORACLE_TOOLS.T_MATERIALIZED_VIEW_OBJECT; -/* SQL statement 93 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_OBJECT;;;;;;;;2) */ +/* SQL statement 93 (DROP;ORACLE_TOOLS;TYPE_BODY;T_MEMBER_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 93'); -DROP TYPE ORACLE_TOOLS.T_INDEX_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_MEMBER_OBJECT; -/* SQL statement 94 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_OBJECT;;;;;;;;2) */ +/* SQL statement 94 (DROP;ORACLE_TOOLS;TYPE_BODY;T_OBJECT_GRANT_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 94'); -DROP TYPE ORACLE_TOOLS.T_TABLE_COLUMN_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_OBJECT_GRANT_DDL; -/* SQL statement 95 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_OBJECT;;;;;;;;2) */ +/* SQL statement 95 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PACKAGE_BODY_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 95'); -DROP TYPE ORACLE_TOOLS.T_TYPE_ATTRIBUTE_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_PACKAGE_BODY_OBJECT; -/* SQL statement 96 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MEMBER_OBJECT;;;;;;;;2) */ +/* SQL statement 96 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PACKAGE_SPEC_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 96'); -DROP TYPE ORACLE_TOOLS.T_MEMBER_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_PACKAGE_SPEC_OBJECT; -/* SQL statement 97 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_OBJECT;;;;;;;;2) */ +/* SQL statement 97 (DROP;ORACLE_TOOLS;TYPE_BODY;T_PROCEDURE_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 97'); -DROP TYPE ORACLE_TOOLS.T_OBJECT_GRANT_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_PROCEDURE_OBJECT; -/* SQL statement 98 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_OBJECT;;;;;;;;2) */ +/* SQL statement 98 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REFRESH_GROUP_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 98'); -DROP TYPE ORACLE_TOOLS.T_SYNONYM_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_REFRESH_GROUP_DDL; -/* SQL statement 99 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_OBJECT;;;;;;;;2) */ +/* SQL statement 99 (DROP;ORACLE_TOOLS;TYPE_BODY;T_REFRESH_GROUP_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 99'); -DROP TYPE ORACLE_TOOLS.T_TRIGGER_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_REFRESH_GROUP_OBJECT; -/* SQL statement 100 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DEPENDENT_OR_GRANTED_OBJECT;;;;;;;;2) */ +/* SQL statement 100 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SEQUENCE_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 100'); -DROP TYPE ORACLE_TOOLS.T_DEPENDENT_OR_GRANTED_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_SEQUENCE_DDL; -/* SQL statement 101 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_FUNCTION_OBJECT;;;;;;;;2) */ +/* SQL statement 101 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SEQUENCE_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 101'); -DROP TYPE ORACLE_TOOLS.T_FUNCTION_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_SEQUENCE_OBJECT; -/* SQL statement 102 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_JAVA_SOURCE_OBJECT;;;;;;;;2) */ +/* SQL statement 102 (DROP;ORACLE_TOOLS;TYPE_BODY;T_SYNONYM_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 102'); -DROP TYPE ORACLE_TOOLS.T_JAVA_SOURCE_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_SYNONYM_DDL; -/* SQL statement 103 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_LOG_OBJECT;;;;;;;;2) */ +/* SQL statement 103 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_COLUMN_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 103'); -DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_LOG_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TABLE_COLUMN_DDL; -/* SQL statement 104 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_OBJECT;;;;;;;;2) */ +/* SQL statement 104 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_COLUMN_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 104'); -DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TABLE_COLUMN_OBJECT; -/* SQL statement 105 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_BODY_OBJECT;;;;;;;;2) */ +/* SQL statement 105 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 105'); -DROP TYPE ORACLE_TOOLS.T_PACKAGE_BODY_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TABLE_DDL; -/* SQL statement 106 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_SPEC_OBJECT;;;;;;;;2) */ +/* SQL statement 106 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TABLE_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 106'); -DROP TYPE ORACLE_TOOLS.T_PACKAGE_SPEC_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TABLE_OBJECT; -/* SQL statement 107 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCEDURE_OBJECT;;;;;;;;2) */ +/* SQL statement 107 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TRIGGER_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 107'); -DROP TYPE ORACLE_TOOLS.T_PROCEDURE_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TRIGGER_DDL; -/* SQL statement 108 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_OBJECT;;;;;;;;2) */ +/* SQL statement 108 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_ATTRIBUTE_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 108'); -DROP TYPE ORACLE_TOOLS.T_PROCOBJ_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_ATTRIBUTE_DDL; -/* SQL statement 109 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_OBJECT;;;;;;;;2) */ +/* SQL statement 109 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_ATTRIBUTE_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 109'); -DROP TYPE ORACLE_TOOLS.T_REFRESH_GROUP_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_ATTRIBUTE_OBJECT; -/* SQL statement 110 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_OBJECT;;;;;;;;2) */ +/* SQL statement 110 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_BODY_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 110'); -DROP TYPE ORACLE_TOOLS.T_SEQUENCE_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_BODY_OBJECT; -/* SQL statement 111 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_OBJECT;;;;;;;;2) */ +/* SQL statement 111 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_METHOD_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 111'); -DROP TYPE ORACLE_TOOLS.T_TABLE_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_METHOD_DDL; -/* SQL statement 112 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_BODY_OBJECT;;;;;;;;2) */ +/* SQL statement 112 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_SPEC_DDL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 112'); -DROP TYPE ORACLE_TOOLS.T_TYPE_BODY_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_SPEC_DDL; -/* SQL statement 113 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_OBJECT;;;;;;;;2) */ +/* SQL statement 113 (DROP;ORACLE_TOOLS;TYPE_BODY;T_TYPE_SPEC_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 113'); -DROP TYPE ORACLE_TOOLS.T_TYPE_SPEC_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_TYPE_SPEC_OBJECT; -/* SQL statement 114 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_VIEW_OBJECT;;;;;;;;2) */ +/* SQL statement 114 (DROP;ORACLE_TOOLS;TYPE_BODY;T_VIEW_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 114'); -DROP TYPE ORACLE_TOOLS.T_VIEW_OBJECT; +DROP TYPE BODY ORACLE_TOOLS.T_VIEW_OBJECT; -/* SQL statement 115 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_NAMED_OBJECT;;;;;;;;2) */ +/* SQL statement 115 (DROP;ORACLE_TOOLS;VIEW;V_DISPLAY_DDL_SCHEMA;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 115'); -DROP TYPE ORACLE_TOOLS.T_NAMED_OBJECT; +DROP VIEW ORACLE_TOOLS.V_DISPLAY_DDL_SCHEMA; -/* SQL statement 116 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_TAB;;;;;;;;2) */ +/* SQL statement 116 (DROP;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_DDL_INFO;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 116'); -DROP TYPE ORACLE_TOOLS.T_OBJECT_INFO_TAB; +DROP VIEW ORACLE_TOOLS.V_MY_SCHEMA_DDL_INFO; -/* SQL statement 117 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_REC;;;;;;;;2) */ +/* SQL statement 117 (DROP;ORACLE_TOOLS;VIEW;V_MY_SCHEMA_OBJECT_INFO;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 117'); -DROP TYPE ORACLE_TOOLS.T_OBJECT_INFO_REC; +DROP VIEW ORACLE_TOOLS.V_MY_SCHEMA_OBJECT_INFO; -/* SQL statement 118 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT_TAB;;;;;;;;2) */ +/* SQL statement 118 (DROP;ORACLE_TOOLS;PACKAGE_SPEC;PKG_DDL_UTIL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 118'); -DROP TYPE ORACLE_TOOLS.T_SCHEMA_OBJECT_TAB; +DROP PACKAGE ORACLE_TOOLS.PKG_DDL_UTIL; -/* SQL statement 119 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT;;;;;;;;2) */ +/* SQL statement 119 (DROP;ORACLE_TOOLS;PACKAGE_SPEC;PKG_STR_UTIL;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 119'); -DROP TYPE ORACLE_TOOLS.T_SCHEMA_OBJECT; +DROP PACKAGE ORACLE_TOOLS.PKG_STR_UTIL; -/* SQL statement 120 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SORT_OBJECTS_BY_DEPS_TAB;;;;;;;;2) */ +/* SQL statement 120 (DROP;ORACLE_TOOLS;TYPE_BODY;T_ARGUMENT_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 120'); -DROP TYPE ORACLE_TOOLS.T_SORT_OBJECTS_BY_DEPS_TAB; +DROP TYPE BODY ORACLE_TOOLS.T_ARGUMENT_OBJECT; -/* SQL statement 121 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SORT_OBJECTS_BY_DEPS_REC;;;;;;;;2) */ +/* SQL statement 121 (DROP;ORACLE_TOOLS;TYPE_BODY;T_DDL_SEQUENCE;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 121'); -DROP TYPE ORACLE_TOOLS.T_SORT_OBJECTS_BY_DEPS_REC; +DROP TYPE BODY ORACLE_TOOLS.T_DDL_SEQUENCE; -/* SQL statement 122 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TEXT_TAB;;;;;;;;2) */ +/* SQL statement 122 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_OBJECT;;;;;;;;2) */ call dbms_application_info.set_action('SQL statement 122'); +DROP TYPE ORACLE_TOOLS.T_TYPE_METHOD_OBJECT; + +/* SQL statement 123 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 123'); +DROP TYPE ORACLE_TOOLS.T_ARGUMENT_OBJECT_TAB; + +/* SQL statement 124 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_ARGUMENT_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 124'); +DROP TYPE ORACLE_TOOLS.T_ARGUMENT_OBJECT; + +/* SQL statement 125 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CLUSTER_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 125'); +DROP TYPE ORACLE_TOOLS.T_CLUSTER_OBJECT; + +/* SQL statement 126 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 126'); +DROP TYPE ORACLE_TOOLS.T_COMMENT_DDL; + +/* SQL statement 127 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_COMMENT_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 127'); +DROP TYPE ORACLE_TOOLS.T_COMMENT_OBJECT; + +/* SQL statement 128 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 128'); +DROP TYPE ORACLE_TOOLS.T_CONSTRAINT_DDL; + +/* SQL statement 129 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REF_CONSTRAINT_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 129'); +DROP TYPE ORACLE_TOOLS.T_REF_CONSTRAINT_OBJECT; + +/* SQL statement 130 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_CONSTRAINT_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 130'); +DROP TYPE ORACLE_TOOLS.T_CONSTRAINT_OBJECT; + +/* SQL statement 131 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_SEQUENCE;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 131'); +DROP TYPE ORACLE_TOOLS.T_DDL_SEQUENCE; + +/* SQL statement 132 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 132'); +DROP TYPE ORACLE_TOOLS.T_INDEX_DDL; + +/* SQL statement 133 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 133'); +DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_DDL; + +/* SQL statement 134 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 134'); +DROP TYPE ORACLE_TOOLS.T_OBJECT_GRANT_DDL; + +/* SQL statement 135 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 135'); +DROP TYPE ORACLE_TOOLS.T_PROCOBJ_DDL; + +/* SQL statement 136 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 136'); +DROP TYPE ORACLE_TOOLS.T_REFRESH_GROUP_DDL; + +/* SQL statement 137 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 137'); +DROP TYPE ORACLE_TOOLS.T_SCHEMA_DDL_TAB; + +/* SQL statement 138 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 138'); +DROP TYPE ORACLE_TOOLS.T_SEQUENCE_DDL; + +/* SQL statement 139 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 139'); +DROP TYPE ORACLE_TOOLS.T_SYNONYM_DDL; + +/* SQL statement 140 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 140'); +DROP TYPE ORACLE_TOOLS.T_TABLE_COLUMN_DDL; + +/* SQL statement 141 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 141'); +DROP TYPE ORACLE_TOOLS.T_TABLE_DDL; + +/* SQL statement 142 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 142'); +DROP TYPE ORACLE_TOOLS.T_TRIGGER_DDL; + +/* SQL statement 143 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 143'); +DROP TYPE ORACLE_TOOLS.T_TYPE_ATTRIBUTE_DDL; + +/* SQL statement 144 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_METHOD_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 144'); +DROP TYPE ORACLE_TOOLS.T_TYPE_METHOD_DDL; + +/* SQL statement 145 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 145'); +DROP TYPE ORACLE_TOOLS.T_TYPE_SPEC_DDL; + +/* SQL statement 146 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 146'); +DROP TYPE ORACLE_TOOLS.T_SCHEMA_DDL; + +/* SQL statement 147 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 147'); +DROP TYPE ORACLE_TOOLS.T_DDL_TAB; + +/* SQL statement 148 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DDL;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 148'); +DROP TYPE ORACLE_TOOLS.T_DDL; + +/* SQL statement 149 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_INDEX_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 149'); +DROP TYPE ORACLE_TOOLS.T_INDEX_OBJECT; + +/* SQL statement 150 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_COLUMN_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 150'); +DROP TYPE ORACLE_TOOLS.T_TABLE_COLUMN_OBJECT; + +/* SQL statement 151 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_ATTRIBUTE_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 151'); +DROP TYPE ORACLE_TOOLS.T_TYPE_ATTRIBUTE_OBJECT; + +/* SQL statement 152 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MEMBER_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 152'); +DROP TYPE ORACLE_TOOLS.T_MEMBER_OBJECT; + +/* SQL statement 153 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_GRANT_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 153'); +DROP TYPE ORACLE_TOOLS.T_OBJECT_GRANT_OBJECT; + +/* SQL statement 154 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SYNONYM_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 154'); +DROP TYPE ORACLE_TOOLS.T_SYNONYM_OBJECT; + +/* SQL statement 155 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TRIGGER_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 155'); +DROP TYPE ORACLE_TOOLS.T_TRIGGER_OBJECT; + +/* SQL statement 156 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_DEPENDENT_OR_GRANTED_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 156'); +DROP TYPE ORACLE_TOOLS.T_DEPENDENT_OR_GRANTED_OBJECT; + +/* SQL statement 157 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_FUNCTION_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 157'); +DROP TYPE ORACLE_TOOLS.T_FUNCTION_OBJECT; + +/* SQL statement 158 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_JAVA_SOURCE_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 158'); +DROP TYPE ORACLE_TOOLS.T_JAVA_SOURCE_OBJECT; + +/* SQL statement 159 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_LOG_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 159'); +DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_LOG_OBJECT; + +/* SQL statement 160 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_MATERIALIZED_VIEW_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 160'); +DROP TYPE ORACLE_TOOLS.T_MATERIALIZED_VIEW_OBJECT; + +/* SQL statement 161 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_BODY_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 161'); +DROP TYPE ORACLE_TOOLS.T_PACKAGE_BODY_OBJECT; + +/* SQL statement 162 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PACKAGE_SPEC_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 162'); +DROP TYPE ORACLE_TOOLS.T_PACKAGE_SPEC_OBJECT; + +/* SQL statement 163 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCEDURE_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 163'); +DROP TYPE ORACLE_TOOLS.T_PROCEDURE_OBJECT; + +/* SQL statement 164 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_PROCOBJ_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 164'); +DROP TYPE ORACLE_TOOLS.T_PROCOBJ_OBJECT; + +/* SQL statement 165 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_REFRESH_GROUP_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 165'); +DROP TYPE ORACLE_TOOLS.T_REFRESH_GROUP_OBJECT; + +/* SQL statement 166 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SEQUENCE_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 166'); +DROP TYPE ORACLE_TOOLS.T_SEQUENCE_OBJECT; + +/* SQL statement 167 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TABLE_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 167'); +DROP TYPE ORACLE_TOOLS.T_TABLE_OBJECT; + +/* SQL statement 168 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_BODY_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 168'); +DROP TYPE ORACLE_TOOLS.T_TYPE_BODY_OBJECT; + +/* SQL statement 169 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TYPE_SPEC_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 169'); +DROP TYPE ORACLE_TOOLS.T_TYPE_SPEC_OBJECT; + +/* SQL statement 170 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_VIEW_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 170'); +DROP TYPE ORACLE_TOOLS.T_VIEW_OBJECT; + +/* SQL statement 171 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_NAMED_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 171'); +DROP TYPE ORACLE_TOOLS.T_NAMED_OBJECT; + +/* SQL statement 172 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 172'); +DROP TYPE ORACLE_TOOLS.T_OBJECT_INFO_TAB; + +/* SQL statement 173 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_OBJECT_INFO_REC;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 173'); +DROP TYPE ORACLE_TOOLS.T_OBJECT_INFO_REC; + +/* SQL statement 174 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 174'); +DROP TYPE ORACLE_TOOLS.T_SCHEMA_OBJECT_TAB; + +/* SQL statement 175 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_SCHEMA_OBJECT;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 175'); +DROP TYPE ORACLE_TOOLS.T_SCHEMA_OBJECT; + +/* SQL statement 176 (DROP;ORACLE_TOOLS;TYPE_SPEC;T_TEXT_TAB;;;;;;;;2) */ +call dbms_application_info.set_action('SQL statement 176'); DROP TYPE ORACLE_TOOLS.T_TEXT_TAB; diff --git a/db/app/ddl/src/incr/V20210830110000__drop_t_sort_objects_by_deps.sql b/db/app/ddl/src/incr/V20210830110000__drop_t_sort_objects_by_deps.sql new file mode 100644 index 00000000..3ea4d173 --- /dev/null +++ b/db/app/ddl/src/incr/V20210830110000__drop_t_sort_objects_by_deps.sql @@ -0,0 +1,2 @@ +drop type T_SORT_OBJECTS_BY_DEPS_TAB; +drop type T_SORT_OBJECTS_BY_DEPS_REC; diff --git a/db/app/ext/src/full/R__09.PACKAGE_SPEC.EXT_LOAD_FILE_PKG.sql b/db/app/ext/src/full/R__09.PACKAGE_SPEC.EXT_LOAD_FILE_PKG.sql index d48ac6fb..96702cea 100644 --- a/db/app/ext/src/full/R__09.PACKAGE_SPEC.EXT_LOAD_FILE_PKG.sql +++ b/db/app/ext/src/full/R__09.PACKAGE_SPEC.EXT_LOAD_FILE_PKG.sql @@ -1,4 +1,4 @@ -create or replace package ext_load_file_pkg as +create or replace package ext_load_file_pkg authid definer as -- to speed it up create_collection_from_query constant boolean := false; @@ -679,7 +679,7 @@ procedure parse_object_name $if cfg_pkg.c_testing $then ---%suitepath(${oracle_tools_schema}) +--%suitepath(EXT) --%suite --%rollback(manual) diff --git a/db/app/ui/src/full/R__09.PACKAGE_SPEC.UI_APEX_MESSAGES_PKG.sql b/db/app/ui/src/full/R__09.PACKAGE_SPEC.UI_APEX_MESSAGES_PKG.sql index e910f32d..e9e7bab1 100644 --- a/db/app/ui/src/full/R__09.PACKAGE_SPEC.UI_APEX_MESSAGES_PKG.sql +++ b/db/app/ui/src/full/R__09.PACKAGE_SPEC.UI_APEX_MESSAGES_PKG.sql @@ -173,7 +173,7 @@ procedure dml $if cfg_pkg.c_testing $then ---%suitepath(${oracle_tools_schema}) +--%suitepath(UI) --%suite --%beforeall diff --git a/db/pom.xml b/db/pom.xml index e5f37e5d..19810ea0 100644 --- a/db/pom.xml +++ b/db/pom.xml @@ -50,7 +50,7 @@ - ${db.schema} + ${db.schema}:${project.artifactId} none @@ -130,7 +130,7 @@ - Reading flyway-app properties from file ${env.properties.dir}${file.separator}flyway-app.conf (if any) + Reading flyway-app properties from file ${env.properties.dir}${file.separator}flyway-app.conf (if any) @@ -139,7 +139,7 @@ - Reading flyway-db properties from file ${db.properties.dir}${file.separator}flyway-db.conf (if any) + Reading flyway-db properties from file ${db.properties.dir}${file.separator}flyway-db.conf (if any) @@ -192,6 +192,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,18 +247,21 @@ ${flyway.version} ${db.install.skip} + + 0 true true ${db.username} - ${db.password} + ${db.password} ${db.url} @@ -267,6 +296,27 @@ + + + + org.codehaus.mojo + sql-maven-plugin + + + + com.oracle.ojdbc + ojdbc8 + ${ojdbc8.version} + + + + true + oracle.jdbc.OracleDriver + ${db.url} + ${db.username} + ${db.password} + + @@ -288,6 +338,24 @@ + + + db-info + + ${db.phase.process} flyway:info + + + + + maven-antrun-plugin + + + org.flywaydb + flyway-maven-plugin + + + + db-install @@ -307,6 +375,85 @@ + + db-code-check + + test + + + + + maven-antrun-plugin + + + db-install-init + + none + + + db-install-verify + + none + + + + + org.codehaus.mojo + sql-maven-plugin + + + db-code-check + test + + execute + + + false + + select 'db.schema: ${db.schema}' as "=== Maven properties ===" + from dual + union all + select 'db.object.type: ${db.object.type}' + from dual + union all + select 'db.object.names: ${db.object.names}' + from dual + union all + select 'db.object.names.include: ${db.object.names.include}' + from dual + union all + select 'db.recompile: ${db.recompile}' + from dual + union all + select 'db.plsql.warnings: ${db.plsql.warnings}' + from dual + union all + select 'db.plscope.settings: ${db.plscope.settings}' + from dual; + + select t.column_value as "=== Compiler messages ===" + from table + ( oracle_tools.cfg_install_pkg.format_compiler_messages + ( p_object_schema => '${db.schema}' + , p_object_type => '${db.object.type}' + , p_object_names => '${db.object.names}' + , p_object_names_include => '${db.object.names.include}' + , p_recompile => '${db.recompile}' + , p_plsql_warnings => '${db.plsql.warnings}' + , p_plscope_settings => '${db.plscope.settings}' + ) + ) t; + + true + | + + + + + + + + db-test @@ -341,8 +488,6 @@ db-generate-ddl-full ${db.phase.process} - - yes @@ -385,7 +530,6 @@ - diff --git a/db/src/admin/create.sql b/db/src/admin/create.sql index 1f75104c..d82fc669 100644 --- a/db/src/admin/create.sql +++ b/db/src/admin/create.sql @@ -25,3 +25,32 @@ temporary tablespace &&tablespace_temp; alter user &&oracle_tools_username - quota unlimited on &&tablespace_users; + +declare + l_found pls_integer; +begin + -- does ut.version (utPLSQL V3) or utconfig.showfailuresonly (utPLSQL v1 and v2) exist? + begin + select 1 + into l_found + from all_procedures + where ( object_name = 'UT' and procedure_name = 'VERSION' ) + or ( object_name = 'UTCONFIG' and procedure_name = 'SHOWFAILURESONLY' ); + + exception + when no_data_found + then + l_found := 0; + when too_many_rows + then + l_found := 1; + end; + + -- when utPLSQL exists create a user EMPTY for unit testing + if l_found = 1 + then + execute immediate 'create user EMPTY identified by "EMPTY" default tablespace &&tablespace_users temporary tablespace &&tablespace_temp'; + execute immediate 'alter user EMPTY quota unlimited on &&tablespace_users'; + end if; +end; +/ diff --git a/db/src/admin/grant.sql b/db/src/admin/grant.sql index 29b8da4e..ee75a499 100644 --- a/db/src/admin/grant.sql +++ b/db/src/admin/grant.sql @@ -4,14 +4,38 @@ define oracle_tools_username = ORACLE_TOOLS accept oracle_tools_username prompt "Oracle tools schema [&&oracle_tools_username] ? " default "&&oracle_tools_username" -grant create job - -,create materialized view - -,create procedure - -,create sequence - -,create session - -,create synonym - -,create table - -,create trigger - -,create type - -,create view - -to &&oracle_tools_username; +define privileges = "create job, create materialized view, create procedure, create sequence, create session, create synonym, create table, create trigger, create type, create view" + +grant &&privileges to &&oracle_tools_username; + +declare + l_found pls_integer; +begin + -- does ut.version (utPLSQL V3) or utconfig.showfailuresonly (utPLSQL v1 and v2) exist? + begin + select 1 + into l_found + from all_procedures + where ( object_name = 'UT' and procedure_name = 'VERSION' ) + or ( object_name = 'UTCONFIG' and procedure_name = 'SHOWFAILURESONLY' ); + + exception + when no_data_found + then + l_found := 0; + when too_many_rows + then + l_found := 1; + end; + + -- when utPLSQL exists issue extra grants + if l_found = 1 + then + -- same priviliges for EMPTY as for ORACLE_TOOLS + execute immediate 'grant &&privileges to EMPTY'; + -- something extra for ORACLE_TOOLS + execute immediate 'grant create database link to &&oracle_tools_username'; + execute immediate 'grant select_catalog_role to &&oracle_tools_username'; + end if; +end; +/ diff --git a/db/src/scripts/generate_ddl.pl b/db/src/scripts/generate_ddl.pl index 56518cd2..61b5c267 100644 --- a/db/src/scripts/generate_ddl.pl +++ b/db/src/scripts/generate_ddl.pl @@ -116,11 +116,6 @@ =head1 OPTIONS The output directory, default the current directory. -=item B<--remove-output-directory> - -A boolean toggle to indicate whether the output-directory option must be -removed before creating scripts. Default value is NO. - =item B<--single-output-file> Normally output files will be created for each object in the output @@ -164,16 +159,29 @@ =head1 SEE ALSO =head1 AUTHOR -Gert-Jan Paulissen, Egert.jan.paulissen@gmail.comE. - -=head1 VERSION - -$Header$ +Gert-Jan Paulissen =head1 HISTORY =over 4 +=item 2021-08-27 + +Create the file in the output directory only when it is different from the +existing one (or when it does not exist). This assures that the file +modification date will not change when the DDL has not changed. + +The command line option remove-output-directory is not necessary anymore since +files are first created in a temporary directory and copied only when not the +same. Files not created in the temporary directory will be removed at the end +from the output directory. + +For example, say install.sql exists in the output directory. + +=item 2021-08-25 + +Solved bug for interface version 5 when file instal_sequence.txt is not there. + =item 2021-08-24 Version 5 of the pkg_ddl_util interface has been added. @@ -242,9 +250,11 @@ =head1 HISTORY use Data::Dumper; use English; use File::Basename; +use File::Compare; use File::Copy; -use File::Path qw(make_path remove_tree); +use File::Path qw(make_path); use File::Spec; +use File::Temp qw(tempdir); use Getopt::Long; use Pod::Usage; use strict; @@ -257,6 +267,8 @@ =head1 HISTORY # VARIABLES +my $VERSION = "2021-08-27"; + my $program = &basename($0); my $encoding = ''; # was :crlf:encoding(UTF-8) my $install_sql_preamble_printed = 0; @@ -266,7 +278,6 @@ =head1 HISTORY my $force_view = 1; # displayed in print_run_info() my $input_file = undef; my $output_directory = '.'; -my $remove_output_directory = 0; # displayed in print_run_info() my $single_output_file = undef; my $skip_install_sql = 1; # displayed in print_run_info() my $source_schema = ''; # displayed in print_run_info() @@ -346,12 +357,15 @@ =head1 HISTORY my %object_seq = (); -# A list of modified files so we can remove non-modified files in non single output mode. +# A list of modified files in output directory so we can remove non-modified files in non single output mode. +# Key is file name created by this run in output directory. Value is 0 if file is unchanged, 1 otherwise. my %file_modified = (); -my $VERSION = "2021-08-24"; +# Key: file handle; Value: base file name. +my %fh_modified = (); + +my $TMPDIR = tempdir( CLEANUP => 1 ); - # PROTOTYPES sub main (); @@ -363,7 +377,10 @@ =head1 HISTORY sub get_object ($$$;$$$); sub object_file_name ($$$); sub open_file ($$$$); -sub sql_statement_add ($$$$;$); +sub close_file ($$); +sub smart_open ($;$); +sub smart_close ($); +sub add_sql_statement ($$$$;$); sub sort_sql_statements ($$$); sub sort_dependent_objects ($$$); sub all_sql_statements_flush ($$$$); @@ -375,6 +392,9 @@ =head1 HISTORY sub remove_trailing_empty_lines ($); sub beautify_line ($$$$$$); sub split_single_output_file($); +sub add_object_seq ($); +sub read_object_seq ($); +sub write_object_seq ($); sub error (@); sub warning (@); sub info (@); @@ -411,7 +431,6 @@ () 'help' => sub { pod2usage(-verbose => 2) }, 'input-file=s' => \$input_file, 'output-directory=s' => \$output_directory, - 'remove-output-directory!' => \$remove_output_directory, 'single-output-file:s' => \$single_output_file, # optional 'skip-install-sql!' => \$skip_install_sql, 'source-schema:s' => \$source_schema, # option may be empty @@ -447,33 +466,7 @@ () $in = \*STDIN; } - my $fh_seq = undef; - - # read previous object sequence numbers first so we can recreate them even if the directory is removed after - if ( -e $install_sequence_txt ) { - open($fh_seq, '<', $install_sequence_txt) - or error("Can not open '$install_sequence_txt': $!"); - - my $line_nr = 0; - - while (<$fh_seq>) { - if (m/^(.*)[:.](.*)[:.](.*)$/) { - $_ = join(':', $1, $2, $3); - error("Object must be unique: $_") - if exists($object_seq{$_}); - $object_seq{$_} = ++$line_nr; - debug("\$object_seq{$_}:", $object_seq{$_}); - } - } - close $fh_seq; - $fh_seq = undef; - } - - if ($remove_output_directory) { - # Only when a complete new tree is created, the install.sql script is reliable. - # Because when the tree is not removed, the user may just create a single script and not the whole tree. - remove_tree($output_directory, { verbose => 0 }); - } + read_object_seq($install_sequence_txt); # always make the output directory make_path($output_directory, { verbose => 0 }); @@ -483,7 +476,7 @@ () $| = 1; select(STDOUT); # back to the default $| = 1; - + my ($file, $fh) = (undef, undef); # in case of a set of output files, an install.sql is created in the output directory @@ -491,14 +484,10 @@ () if (defined($single_output_file)) { $file = File::Spec->catfile($output_directory, $single_output_file); - open($fh, ">$encoding", $file) - or error("Can not write to '$file': $!"); + $fh = smart_open($file); } else { - # GJP 2021-07-27 $remove_output_directory should not be a condition so put defined() around it - if (defined($remove_output_directory) && defined($install_sql)) { - open($fh_install_sql, ">$encoding", $install_sql) - or error("Can not write to '$install_sql': $!"); - } + $fh_install_sql = smart_open($install_sql) + if (defined($install_sql)); } print_run_info($fh, 0) @@ -583,7 +572,7 @@ () } beautify_line("\"$object_schema\".\"$object_name\"", $object_schema, $object_name, $object_type, $line_no, \$line); - sql_statement_add(\$line, \%sql_statements, $object, $ddl_no, $ddl_info); + add_sql_statement(\$line, \%sql_statements, $object, $ddl_no, $ddl_info); } } } @@ -598,9 +587,10 @@ () debug(Data::Dumper->Dump([%sql_statements], [qw(sql_statements)])); all_sql_statements_flush($fh_install_sql, \$fh, \$nr_sql_statements, \%sql_statements); - close($fh); + smart_close($fh) + if defined($fh); # single output file - close($fh_install_sql) + smart_close($fh_install_sql) if defined($fh_install_sql); if (defined($input_file)) { # Suppress 'Filehandle STDIN reopened as $fh_seq only for output' @@ -614,23 +604,21 @@ () # Only write $install_sequence_txt for version 5 if ($interface eq PKG_DDL_UTIL_V5) { - open($fh_seq, '>', $install_sequence_txt) - or error("Can not write '$install_sequence_txt': $!"); - - print $fh_seq "-- This file is maintained by generate_ddl.pl\n"; - print $fh_seq "-- DO NEVER REMOVE LINES BELOW BUT YOU MAY CHANGE THE ORDER OR ADD LINES (AT THE END)\n"; - foreach my $object (sort { $object_seq{$a} <=> $object_seq{$b} } keys %object_seq) { - print $fh_seq "$object\n"; - } - close $fh_seq; + write_object_seq($install_sequence_txt); } # Remove obsolete SQL scripts matching the Flyway naming convention and not being modified. - if (!$remove_output_directory && !defined($single_output_file)) { - # GJP 2021-08-21 - my @obsolete_files = glob(File::Spec->catfile($output_directory, '*.sql')); + if (!defined($single_output_file)) { + # GJP 2021-08-21 Add SQL scripts that adhere to the naming convention + my @obsolete_files = grep { m/\b(R__)?(\d{2}|\d{4})\./ } glob(File::Spec->catfile($output_directory, '*.sql')); + + # GJP 2021-08-27 Add install files too + push(@obsolete_files, + File::Spec->catfile($output_directory, 'install.sql'), + File::Spec->catfile($output_directory, 'install_sequence.txt')); - @obsolete_files = grep { -f $_ && m/\b(R__)?(\d{2}|\d{4})\./ && !exists($file_modified{$_}) } @obsolete_files; + # When those files have not been created + @obsolete_files = grep { -f $_ && !exists($file_modified{$_}) } @obsolete_files; if (scalar(@obsolete_files) > 0) { info('Obsolete files to delete:', @obsolete_files); @@ -638,10 +626,10 @@ () unlink(@obsolete_files) == scalar(@obsolete_files) or error("Can not remove obsolete files"); } } -} + info(sprintf("The number of files generated is %d (%d new or changed).", scalar(keys %file_modified), scalar(grep(/1/, values %file_modified)))); +} # process -sub process_object_type ($$$$) -{ +sub process_object_type ($$$$) { my ($object_type, $r_object_type_lines, $r_ddl_no, $r_sql_statements) = @_; debug("Process object type $object_type with $#$r_object_type_lines lines") if (defined($object_type)); @@ -690,7 +678,7 @@ ($$$$) $last_line = $line; $line =~ s/^\s+//; # strip leading space - sql_statement_add(\$line, $r_sql_statements, $object, $ddl_no); + add_sql_statement(\$line, $r_sql_statements, $object, $ddl_no); } elsif (!defined($object)) { warning("skipping '$line'") if ($line =~ m/\S/); @@ -705,17 +693,16 @@ ($$$$) unless defined($last_line); # $last_line = $line; - sql_statement_add(\$line, $r_sql_statements, $object, $ddl_no); + add_sql_statement(\$line, $r_sql_statements, $object, $ddl_no); } else { # empty - sql_statement_add(\$line, $r_sql_statements, $object, $ddl_no); + add_sql_statement(\$line, $r_sql_statements, $object, $ddl_no); } } } } -sub get_object_type_line ($$) -{ +sub get_object_type_line ($$) { my ($object_type, $r_object_type_lines) = @_; # Remove a block like this: @@ -744,8 +731,7 @@ ($$) return shift(@$r_object_type_lines); } -sub parse_object($) -{ +sub parse_object($) { my ($owner, $name) = ($source_schema, @_); if ($name =~ qr/(?$id_expr)\s*\.\s*(?$id_expr)/) { @@ -795,8 +781,7 @@ ($$$;$$$) } } -sub object_file_name ($$$) -{ +sub object_file_name ($$$) { my ($object_schema, $object_type, $object_name) = @_; if (length($source_schema) > 0 && $object_schema !~ m/^(PUBLIC|$source_schema)$/) { @@ -819,8 +804,7 @@ ($$$) my $nr_zeros = ($interface eq PKG_DDL_UTIL_V4 ? 2 : 4); if (!exists($object_seq{$object_seq_key})) { - $object_seq{$object_seq_key} = keys(%object_seq) + 1; - debug("\$object_seq{$object_seq_key}:", $object_seq{$object_seq_key}); + add_object_seq($object_seq_key); } $object_file_name = uc(sprintf("%s%0${nr_zeros}d.%s%s.%s", @@ -833,8 +817,7 @@ ($$$) return $object_file_name; } -sub open_file ($$$$) -{ +sub open_file ($$$$) { my ($file, $fh_install_sql, $r_fh, $ignore_warning_when_file_exists) = @_; if (defined $fh_install_sql && !$install_sql_preamble_printed) { @@ -845,29 +828,80 @@ ($$$$) print $fh_install_sql "prompt \@\@$file\n\@\@$file\n" if (defined $fh_install_sql); + # GJP 2021-08-27 Create the file in $output_directory later on in close_file() so modification date will not change if file is the same + + my $tmpfile = File::Spec->catfile($TMPDIR, $file); + $file = File::Spec->catfile($output_directory, $file); # Just issue a warning till now and append - if ($remove_output_directory && -f $file) { + if (-f $tmpfile) { warn "WARNING: File $file already exists. Duplicate objects?" unless ($ignore_warning_when_file_exists); - open($$r_fh, ">>$encoding", $file) - or error("Can not append to '$file': $!"); - - info("Appending to $file"); + $$r_fh = smart_open($tmpfile, 1); # append } else { - open($$r_fh, ">$encoding", $file) - or error("Can not write to '$file': $!"); - - info("Writing to $file"); + $$r_fh = smart_open($tmpfile); } +} + +sub close_file ($$) { + my ($file, $r_fh) = @_; - $file_modified{$file} = 1; + # close before comparing/copying/removing + smart_close($$r_fh); + $$r_fh = undef; } - -sub sql_statement_add ($$$$;$) -{ + +# GJP 2021-08-27 +# Create the file in $output_directory later on in close_file() so modification date will not change if file is the same. +# To do this use smart_open() and smart_close() instead of open()/close(). + +# open file for writing +sub smart_open ($;$) { + my ($file, $append) = @_; + my $basename = basename($file); + my ($tmpfile, $fh) = (File::Spec->catfile($TMPDIR, $basename)); + + # open + open($fh, (defined($append) && $append ? ">>" : ">") . $encoding, $tmpfile) + or error("Can not write to '$tmpfile': $!"); + + $fh_modified{$fh} = $basename; + + return $fh; +} + +sub smart_close ($) { + my $fh = shift @_; + + error("File handle unknown") + unless exists($fh_modified{$fh}); + + my $basename = $fh_modified{$fh}; + + close($fh) + or error("Can not close file: $!"); + + delete $fh_modified{$fh}; + + # Now copy (smart) from temp to output directory + my ($tmpfile, $file) = (File::Spec->catfile($TMPDIR, $basename), File::Spec->catfile($output_directory, $basename)); + + if (-f $file && compare($tmpfile, $file) == 0) { + debug("File $file has NOT been changed"); + $file_modified{$file} = 0; + } else { + # $file not existing yet or not equal to $tmpfile + info("File $file has been " . (-f $file ? "changed": "created")); + copy($tmpfile, $file) or error("Copy from '$tmpfile' to '$file' failed: $!"); + $file_modified{$file} = 1; + } + # always clean up + unlink($tmpfile) == 1 or error("Removing '$tmpfile' failed: $!"); +} + +sub add_sql_statement ($$$$;$) { my ($r_sql_line, $r_sql_statements, $object, $ddl_no, $ddl_info) = @_; debug("Adding '$$r_sql_line' for object $object and statement $ddl_no"); @@ -875,6 +909,11 @@ ($$$$;$) $r_sql_statements->{$object}->{seq} = scalar(keys %$r_sql_statements) unless exists($r_sql_statements->{$object}->{seq}); + # ignore errors when $object does not conform to naming convention or already exists + eval { + add_object_seq($object); + }; + $r_sql_statements->{$object}->{ddls}->[$ddl_no] = { 'ddl_info' => $ddl_info, 'ddl' => [] } unless exists($r_sql_statements->{$object}->{ddls}->[$ddl_no]); @@ -898,11 +937,7 @@ ($$$) # just sort by sequence $result = ($r_sql_statements->{$a}->{seq} <=> $r_sql_statements->{$b}->{seq}); } else { - error("\$object_seq{$a} does not exist") - unless exists($object_seq{$a}); - error("\$object_seq{$b} does not exist") - unless exists($object_seq{$b}); - + # $object_seq{$a} and $object_seq{$b} will exists do to call to add_object_seq() in add_sql_statement() $result = ($object_seq{$a} <=> $object_seq{$b}); } @@ -924,8 +959,7 @@ ($$$) return $a->{ddl}->[0] cmp $b->{ddl}->[0]; } -sub all_sql_statements_flush ($$$$) -{ +sub all_sql_statements_flush ($$$$) { my ($fh_install_sql, $r_fh, $r_nr_sql_statements, $r_sql_statements) = @_; debug("Flushing all objects"); @@ -942,11 +976,11 @@ ($$$$) } } -sub object_sql_statements_flush ($$$$$) -{ +sub object_sql_statements_flush ($$$$$) { my ($fh_install_sql, $r_fh, $r_nr_sql_statements, $r_sql_statements, $object) = @_; my $ignore_warning_when_file_exists = 0; + my $file = undef; debug("Flushing $object with ", scalar(@$r_sql_statements), " statement(s)"); @@ -969,7 +1003,7 @@ ($$$$$) return; } - my $file = object_file_name($object_schema, $object_type, $object_name); + $file = object_file_name($object_schema, $object_type, $object_name); # # remove ALTER ... COMPILE statements @@ -1043,12 +1077,14 @@ ($$$$$) sql_statement_flush($$r_fh, \$nr_sql_statements, $r_sql_statement->{ddl}, $object, $ddl_no, $r_sql_statement->{ddl_info}); } + close_file($file, $r_fh) + if ( defined($file) ); + # Update the grand total $$r_nr_sql_statements += $nr_sql_statements; -} +} # object_sql_statements_flush -sub sql_statement_flush ($$$$$$) -{ +sub sql_statement_flush ($$$$$$) { my ($fh, $r_nr_sql_statements, $r_sql_statement, $object, $ddl_no, $ddl_info) = @_; debug("Flushing statement for $object with ", scalar(@$r_sql_statement), " line(s)"); @@ -1270,8 +1306,7 @@ ($$$$$$) print $fh $sql_statement; } -sub print_run_info ($$) -{ +sub print_run_info ($$) { my ($fh, $install) = @_; error("File handle must be defined") unless defined($fh); @@ -1279,7 +1314,6 @@ ($$) print $fh '/* ', "perl generate_ddl.pl (version $VERSION)"; print $fh sprintf(" --%s%s", ($dynamic_sql ? '' : 'no'), 'dynamic-sql'); print $fh sprintf(" --%s%s", ($force_view ? '' : 'no'), 'force-view'); - print $fh sprintf(" --%s%s", ($remove_output_directory ? '' : 'no'), 'remove-output-directory'); print $fh sprintf(" --%s%s", ($skip_install_sql ? '' : 'no'), 'skip-install-sql'); print $fh " --source-schema=$source_schema" if (length($source_schema) > 0); print $fh sprintf(" --%s%s", ($strip_source_schema ? '' : 'no'), 'strip-source-schema'); @@ -1294,8 +1328,7 @@ ($) $$r_line =~ s/\r?\n//mg; } -sub remove_leading_empty_lines ($) -{ +sub remove_leading_empty_lines ($) { my $r_lines = $_[0]; REMOVE_LEADING_EMPTY_LINES: { @@ -1311,8 +1344,7 @@ ($) } } -sub remove_trailing_empty_lines ($) -{ +sub remove_trailing_empty_lines ($) { my $r_lines = $_[0]; REMOVE_TRAILING_EMPTY_LINES: { @@ -1393,9 +1425,9 @@ ($) $output_file = $input_file; $output_file =~ s/\@nr\@/sprintf("%04d", $nr)/e; - close($output_fh) if (defined($output_fh)); + smart_close($output_fh) if (defined($output_fh)); - open($output_fh, ">$encoding", $output_file) + $output_fh = smart_open($output_file) or error("Can not write to '$output_file': $!"); } @@ -1405,12 +1437,59 @@ ($) unless $line =~ m/^call\s+dbms_application_info\.(set_module|set_action)\b/; } - close($output_fh) if (defined($output_fh)); + smart_close($output_fh) if (defined($output_fh)); close($input_fh); unlink($input_file); } +sub add_object_seq ($) { + my $key = shift @_; + + error("Key '$key' should match 'SCHEMA:TYPE:NAME'") + unless $key =~ m/^.+:.+:.+$/; + + error("Object sequence for '$key' already exists.") + if exists($object_seq{$key}); + + $object_seq{$key} = keys(%object_seq) + 1; + debug("\$object_seq{$key}:", $object_seq{$key}); +} + +sub read_object_seq ($) { + my $install_sequence_txt = shift @_; + my $fh_seq = undef; + + # read previous object sequence numbers first so we can recreate them even if the directory is removed after + if ( -e $install_sequence_txt ) { + open($fh_seq, '<', $install_sequence_txt) + or error("Can not open '$install_sequence_txt': $!"); + + while (<$fh_seq>) { + if (m/^(.+)[:.](.+)[:.](.+)$/) { + add_object_seq(join(':', $1, $2, $3)); + } + } + + close $fh_seq; + } +} + +sub write_object_seq ($) { + my $install_sequence_txt = shift @_; + my $fh_seq = undef; + + $fh_seq = smart_open($install_sequence_txt) + or error("Can not write '$install_sequence_txt': $!"); + + print $fh_seq "-- This file is maintained by generate_ddl.pl\n"; + print $fh_seq "-- DO NEVER REMOVE LINES BELOW BUT YOU MAY CHANGE THE ORDER OR ADD LINES (AT THE END)\n"; + foreach my $object (sort { $object_seq{$a} <=> $object_seq{$b} } keys %object_seq) { + print $fh_seq "$object\n"; + } + smart_close($fh_seq); +} + sub error (@) { croak "ERROR: @_"; } diff --git a/db/src/scripts/generate_ddl.xml b/db/src/scripts/generate_ddl.xml index 5cc48d3b..592dfbfc 100644 --- a/db/src/scripts/generate_ddl.xml +++ b/db/src/scripts/generate_ddl.xml @@ -36,8 +36,6 @@ The build directory. The following properties are used for generate-ddl-full: - - full.remove.output.directory - Must we remove the output directory tree before? - full.force.view Do we remove the FORCE keyword from CREATE OR REPLACE FORCE VIEW? - full.output.directory @@ -151,8 +149,8 @@ - - + + @@ -180,7 +178,6 @@ - @@ -401,7 +398,6 @@ Z Time zone RFC 822 time zone -0800 - diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index 35a99e49..fb117d2a 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -19,9 +19,33 @@ This chapter describes the configuration you can define for Oracle Tools. --- -## Database configuration directory +## Profiles -In oracle-tools there is a directory conf/src that contains the database configuration: +Before we dive into the configuration it is important to note that Maven profiles are available to execute the following actions. + +Of course it is possible to work without Maven profiles but why should you? + +### Database + +|Profile (action) |Description| +|:--------------- |:----------| +|db-info |Show Flyway information about (to be) installed migrations.| +|db-install |Perform Flyway migrations.| +|db-code-check |Use native PL/SQL code checks based on PL/SQL warnings and PL/Scope.| +|db-test |Execute a unit test using utPLSQL v3.| +|db-generate-ddl-full|Generate DDL scripts assuming that there are no objects yet.| +|db-generate-ddl-incr|Generate DDL scripts to migrate non repeatable objects that may already be there.| + +### Apex + +|Profile (action) |Description| +|:--------------- |:----------| +|apex-export |Export an Apex application.| +|apex-import |Import an Apex application.| + +## Configuration files directory + +In oracle-tools there is a directory conf/src that contains the configuration files: ``` | env.properties @@ -33,7 +57,12 @@ In oracle-tools there is a directory conf/src that contains the database configu flyway-db.conf ``` -The property db.config.dir in Oracle Tools points to this directory. +Here orcl is the logical name for a database. + +The property db.config.dir in Oracle Tools by defaults points to the directory conf/src. + +However you can set db.config.dir to another directory anywhere provided you +have a file called env.properties there and other database directories below. ### env.properties @@ -142,15 +171,15 @@ defaults: This is the POM that can be used as parent for projects that need a database connection. -|Property |Default |Description | -|-------- |------- |----------- | -|db.schema |${project.artifactId} |Defaults to POM artifactId assuming it is named after the database schema| -|db.password |${env.DB_PASSWORD} |Defaults to environment variable DB_PASSWORD | -|db.config.dir |directory of **/conf/env.properties |Database configuration directory | -|db | |One of the subdirectories of ${db.config.dir} | -|db.connect.identifier|//${db.host}:${db.port}/${db.service} |Part of the database URL | -|db.url |jdbc:oracle:thin:@${db.connect.identifier} |JDBC database URL | -|db.userid |${db.username}/${db.password}@${db.connect.identifier}|SQLcl connect string | +|Property |Default |Description | +|:------- |:------ |:---------- | +|db.schema |${project.artifactId} |Defaults to POM artifactId assuming it is named after the database schema.| +|db.password |${env.DB_PASSWORD} |Defaults to environment variable DB_PASSWORD. | +|db.config.dir |directory of **/conf/env.properties |Database configuration directory. | +|db | |One of the subdirectories of ${db.config.dir}. | +|db.connect.identifier|//${db.host}:${db.port}/${db.service} |Part of the database URL. | +|db.url |jdbc:oracle:thin:@${db.connect.identifier} |JDBC database URL. | +|db.userid |${db.username}/${db.password}@${db.connect.identifier}|SQLcl connect string. | ### oracle-tools/db/pom.xml @@ -159,56 +188,75 @@ actions. It has oracle-tools/conf/pom.xml as its parent POM. #### Flyway related properties -For profile (action) db-install: +For profiles (actions) db-info and db-install: |Property |Default |Description | -|-------- |------- |----------- | -|db.src.scripts |src |The root directory for Flyway migration scripts | -|db.src.dml.scripts |${db.src.scripts}/dml |The directory containing DML scripts | -|db.src.full.scripts |${db.src.scripts}/full |The directory containing DDL scripts that can be run over and over again | -|db.src.incr.scripts |${db.src.scripts}/incr |The directory containing DDL scripts that can be run only once | -|db.src.callbacks.scripts|${oracle-tools.db.src.dir}/callbacks|The directory that contains scripts run before or after Flyway | +|:------- |:------ |:---------- | +|db.src.scripts |src |The root directory for Flyway migration scripts. | +|db.src.dml.scripts |${db.src.scripts}/dml |The directory containing DML scripts. | +|db.src.full.scripts |${db.src.scripts}/full |The directory containing DDL scripts that can be run over and over again.| +|db.src.incr.scripts |${db.src.scripts}/incr |The directory containing DDL scripts that can be run only once. | +|db.src.callbacks.scripts|${oracle-tools.db.src.dir}/callbacks|The directory that contains scripts run before or after Flyway. | -#### Properties for generating DDL +#### Properties for code checks and generating DDL -For profiles (actions) db-generate-ddl-full and db-generate-ddl-incr: +For profiles (actions) db-code-check, db-generate-ddl-full and db-generate-ddl-incr the following properties are common: |Property |Default|Description | -|-------- |-------|----------- | -|db.object.type | |Only generate for this object type (Oracle package DBMS_METADATA) | -|db.object.names | |A list of object names to include or exclude (or empty to include all) | -|db.object.names.include | |Specifies what to do with db.object.names: empty (no filter), 0 (exclude) or 1 (include) | +|:------- |:------|:---------- | +|db.object.type | |Only generate for this object type (see Oracle package DBMS_METADATA for possible values). | +|db.object.names | |A list of object names to include or exclude (or empty to include all). | +|db.object.names.include | |Specifies what to do with db.object.names: empty (no filter), 0 (exclude) or 1 (include). | + +##### Profile db-code-check + +|Property |Default |Description| +|:------- |:------ |:----------| +|db.recompile |1 |Must the code checker recompile objects to have a detailed analysis: yes (1) or no (0)? Probably not in production!| +|db.plsql.warnings |ENABLE:ALL |For "alter session set PLSQL_WARNINGS = '${db.plsql.warnings}'".| +|db.plscope.settings |IDENTIFIERS:ALL |For "alter session set PLSCOPE_SETTINGS = '${db.plscope.settings}'".| + +Please note that these properties are defined in oracle-tools/conf/pom.xml but +only when they have not been defined before. So you can for example add this line + +``` +recompile=0 +``` + +to a production db.properties file (prefix db. is added by default for such a +file) to ensure that by default no recompilation takes place in production +when you invoke db-code-check. ##### Profile db-generate-ddl-full -|Property |Default|Description | -|-------- |-------|----------- | -|db.full.remove.output.directory |yes |Remove the output directory (${db.src.full.scripts}) before generating DDL scripts? | -|db.full.force.view |no |CREATE OR REPLACE **FORCE** VIEW or not? | -|db.full.skip.install.sql |yes |skip creating install.sql/uninstall.sql scripts? | -|db.full.interface |pkg_ddl_util v5|Interface version for creating DDL scripts. Script naming convention is ....sql where PREFIX is "R__" for replaceable objects and empty otherwise, sequence number SEQ depends on TYPE for "pkg_ddl_util v4" and the place in file install_sequence.txt for "pkg_ddl_util v5"| -|db.full.transform.params |SEGMENT_ATTRIBUTES,TABLESPACE|A comma separated list of SEGMENT_ATTRIBUTES, STORAGE, TABLESPACE (all table related) and OID (needed for object types used with database links)| -|db.generate.ddl.full.skip | |Skip generating full DDL scripts for this project? False when ${db.src.full.scripts} exists. | -|db.generate.full.strip.source.schema|0 |Strip source schema from 'create or replace "source schema"."source name"': yes (1) or no (0)| +|Property |Default |Description| +|:------- |:------ |:----------| +|db.full.remove.output.directory |yes |Remove the output directory (${db.src.full.scripts}) before generating DDL scripts?| +|db.full.force.view |no |CREATE OR REPLACE **FORCE** VIEW or not?| +|db.full.skip.install.sql |yes |skip creating install.sql/uninstall.sql scripts?| +|db.full.interface |pkg_ddl_util v5 |Interface version for creating DDL scripts. Script naming convention is <PREFIX><SEQ>.<OWNER>.<TYPE>.<NAME>.sql where PREFIX is "R__" for replaceable objects and empty otherwise, sequence number SEQ depends on TYPE for "pkg_ddl_util v4" and the place in file install_sequence.txt for "pkg_ddl_util v5".| +|db.full.transform.params |SEGMENT_ATTRIBUTES,TABLESPACE|A comma separated list of SEGMENT_ATTRIBUTES, STORAGE, TABLESPACE (all table related) and OID (needed for object types used with database links).| +|db.generate.ddl.full.skip | |Skip generating full DDL scripts for this project? False when ${db.src.full.scripts} exists.| +|db.generate.full.strip.source.schema|0 |Strip source schema from 'create or replace "source schema"."source name"': yes (1) or no (0).| ##### Profile db-generate-ddl-incr -|Property |Default|Description | -|-------- |-------|----------- | -|db.incr.dynamic.sql |no |Use dynamic SQL for the incremental migration scripts? | -|db.incr.skip.repeatables |yes |Skip repeatable/replaceable objects in incremental migration scripts? | -|db.incr.interface |pkg_ddl_util v5|See description for db.full.interface above| -|db.incr.transform.params |SEGMENT_ATTRIBUTES,TABLESPACE|See description for db.full.transform.params above| -|db.generate.ddl.incr.skip | |Skip generating full DDL scripts for this project? False when ${db.src.full.scripts} exists.| +|Property |Default |Description | +|:------- |:------ |:---------- | +|db.incr.dynamic.sql |no |Use dynamic SQL for the incremental migration scripts? | +|db.incr.skip.repeatables |yes |Skip repeatable/replaceable objects in incremental migration scripts? | +|db.incr.interface |pkg_ddl_util v5 |See description for db.full.interface above. | +|db.incr.transform.params |SEGMENT_ATTRIBUTES,TABLESPACE|See description for db.full.transform.params above. | +|db.generate.ddl.incr.skip | |Skip generating full DDL scripts for this project? False when ${db.src.full.scripts} exists.| #### Properties for running utPLSQL -The profile is db-test: +The profile (action) is db-test: -|Property |Default |Description | -|-------- |------- |----------- | -|db.utplsql.path|${db.schema}|Run utPLSQL for the packages | -|db.test.phase |none |Set this to test in your project POM in order to activate it| +|Property |Default |Description | +|:------- |:------ |:---------- | +|db.utplsql.path|${db.schema}:${project.artifactId}|Run utPLSQL for packages with utPLSQL suitepath equal to their POM artifactId.| +|db.test.phase |none |Set this to test in your project POM in order to activate it. | ### oracle-tools/apex/pom.xml @@ -218,11 +266,11 @@ actions. It has oracle-tools/conf/pom.xml as its parent POM. For profiles (actions) apex-export and apex-import: |Property |Default |Description | -|-------- |------- |----------- | -|apex.src.dir |${basedir}/src |The project source directory | -|apex.application.dir |${apex.src.dir}/export|The Apex export directory with splitted SQL scripts | -|apex.workspace | |The Apex workspace | -|apex.application | |The Apex application id | -|apex.application.version|current date/time |In Java yyyy-MM-dd hh:mm:ss format, used in Apex application version info| -|sql.home | |The home directory of SQLcl (${sql.home}/bin/sql exists?) | -|env.SQL_HOME | |Idem but now the environment variable SQL_HOME | +|:------- |:------ |:---------- | +|apex.src.dir |${basedir}/src |The project source directory. | +|apex.application.dir |${apex.src.dir}/export|The Apex export directory with splitted SQL scripts. | +|apex.workspace | |The Apex workspace. | +|apex.application | |The Apex application id. | +|apex.application.version|current date/time |In Java yyyy-MM-dd hh:mm:ss format, used in Apex application version info.| +|sql.home | |The home directory of SQLcl (${sql.home}/bin/sql exists?). | +|env.SQL_HOME | |Idem but now the environment variable SQL_HOME. | diff --git a/pom.xml b/pom.xml index 79fc4328..cca8e83c 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 3.3.0 1.0.0 3.0.0 + 1.5 1.9.5 @@ -243,6 +244,11 @@ + + org.codehaus.mojo + sql-maven-plugin + ${sql-maven-plugin.version} +