Changeset: ae8df056bb26 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae8df056bb26
Modified Files:
clients/mapiclient/mclient.c
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
Branch: default
Log Message:
clients: drop support for lang=sql+mf
It's no longer necessary to support anything that starts with "sql",
since multiplex-funnels are now hidden inside monetdbd as pseudo
database with a name.
diffs (33 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2579,7 +2579,7 @@ main(int argc, char **argv)
q = NULL;
} else if (strcmp(buf, "language") == 0) {
language = strdup(q); /* leak */
- if (strstr(language, "sql") == language) {
+ if (strcmp(language, "sql") == 0) {
mode = SQL;
q = NULL;
} else if (strcmp(language, "mal") == 0) {
@@ -2659,7 +2659,7 @@ main(int argc, char **argv)
/* accept unambiguous prefix of language */
if (strcmp(optarg, "sql") == 0 ||
strcmp(optarg, "sq") == 0 || strcmp(optarg, "s") ==
0 ||
- strstr(optarg, "sql") == optarg) {
+ strcmp(optarg, "sql") == optarg) {
language = optarg;
mode = SQL;
} else if (strcmp(optarg, "mal") == 0 ||
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -224,7 +224,7 @@ public class MonetConnection implements
// we seem to have managed to log in, let's store the
// language used
- if (language.startsWith("sql")) {
+ if ("sql".equals(language)) {
lang = LANG_SQL;
} else if ("mal".equals(language)) {
lang = LANG_MAL;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
