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

Skip to content

Improve hasOutput check to a real PL/SQL type-check #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pesse merged 10 commits into from
Jan 16, 2019
Merged

Improve hasOutput check to a real PL/SQL type-check #69

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e567af0
Improve hasOutput check to a real PL/SQL type-check
pesse Jan 11, 2019
082a6de
Add 3.1.3-release to test matrix
pesse Jan 15, 2019
01b9e97
Add some debug information to track down that problem on travis
pesse Jan 15, 2019
ef68fc3
Out-params of EXECUTE IMMEDIATE in 11.2 cannot be BOOLEAN
pesse Jan 15, 2019
5f130fa
We actually *want* an SQL issue to raise an exception
pesse Jan 15, 2019
cf9b502
Poking around...
pesse Jan 15, 2019
85014b8
Do sanitizing on java level
pesse Jan 15, 2019
1a1732a
Add valid_sql_name to sanitization
pesse Jan 15, 2019
41f0a47
Reporter-name should always be a simple SQL name
pesse Jan 16, 2019
55c4d83
We don't need the java sanitization anymore
pesse Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ env:
- UTPLSQL_VERSION="v3.0.4"
- UTPLSQL_VERSION="v3.1.1"
- UTPLSQL_VERSION="v3.1.2"
- UTPLSQL_VERSION="v3.1.3"
- UTPLSQL_VERSION="develop"
UTPLSQL_FILE="utPLSQL"

Expand Down
46 changes: 27 additions & 19 deletions src/main/java/org/utplsql/api/outputBuffer/OutputBufferProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.utplsql.api.outputBuffer;

import oracle.jdbc.OracleConnection;
import oracle.jdbc.OracleTypes;
import org.utplsql.api.Version;
import org.utplsql.api.exception.InvalidVersionException;
import org.utplsql.api.reporter.Reporter;

import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;

public class OutputBufferProvider {
Expand Down Expand Up @@ -42,26 +42,34 @@ public static OutputBuffer getCompatibleOutputBuffer(Version databaseVersion, Re

private static boolean hasOutput( Reporter reporter, OracleConnection oraConn ) throws SQLException {

String sql = "select is_output_reporter " +
" from table(ut_runner.get_reporters_list)" +
" where ? = substr(reporter_object_name, length(reporter_object_name)-?+1)";
try ( PreparedStatement stmt = oraConn.prepareStatement(sql)) {
String reporterName = reporter.getTypeName();
if ( !reporterName.matches("^[a-zA-Z0-9_]+$"))
throw new IllegalArgumentException(String.format("Reporter-Name %s is not valid", reporterName));

String sql =
"declare " +
" l_result int;" +
"begin " +
" begin " +
" execute immediate '" +
" begin " +
" :x := case ' || ? || '() is of (ut_output_reporter_base) when true then 1 else 0 end;" +
Copy link
Copy Markdown
Member

@jgebal jgebal Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep dbms_assert.valid_sql_name call.
It's a build in function that checks object name valid and that it is visible to user.
It is far safer than regex check.
You can still have both

Copy link
Copy Markdown
Member Author

@pesse pesse Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the failed attempts. It's problematic on 11g as it seems.
I'll give it one last try.

" end;'" +
" using out l_result;" +
" end;" +
" ? := l_result;" +
"end;";

try ( CallableStatement stmt = oraConn.prepareCall(sql)) {
stmt.setQueryTimeout(3);
stmt.setString(1, reporter.getTypeName());
stmt.setInt(2, reporter.getTypeName().length());
stmt.setString(1, reporterName);
stmt.registerOutParameter(2, OracleTypes.INTEGER);

try ( ResultSet rs = stmt.executeQuery() ) {
if ( rs.next() ) {
String isReporterResult = rs.getString(1);
stmt.execute();
int result = stmt.getInt(2);

if ( isReporterResult == null )
throw new IllegalArgumentException("The given type " + reporter.getTypeName() + " is not a valid Reporter!");
else
return isReporterResult.equalsIgnoreCase("Y");
}
else
throw new SQLException("Could not check Reporter validity");
}
System.out.println("Output-check for " + reporterName + ": " + result);
return result == 1;
}
}

Expand Down