Merge branch 'develop' into feature/resolve_12_2_conditional_compilation

jgebal · web-flow · commit 0d3da05b30f7 · 2019-01-31T08:29:57.000Z
diff --git a/docs/userguide/install.md b/docs/userguide/install.md
@@ -80,6 +80,8 @@ sqlplus sys/sys_pass@db as sysdba @install_headless.sql utp3 my_verySecret_passw
 
 The script needs to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages.
 
+*Note:* Grant on `DBMS_LOCK` is required on Oracle versions below 18c
+
 
 # Recommended Schema
 It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema.
diff --git a/source/check_object_grants.sql b/source/check_object_grants.sql
@@ -1,6 +1,9 @@
 declare
-  c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_LOCK','DBMS_CRYPTO');
-
+  $if dbms_db_version.version >= 18 $then
+    c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_CRYPTO');
+  $else
+    c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_LOCK','DBMS_CRYPTO');
+  $end
   l_missing_grants varchar2(4000);
   l_target_table   varchar2(128);
   l_owner_column   varchar2(128);
diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb
@@ -123,7 +123,11 @@ create or replace type body ut_output_table_buffer is
 
       --nothing fetched from output, wait and try again
       if l_buffer_data.count = 0 then
-        dbms_lock.sleep(l_sleep_time);
+        $if dbms_db_version.version >= 18 $then
+          dbms_session.sleep(l_sleep_time);
+        $else
+          dbms_lock.sleep(l_sleep_time);
+        $end
         l_already_waited_for := l_already_waited_for + l_sleep_time;
         if l_already_waited_for > lc_long_wait_time then
           l_sleep_time := lc_long_sleep_time;
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.4.2503-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.4.2508-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);
diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql
@@ -31,7 +31,14 @@ create user &ut3_user identified by "&ut3_password" default tablespace &ut3_tabl
 
 grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_user;
 
-grant execute on dbms_lock to &ut3_user;
+begin
+  $if dbms_db_version.version < 18 $then
+    execute immediate 'grant execute on dbms_lock to &ut3_user';
+  $else
+    null;
+  $end
+end;
+/
 
 grant execute on dbms_crypto to &ut3_user;
 
diff --git a/test/core/annotations/test_annotation_manager.pkb b/test/core/annotations/test_annotation_manager.pkb
@@ -124,7 +124,11 @@ create or replace package body test_annotation_manager is
     ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE');
     recompile_dummy_package();
     l_start_date := sysdate;
-    dbms_lock.sleep(1);
+    $if dbms_db_version.version >= 18 $then
+      dbms_session.sleep(1);
+    $else
+      dbms_lock.sleep(1);
+    $end
     --Act
     ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE');
     --Assert
diff --git a/test/core/test_ut_executable.pkb b/test/core/test_ut_executable.pkb
@@ -70,7 +70,11 @@ create or replace package body test_ut_executable is
         auto_drop     =>  TRUE,
         comments      =>  'one-time job'
     );
-    dbms_lock.sleep(0.4);
+    $if dbms_db_version.version >= 18 $then
+      dbms_session.sleep(0.4);
+    $else
+      dbms_lock.sleep(0.4);
+    $end
     while l_cnt > 0 loop
       select count(1) into l_cnt
       from dba_scheduler_running_jobs srj

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.4.2503-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.4.2508-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`