Mercurial > hg > monetdb-java

annotate src/main/java/org/monetdb/mcl/net/Parameter.java @ 931:df18aa5c8a61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test for MonetDriver.getPropertyInfo(url, props). The implementation is moved to Parameter.java which contains the list of connection parameters. It currently only returns the mandatory connection parameters.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 24 Oct 2024 19:10:06 +0200 (5 months ago)
parents 2ec67179aa32
children d416e9b6b3d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
864
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
1 /*
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
2 * SPDX-License-Identifier: MPL-2.0
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
3 *
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
4 * This Source Code Form is subject to the terms of the Mozilla Public
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
5 * License, v. 2.0. If a copy of the MPL was not distributed with this
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
7 *
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
8 * Copyright 2024 MonetDB Foundation;
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
9 * Copyright August 2008 - 2023 MonetDB B.V.;
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
10 * Copyright 1997 - July 2008 CWI.
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
11 */
b80758ef25db Add missing license headers
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 847
diff changeset
12
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
13 package org.monetdb.mcl.net;
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
14
931
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
15 import java.sql.DriverPropertyInfo;
791
4de810c22328 Refactor
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 789
diff changeset
16 import java.util.Calendar;
931
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
17 import java.util.Properties;
791
4de810c22328 Refactor
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 789
diff changeset
18
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
19 /**
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
20 * Enumerates things that can be configured on a connection to MonetDB.
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
21 */
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
22 public enum Parameter {
931
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
23 // String name, ParameterType type, Object defaultValue, String description, boolean isCore
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
24 TLS("tls", ParameterType.Bool, false, "secure the connection using TLS", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
25 HOST("host", ParameterType.Str, "", "IP number, domain name or one of the special values `localhost` and `localhost.`", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
26 PORT("port", ParameterType.Int, -1, "Port to connect to, 1..65535 or -1 for 'not set'", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
27 DATABASE("database", ParameterType.Str, "", "name of database to connect to", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
28 TABLESCHEMA("tableschema", ParameterType.Str, "", "only used for REMOTE TABLE, otherwise unused", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
29 TABLE("table", ParameterType.Str, "", "only used for REMOTE TABLE, otherwise unused", true),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
30 SOCK("sock", ParameterType.Path, "", "path to Unix domain socket to connect to", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
31 SOCKDIR("sockdir", ParameterType.Path, "/tmp", "Directory for implicit Unix domain sockets (.s.monetdb.PORT)", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
32 CERT("cert", ParameterType.Path, "", "path to TLS certificate to authenticate server with", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
33 CERTHASH("certhash", ParameterType.Str, "", "hash of server TLS certificate must start with these hex digits; overrides cert", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
34 CLIENTKEY("clientkey", ParameterType.Path, "", "path to TLS key (+certs) to authenticate with as client", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
35 CLIENTCERT("clientcert", ParameterType.Path, "", "path to TLS certs for 'clientkey', if not included there", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
36 USER("user", ParameterType.Str, "", "user name to authenticate as", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
37 PASSWORD("password", ParameterType.Str, "", "password to authenticate with", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
38 LANGUAGE("language", ParameterType.Str, "sql", "for example, \"sql\", \"mal\", \"msql\", \"profiler\"", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
39 AUTOCOMMIT("autocommit", ParameterType.Bool, true, "initial value of autocommit", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
40 SCHEMA("schema", ParameterType.Str, "", "initial schema", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
41 TIMEZONE("timezone", ParameterType.Int, null, "client time zone as minutes east of UTC", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
42 BINARY("binary", ParameterType.Str, "on", "whether to use binary result set format (number or bool)", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
43 REPLYSIZE("replysize", ParameterType.Int, 250, "rows beyond this limit are retrieved on demand, <1 means unlimited", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
44 FETCHSIZE("fetchsize", ParameterType.Int, null, "alias for replysize, specific to jdbc", false),
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
45 HASH("hash", ParameterType.Str, "", "specific to jdbc", false),
868
a227deba0e26 Improve the code, layout, order of variables and setting, and text.
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 867
diff changeset
46 DEBUG("debug", ParameterType.Bool, false, "enable tracing of socket communication for debugging", false),
a227deba0e26 Improve the code, layout, order of variables and setting, and text.
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 867
diff changeset
47 LOGFILE("logfile", ParameterType.Str, "", "when debug is enabled its output will be written to this logfile", false),
a227deba0e26 Improve the code, layout, order of variables and setting, and text.
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 867
diff changeset
48 SO_TIMEOUT("so_timeout", ParameterType.Int, 0, "abort if network I/O does not complete in this many milliseconds, 0 means no timeout", false),
916
2ec67179aa32 correct some Parameter descriptions
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 903
diff changeset
49 CLOB_AS_VARCHAR("treat_clob_as_varchar", ParameterType.Bool, true, "map CLOB/TEXT data to type VARCHAR instead of type CLOB", false),
2ec67179aa32 correct some Parameter descriptions
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 903
diff changeset
50 BLOB_AS_BINARY("treat_blob_as_binary", ParameterType.Bool, true, "map BLOB data to type BINARY instead of type BLOB", false),
903
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
51
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
52 CLIENT_INFO("client_info", ParameterType.Bool, true, "whether to send ClientInfo when connecting", false),
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
53 CLIENT_APPLICATION("client_application", ParameterType.Str, "", "application name to send in ClientInfo", false),
916
2ec67179aa32 correct some Parameter descriptions
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 903
diff changeset
54 CLIENT_REMARK("client_remark", ParameterType.Str, "", "any client remark to send in ClientInfo", false),
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
55 ;
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
56
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
57 public final String name;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
58 public final ParameterType type;
868
a227deba0e26 Improve the code, layout, order of variables and setting, and text.
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 867
diff changeset
59 private final Object defaultValue;
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
60 public final String description;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
61 public final boolean isCore;
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
62
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
63 Parameter(String name, ParameterType type, Object defaultValue, String description, boolean isCore) {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
64 this.name = name;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
65 this.type = type;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
66 this.defaultValue = defaultValue;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
67 this.description = description;
868
a227deba0e26 Improve the code, layout, order of variables and setting, and text.
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 867
diff changeset
68 this.isCore = isCore;
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
69 }
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
70
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
71 public static Parameter forName(String name) {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
72 switch (name) {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
73 case "tls":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
74 return TLS;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
75 case "host":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
76 return HOST;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
77 case "port":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
78 return PORT;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
79 case "database":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
80 return DATABASE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
81 case "tableschema":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
82 return TABLESCHEMA;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
83 case "table":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
84 return TABLE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
85 case "sock":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
86 return SOCK;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
87 case "sockdir":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
88 return SOCKDIR;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
89 case "cert":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
90 return CERT;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
91 case "certhash":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
92 return CERTHASH;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
93 case "clientkey":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
94 return CLIENTKEY;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
95 case "clientcert":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
96 return CLIENTCERT;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
97 case "user":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
98 return USER;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
99 case "password":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
100 return PASSWORD;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
101 case "language":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
102 return LANGUAGE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
103 case "autocommit":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
104 return AUTOCOMMIT;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
105 case "schema":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
106 return SCHEMA;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
107 case "timezone":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
108 return TIMEZONE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
109 case "binary":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
110 return BINARY;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
111 case "replysize":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
112 return REPLYSIZE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
113 case "fetchsize":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
114 return FETCHSIZE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
115 case "hash":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
116 return HASH;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
117 case "debug":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
118 return DEBUG;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
119 case "logfile":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
120 return LOGFILE;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
121 case "so_timeout":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
122 return SO_TIMEOUT;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
123 case "treat_clob_as_varchar":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
124 return CLOB_AS_VARCHAR;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
125 case "treat_blob_as_binary":
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
126 return BLOB_AS_BINARY;
903
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
127 case "client_info":
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
128 return CLIENT_INFO;
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
129 case "client_application":
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
130 return CLIENT_APPLICATION;
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
131 case "client_remark":
778959b2e0a4 Send ClientInfo on startup
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 878
diff changeset
132 return CLIENT_REMARK;
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
133 default:
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
134 return null;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
135 }
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
136 }
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
137
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
138 /**
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
139 * Determine if a given setting can safely be ignored.
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
140 * The ground rule is that if we encounter an unknown setting
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
141 * without an underscore in the name, it is an error. If it has
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
142 * an underscore in its name, it can be ignored.
847
4d80fd66541d formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 834
diff changeset
143 *
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
144 * @param name the name of the setting to check
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
145 * @return true if it can safely be ignored
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
146 */
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
147 public static boolean isIgnored(String name) {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
148 if (Parameter.forName(name) != null)
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
149 return false;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
150 return name.contains("_");
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
151 }
791
4de810c22328 Refactor
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 789
diff changeset
152
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
153 /**
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
154 * Return a default value for the given setting, as an Object of the appropriate type.
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
155 * Note that the value returned for TIMEZONE may change if the system time zone
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
156 * is changed or if Daylight Saving Time starts or ends.
847
4d80fd66541d formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 834
diff changeset
157 *
867
5a59910e8f87 Resolve some javadoc errors and warnings
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 864
diff changeset
158 * @return default value for the given setting, as an Object of the appropriate type
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
159 */
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
160 public Object getDefault() {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
161 switch (this) {
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
162 case TIMEZONE:
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
163 Calendar cal = Calendar.getInstance();
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
164 int offsetMillis = cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET);
878
dc33533e6468 Target timezone is in minutes, setTimeZone is in seconds
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 876
diff changeset
165 int offsetMinutes = offsetMillis / 60000;
dc33533e6468 Target timezone is in minutes, setTimeZone is in seconds
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 876
diff changeset
166 return offsetMinutes;
834
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
167 default:
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
168 return defaultValue;
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
169 }
5aa19bbed0d6 Comments and formatting
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 806
diff changeset
170 }
876
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
171
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
172 /**
931
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
173 * Determine if this Parameter is only relevant when TlS is enabled.
876
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
174 *
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
175 * Such parameters need not be shown to the user unless the URL starts with <code>monetdbs://</code>.
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
176 *
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
177 * @return true if this Parameter is only relevant when TLS is enabled
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
178 */
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
179 public boolean isTlsOnly() {
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
180 switch (this) {
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
181 case CERT:
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
182 case CERTHASH:
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
183 case CLIENTCERT:
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
184 case CLIENTKEY:
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
185 return true;
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
186 default:
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
187 return false;
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
188 }
e2e7f0d72c95 Add Parameter#isTlsOnly method
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents: 868
diff changeset
189 }
931
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
190
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
191 /**
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
192 * Gets information about the possible properties for this driver.
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
193 *
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
194 * The getPropertyInfo method is intended to allow a generic GUI tool to
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
195 * discover what properties it should prompt a human for in order to get
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
196 * enough information to connect to a database. Note that depending on the
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
197 * values the human has supplied so far, additional values may become
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
198 * necessary, so it may be necessary to iterate through several calls to the
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
199 * getPropertyInfo method.
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
200 *
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
201 * Note: This method is called from jdbc.MonetDriver.getPropertyInfo()
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
202 *
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
203 * @param info a proposed list of tag/value pairs that will be sent on
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
204 * connect open
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
205 * @return an array of DriverPropertyInfo objects describing possible
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
206 * properties. This array may be an empty array if no properties
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
207 * are required.
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
208 */
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
209 public static DriverPropertyInfo[] getPropertyInfo(final Properties info, boolean requires_tls) {
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
210 final String tls = info != null ? info.getProperty("tls") : null;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
211 final boolean tls_enabled = requires_tls || (tls != null && tls.equals("true"));
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
212 final int dpi_size = (tls_enabled ? 4 : 2);
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
213 final DriverPropertyInfo[] dpi = new DriverPropertyInfo[dpi_size];
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
214 DriverPropertyInfo prop = null;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
215
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
216 // minimal required connection settings are "user" and "password"
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
217 prop = new DriverPropertyInfo("user", info != null ? info.getProperty("user") : null);
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
218 prop.required = true;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
219 prop.description = "User loginname to use when authenticating on the database server";
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
220 dpi[0] = prop;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
221
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
222 prop = new DriverPropertyInfo("password", info != null ? info.getProperty("password") : null);
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
223 prop.required = true;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
224 prop.description = "Password to use when authenticating on the database server";
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
225 dpi[1] = prop;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
226
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
227 if (tls_enabled && dpi_size > 2) {
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
228 // when tls is enabled or required also "tls" and "cert" become required
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
229 final String[] boolean_choices = new String[] { "true", "false" };
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
230
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
231 prop = new DriverPropertyInfo("tls", tls);
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
232 prop.required = true;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
233 prop.description = "secure the connection using TLS";
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
234 prop.choices = boolean_choices;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
235 dpi[2] = prop;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
236
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
237 prop = new DriverPropertyInfo("cert", info != null ? info.getProperty("cert") : null);
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
238 prop.required = true;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
239 prop.description = "path to TLS certificate to authenticate server with";
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
240 dpi[3] = prop;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
241 }
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
242
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
243 return dpi;
df18aa5c8a61 Add test for MonetDriver.getPropertyInfo(url, props).
Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
parents: 916
diff changeset
244 }
789
88c5b678e974 URL parser passes the tests.
Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
parents:
diff changeset
245 }