Handle BI Publisher wrapped XML results

.github/workflows/maven.yml

@@ -31,7 +31,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Archive artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: OFHSqlDriver
         path: |

src/main/java/com/oraclefusionhub/jdbc/OFHConnection.java

@@ -16,10 +16,12 @@ public class OFHConnection implements java.sql.Connection {
 	private String fullURL;
 	private String basicAuth;
 	private Boolean closed;
+	private final boolean debugEnabled;
 
 	public OFHConnection(String url, Properties properties) throws SQLException {
 
 		this.closed = false;
+		this.debugEnabled = isDebugEnabled(properties);
 
 		try {
 			String user;
@@ -71,12 +73,12 @@ public Statement createStatement() throws SQLException {
 		conn.setRequestProperty("Content-Type", "application/soap+xml");
 		conn.setRequestProperty("SOAPAction", "runReport");
 		conn.setRequestProperty("Authorization", this.basicAuth);
-		return new OFHStatement(conn, reportPath);
+		return new OFHStatement(conn, reportPath, debugEnabled);
 	}
 
 	@Override
 	public PreparedStatement prepareStatement(String s) throws SQLException {
-		System.out.println("PrepareStatement: " + s);
+		debug("PrepareStatement: " + s);
 		return null;
 	}
 
@@ -1063,7 +1065,7 @@ public void clearWarnings() throws SQLException {
 
 	@Override
 	public Statement createStatement(int i, int i1) throws SQLException {
-		return null;
+		return createStatement();
 	}
 
 	@Override
@@ -1117,7 +1119,7 @@ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
 
 	@Override
 	public Statement createStatement(int i, int i1, int i2) throws SQLException {
-		return null;
+		return createStatement();
 	}
 
 	@Override
@@ -1167,10 +1169,25 @@ public SQLXML createSQLXML() throws SQLException {
 
 	@Override
 	public boolean isValid(int i) throws SQLException {
-		System.out.println("isvalid: " + i);
+		debug("isvalid: " + i);
 		return true;
 	}
 
+	private boolean isDebugEnabled(Properties properties) {
+		Object debugProperty = properties.get("debug");
+		if (debugProperty != null) {
+			return Boolean.parseBoolean(String.valueOf(debugProperty));
+		}
+
+		return Boolean.parseBoolean(System.getProperty("ofh.debug", "false"));
+	}
+
+	private void debug(String message) {
+		if (debugEnabled) {
+			System.out.println(message);
+		}
+	}
+
 	@Override
 	public void setClientInfo(String s, String s1) throws SQLClientInfoException {
 

src/main/java/com/oraclefusionhub/jdbc/OFHDriver.java

@@ -29,7 +29,6 @@ public OFHDriver() {}
 
 	@Override
 	public Connection connect(String url, Properties properties) throws SQLException {
-		System.out.println("Props: " + properties);
 		url = getURL(url);
 
 		return new OFHConnection(url, properties);
@@ -49,8 +48,12 @@ private String getURL(String fullJDBCPath) {
 	@Override
 	public DriverPropertyInfo[] getPropertyInfo(String s, Properties properties) throws SQLException {
 		DriverPropertyInfo reportPathProp = new DriverPropertyInfo("reportPath", "/Custom/OracleCloudSQLQuery/SQLQuery.xdo");
-		DriverPropertyInfo[] dpi = new DriverPropertyInfo[1];
+		DriverPropertyInfo debugProp = new DriverPropertyInfo("debug", "false");
+		debugProp.description = "Enable verbose driver debug logging";
+		debugProp.choices = new String[] { "true", "false" };
+		DriverPropertyInfo[] dpi = new DriverPropertyInfo[2];
 		dpi[0] = reportPathProp;
+		dpi[1] = debugProp;
 
 		return  dpi;
 	}