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

Skip to content

Feature/connect thick and fallback #93

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 4 commits into from
Jul 20, 2018
Merged

Feature/connect thick and fallback #93

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ebc001
Seems like type-attribute is no more in coverage output
pesse Jul 17, 2018
d3e03f5
Simple approach on doing multiple connection tries
pesse Jul 19, 2018
2084c28
Merge branch 'develop' into feature/connect_thick_and_fallback
pesse Jul 19, 2018
4b7110e
Forgot to merge the latest other features.
pesse Jul 19, 2018
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
Prev Previous commit
Next Next commit
Merge branch 'develop' into feature/connect_thick_and_fallback 
# Conflicts:
#	src/main/java/org/utplsql/cli/ConnectionInfo.java
  • Loading branch information
@pesse
pesse committed Jul 19, 2018
commit 2084c28a966fc2ab6690176661fe122e7f7b927d
27 changes: 5 additions & 22 deletions src/main/java/org/utplsql/cli/ConnectionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
package org.utplsql.cli;

import com.beust.jcommander.IStringConverter;
import com.zaxxer.hikari.HikariDataSource;
import org.utplsql.cli.datasource.DataSourceProvider;

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

public class ConnectionInfo {

private String databaseVersion;
private HikariDataSource pds;
private ConnectionConfig config;
public static final String COMMANDLINE_PARAM_DESCRIPTION = "<user>/<password>@//<host>[:<port>]/<service> OR <user>/<password>@<TNSName> OR <user>/<password>@<host>:<port>:<SID>";
private String connectionInfo;

public ConnectionInfo(String connectionInfo) {
config = new ConnectionConfig(connectionInfo);
pds = new HikariDataSource();
pds.setAutoCommit(false);
}

public void setMaxConnections( int maxConnections ) {
pds.setMaximumPoolSize(maxConnections);
this.connectionInfo = connectionInfo;
}

public Connection getConnection() throws SQLException {
if ( pds.getJdbcUrl() == null ) {
new DataSourceProvider(config).testAndSetJdbcUrl(pds);
}
return pds.getConnection();
public String getConnectionString() {
return connectionInfo;
}

public static class ConnectionStringConverter implements IStringConverter<ConnectionInfo> {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.