# HG changeset patch # User Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> # Date 1702379471 -3600 # Node ID a71afa48f269ec3e156267737e3e063fdcf118e9 # Parent a090371d59c8421a5637ffb39ecde936f29cce76 Use new MapiSocket.connect() method In CopyIntoSTDIN test diff --git a/tests/JDBC_API_Tester.java b/tests/JDBC_API_Tester.java --- a/tests/JDBC_API_Tester.java +++ b/tests/JDBC_API_Tester.java @@ -12,13 +12,11 @@ import java.io.StringReader; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.charset.StandardCharsets; +import java.sql.Date; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Iterator; -import java.util.List; -import java.util.TimeZone; - +import java.util.*; + +import org.monetdb.jdbc.MonetConnection; import org.monetdb.jdbc.types.INET; import org.monetdb.jdbc.types.URL; @@ -6728,20 +6726,11 @@ final public class JDBC_API_Tester { org.monetdb.mcl.net.MapiSocket server = new org.monetdb.mcl.net.MapiSocket(); try { - server.setLanguage("sql"); - - // extract from conn_URL the used connection properties - String host = extractFromJDBCURL(conn_URL, "host"); - int port = Integer.parseInt(extractFromJDBCURL(conn_URL, "port")); - String login = extractFromJDBCURL(conn_URL, "user"); - String passw = extractFromJDBCURL(conn_URL, "password"); - String database = extractFromJDBCURL(conn_URL, "database"); - // sb.append("conn_URL: " + conn_URL + "\n"); - // sb.append("host: " + host + " port: " + port + " dbname: " + database + " login: " + login + " passwd: " + passw + "\n"); + MonetConnection mcon = (MonetConnection) con; + Properties props = mcon.getConnectionProperties(); sb.append("Before connecting to MonetDB server via MapiSocket\n"); - server.setDatabase(database); - List<String> warning = server.connect(host, port, login, passw); + List<String> warning = server.connect("jdbc:monetdb:", props); if (warning != null) { for (Iterator<String> it = warning.iterator(); it.hasNext(); ) { sb.append("Warning: ").append(it.next().toString()).append("\n");