Skip to content

Commit df471a3

Browse files
jgebaljgebal
committed
Merge branch 'release/v3.1.8'
2 parents 5511387 + 92091d7 commit df471a3

File tree

135 files changed

+4320
-3086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+4320
-3086
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ tfs_test_results.xml
2828
junit_test_results.xml
2929
test_results.xml
3030
*debug*.xml
31+
cobertura.xml

‎.travis/download.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,19 @@ var agreementUrl = casper.cli.get(2);
1919
var downloadUrl = casper.cli.get(3);
2020
var downloaded = false;
2121

22+
phantom.addCookie({
23+
'name': 'oraclelicense',
24+
'value': '152021',
25+
'domain': 'oracle.com'
26+
});
27+
2228
casper.start();
2329
// TODO: Error handling.
2430

25-
// Accept the license agreement.
26-
casper.thenOpen(agreementUrl, function () {
27-
// this.echo("Accepting License");
28-
this.evaluate(function () {
29-
acceptAgreement(window.self);
30-
});
31-
});
3231

3332
// Try to access the download page, wait for redirection and submit the login form.
3433
casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) {
35-
// this.echo("Injecting Login Info");
34+
//this.echo("Injecting Login Info");
3635
this.evaluate(function (username, password) {
3736
document.getElementById("sso_username").value = username;
3837
document.getElementById("ssopassword").value = password;
@@ -42,8 +41,9 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) {
4241
});
4342

4443
casper.on("resource.received", function (resource) {
44+
//this.echo("Received something: " + resource.url);
4545
if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) {
46-
// this.echo("DownloadUrl:");
46+
//this.echo("DownloadUrl:");
4747
// Print the download url.
4848
this.echo(resource.url);
4949
downloaded = true;

‎.travis/download.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ fi
6262
if [ "$PRODUCT" == "sqlcl" ]; then
6363
agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html"
6464
downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip"
65+
#downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-19.2.1.206.1649.zip"
6566
outputFile=sqlcl-18.3.0.259.2029.zip
6667
downloadFile $agreementUrl $downloadUrl $outputFile
6768
exit 0

‎.travis/install.sh

Lines changed: 60 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ set -ev
55

66
#install core of utplsql
77
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
8+
whenever sqlerror exit failure rollback
89
set feedback off
910
set verify off
1011
@@ -23,6 +24,7 @@ if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then
2324
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
2425
set feedback off
2526
set verify off
27+
whenever sqlerror exit failure rollback
2628
2729
@uninstall_all.sql $UT3_OWNER
2830
whenever sqlerror exit failure rollback
@@ -57,46 +59,73 @@ SQL
5759

5860
fi
5961

60-
#additional privileges to run scripted tests
61-
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
62-
set feedback on
63-
--needed for Mystats script to work
64-
grant select any dictionary to $UT3_OWNER;
65-
--Needed for testing a coverage outside ut3_owner.
66-
grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
67-
SQL
6862

69-
#Create user that will own the tests that are relevant to internal framework
7063
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
7164
set feedback off
72-
@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
73-
--needed for disabling DDL trigger and testint parser without trigger enabled/present
74-
grant alter any trigger to ut3_tester;
65+
whenever sqlerror exit failure rollback
66+
67+
--------------------------------------------------------------------------------
68+
PROMPT Adding back create-trigger privilege to $UT3_OWNER for testing
69+
grant administer database trigger to $UT3_OWNER;
70+
71+
--------------------------------------------------------------------------------
72+
PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code
73+
74+
create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
75+
grant create session, create procedure, create type, create table to $UT3_TESTER;
76+
77+
PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present
78+
79+
grant alter any trigger to $UT3_TESTER;
7580
grant administer database trigger to $UT3_TESTER;
76-
exit
77-
SQL
81+
grant execute on dbms_lock to $UT3_TESTER;
7882
79-
#Create additional UT3$USER# to test for special characters and front end API testing
80-
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
81-
set feedback off
82-
@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
83-
--Grant UT3 framework to min user
84-
@create_user_grants.sql $UT3_OWNER $UT3_USER
85-
exit
86-
SQL
83+
PROMPT Granting $UT3_OWNER code to $UT3_TESTER
8784
88-
#Create additional UT3_TESTER_HELPER that will provide a functions to allow min grant test user setup test
89-
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
90-
set feedback off
91-
@create_utplsql_owner.sql $UT3_TESTER_HELPER $UT3_TESTER_HELPER_PASSWORD $UT3_TABLESPACE
92-
--needed for testing distributed transactions
85+
begin
86+
for i in (
87+
select object_name from all_objects t
88+
where t.object_type in ('PACKAGE','TYPE')
89+
and owner = 'UT3'
90+
and generated = 'N'
91+
and object_name not like 'SYS%')
92+
loop
93+
execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER';
94+
end loop;
95+
end;
96+
/
97+
98+
PROMPT Granting $UT3_OWNER tables to $UT3_TESTER
99+
100+
begin
101+
for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_NAME is NULL)
102+
loop
103+
execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER';
104+
end loop;
105+
end;
106+
/
107+
108+
109+
--------------------------------------------------------------------------------
110+
PROMPT Creating $UT3_USER - minimal privileges user for API testing
111+
112+
create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
113+
grant create session, create procedure, create type, create table to $UT3_USER;
114+
115+
116+
--------------------------------------------------------------------------------
117+
PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests.
118+
119+
create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
120+
grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER;
121+
122+
PROMPT Grants for testing distributed transactions
93123
grant create public database link to $UT3_TESTER_HELPER;
94124
grant drop public database link to $UT3_TESTER_HELPER;
95-
set feedback on
96-
--Needed for testing coverage outside of main UT3 schema.
125+
126+
PROMPT Grants for testing coverage outside of main UT3 schema.
97127
grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym to $UT3_TESTER_HELPER;
98128
grant create job to $UT3_TESTER_HELPER;
99-
--Needed to allow for enable/disable of annotation triggers
100-
grant administer database trigger to $UT3_TESTER_HELPER;
129+
101130
exit
102131
SQL

‎.travis/install_utplsql_release.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ fi
4343

4444
"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
4545
alter session set plsql_optimize_level=0;
46+
alter session set plsql_ccflags = 'SELF_TESTING_INSTALL:TRUE';
47+
4648
@${INSTALL_FILE} ${UT3_RELEASE_VERSION_SCHEMA}
4749
exit
4850
SQL

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.1.7
1+
v3.1.8

‎docs/about/authors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg)
22

33
### utPLSQL v3 Major Contributors
44

‎docs/about/license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg)
22

33
# Version Information
44

‎docs/about/project-details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg)
22

33
# utPLSQL Project Details
44

‎docs/about/support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg)
22

33
# How to get support
44

‎docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg)
22

33
# Introduction to utPLSQL
44

0 commit comments

Comments
 (0)