diff --git a/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java b/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java index d7cc485..269ddb3 100644 --- a/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java +++ b/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java @@ -20,8 +20,9 @@ public class LibSqlConstants { - public static final Pattern CONNECTION_URL_EXAMPLE = Pattern.compile("jdbc:dbeaver:libsql:"); - public static final Pattern CONNECTION_URL_PATTERN = Pattern.compile("jdbc:dbeaver:libsql:(.+)"); + public static final String CONNECTION_URL_EXAMPLES = "jdbc:dbeaver:libsql:, libsql://"; + public static final String CONNECTION_PROTOCOLS_REGEXP = "jdbc:dbeaver:libsql:|libsql://"; + public static final Pattern CONNECTION_URL_PATTERN = Pattern.compile("(" + CONNECTION_PROTOCOLS_REGEXP + ")(.+)"); public static final int DRIVER_VERSION_MAJOR = 1; public static final int DRIVER_VERSION_MINOR = 0; diff --git a/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java b/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java index 6ab84cd..65abd43 100644 --- a/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java +++ b/com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java @@ -46,9 +46,10 @@ public Connection connect(String url, Properties info) throws SQLException { if (!matcher.matches()) { throw new LibSqlException( "Invalid connection URL: " + url + - ".\nExpected URL format: " + LibSqlConstants.CONNECTION_URL_EXAMPLE); + ".\nExpected URL formats: " + LibSqlConstants.CONNECTION_URL_EXAMPLES); } - String targetUrl = matcher.group(1); + String targetUrl = matcher.group(0) + .replaceAll(LibSqlConstants.CONNECTION_PROTOCOLS_REGEXP, "https://"); Map props = new LinkedHashMap<>(); for (Enumeration pne = info.propertyNames(); pne.hasMoreElements(); ) {