Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4ec49aa

Browse files
lwasylowlwasylow
committed
Merge branch 'develop' of github.com:utPLSQL/utPLSQL into fix/cursor_error_handling
2 parents 90eb8c9 + 67be0f4 commit 4ec49aa

194 files changed

Lines changed: 6244 additions & 4614 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ env:
2525
- UT3_USER_PASSWORD=ut3
2626
- UT3_TESTER=ut3_tester
2727
- UT3_TESTER_PASSWORD=ut3
28+
- UT3_TESTER_HELPER=ut3_tester_helper
29+
- UT3_TESTER_HELPER_PASSWORD=ut3
2830
- UT3_TABLESPACE=users
2931
# Environment for building a release
3032
- CURRENT_BRANCH=${TRAVIS_BRANCH}
@@ -45,7 +47,7 @@ env:
4547
#utPLSQL released version directory
4648
- UTPLSQL_DIR="utPLSQL_latest_release"
4749
- SELFTESTING_BRANCH=${TRAVIS_BRANCH}
48-
- UTPLSQL_CLI_VERSION="3.1.0"
50+
- UTPLSQL_CLI_VERSION="3.1.6"
4951
# Maven
5052
- MAVEN_HOME=/usr/local/maven
5153
- MAVEN_CFG=$HOME/.m2

‎.travis/install.sh‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ SQL
4747
4848
alter session set plsql_optimize_level=0;
4949
@install.sql $UT3_OWNER
50+
@create_synonyms_and_grants_for_public.sql $UT3_OWNER
5051
SQL
5152

5253
fi
@@ -60,27 +61,32 @@ grant select any dictionary to $UT3_OWNER;
6061
grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
6162
SQL
6263

63-
#Create user that will own the tests
64+
#Create user that will own the tests that are relevant to internal framework
6465
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
6566
set feedback off
6667
@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
67-
68-
--needed for testing distributed transactions
69-
grant create public database link to $UT3_TESTER;
70-
grant drop public database link to $UT3_TESTER;
71-
set feedback on
72-
--Needed for testing coverage outside of main UT3 schema.
73-
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 to $UT3_TESTER;
74-
revoke execute on dbms_crypto from $UT3_TESTER;
75-
grant create job to $UT3_TESTER;
7668
exit
7769
SQL
7870

79-
#Create additional UT3$USER# to test for special characters
71+
#Create additional UT3$USER# to test for special characters and front end API testing
8072
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
8173
set feedback off
8274
@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
83-
--Grant UT3 framework to UT3$USER#
75+
--Grant UT3 framework to min user
8476
@create_user_grants.sql $UT3_OWNER $UT3_USER
8577
exit
8678
SQL
79+
80+
#Create additional UT3_TESTER_HELPER that will provide a functions to allow min grant test user setup test
81+
time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
82+
set feedback off
83+
@create_utplsql_owner.sql $UT3_TESTER_HELPER $UT3_TESTER_HELPER_PASSWORD $UT3_TABLESPACE
84+
--needed for testing distributed transactions
85+
grant create public database link to $UT3_TESTER_HELPER;
86+
grant drop public database link to $UT3_TESTER_HELPER;
87+
set feedback on
88+
--Needed for testing coverage outside of main UT3 schema.
89+
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;
90+
grant create job to $UT3_TESTER_HELPER;
91+
exit
92+
SQL

‎.travis/push_release_version.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" ==
99
git add sonar-project.properties
1010
git add VERSION
1111
git add source/*
12+
git add docs/*
1213
git commit -m 'Updated project version after build [skip ci]'
1314
echo "Pushing to origin"
1415
git push --quiet origin HEAD:${CURRENT_BRANCH}

‎VERSION‎

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

‎development/cleanup.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ end;
2121
drop user ${UT3_OWNER} cascade;
2222
drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade;
2323
drop user ${UT3_TESTER} cascade;
24+
drop user ${UT3_TESTER_HELPER} cascade;
2425
drop user ${UT3_USER} cascade;
2526
2627
begin
2728
for i in (
28-
select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym from dba_synonyms a
29+
select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym, owner||'.'||synonym_name syn from dba_synonyms a
2930
where not exists (select 1 from dba_objects b where (a.table_name=b.object_name and a.table_owner=b.owner or b.owner='SYS' and a.table_owner=b.object_name) )
3031
and a.table_owner not in ('SYS','SYSTEM')
3132
) loop
32-
dbms_output.put_line(i.drop_orphaned_synonym);
3333
execute immediate i.drop_orphaned_synonym;
34+
dbms_output.put_line('synonym '||i.syn||' dropped');
3435
end loop;
3536
end;
3637
/

‎development/releasing.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ To create a release:
1010
- merge the release branch to master and wait for master build to complete successfully
1111
- create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
1212
To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state).
13-
Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
13+
Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
14+
- After release was successfully built, merge master branch back into develop branch
15+
- After develop branch was built, update version number in `VERSION` file to represent next planned release version.
16+
- Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly.
1417

1518
The following will happen:
1619
- build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name

‎development/template.env.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export SQLCLI=sql # For sqlcl client
44
#export SQLCLI=sqlplus # For sqlplus client
55
export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string
66
export ORACLE_PWD=oracle # Adjust your local SYS password
7-
export UTPLSQL_CLI_VERSION="3.1.0"
7+
export UTPLSQL_CLI_VERSION="3.1.6"
88
export SELFTESTING_BRANCH=develop
99

1010
export UTPLSQL_DIR="utPLSQL_latest_release"
@@ -13,7 +13,8 @@ export UT3_OWNER_PASSWORD=ut3
1313
export UT3_RELEASE_VERSION_SCHEMA=ut3_latest_release
1414
export UT3_TESTER=ut3_tester
1515
export UT3_TESTER_PASSWORD=ut3
16+
export UT3_TESTER_HELPER=ut3_tester_helper
17+
export UT3_TESTER_HELPER_PASSWORD=ut3
1618
export UT3_TABLESPACE=users
1719
export UT3_USER="UT3\$USER#"
1820
export UT3_USER_PASSWORD=ut3
19-

‎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.4.2223--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-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.4.2223--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-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.4.2223--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg)
22

33
# utPLSQL Project Details
44

0 commit comments

Comments
 (0)