Changeset: 672e992cc198 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/672e992cc198
Modified Files:
sql/server/sql_mvc.c
sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.test
sql/test/mergetables/Tests/merge-tables-limitations.test
sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test
sql/test/rel-optimizers/Tests/local-replica.test
sql/test/rel-optimizers/Tests/remote-replica-plan.test
sql/test/rel-optimizers/Tests/replicas-base.test
sql/test/rel-optimizers/Tests/replicas-join-plan.test
sql/test/sql_dump/Tests/dump.test
sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb/Tests/dump-nogeom.stable.out
sql/test/testdb/Tests/dump.stable.out
Branch: odbc_loader
Log Message:
Normalize URL when creating a REMOTE TABLE
This is also going to require upgrade code.
In the tests, references to node2 are created with the old url syntax,
node3 with the new.
Note that the old syntax mapi:monetdb://localhost:50002/ normalizes to
monetdb://localhost.:50002/
with a period after the localhost. This is because in mapi: urls,
'localhost' forces a connection over TCP while in monetdb: urls
'localhost' also allows Unix Domain sockets.
diffs (288 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -30,6 +30,7 @@
#include "rel_unnest.h"
#include "rel_optimizer.h"
#include "rel_statistics.h"
+#include "rel_remote.h"
#include "mal_authorize.h"
#include "mal_profiler.h"
@@ -1301,13 +1302,26 @@ mvc_create_remote(sql_table **t, mvc *m,
{
int res = LOG_OK;
- TRC_DEBUG(SQL_TRANS, "Create remote: %s %s %s\n", s->base.name, name,
loc);
+ // verify and normalize url
+ msettings *mp = sa_msettings_create(m->sa);
+ if (mp == NULL) {
+ (void) sql_error(m, 02, SQLSTATE(HY013) MAL_MALLOC_FAIL);
+ return LOG_ERR;
+ }
+ msettings_error err = msettings_parse_url(mp, loc);
+ if (err != NULL) {
+ (void) sql_error(m, 02, SQLSTATE(42000) "invalid remote table
url: %s", err);
+ return LOG_ERR;
+ }
+ char *url = sa_msettings_to_string(mp, m->sa, strlen(loc));
+
+ TRC_DEBUG(SQL_TRANS, "Create remote: %s %s %s\n", s->base.name, name,
url);
if (persistence == SQL_DECLARED_TABLE) {
*t = create_sql_table(m->store, m->sa, name, tt_remote, 0,
persistence, 0, 0);
(*t)->s = s;
- (*t)->query = sa_strdup(m->sa, loc);
+ (*t)->query = url;
} else {
- res = sql_trans_create_table(t, m->session->tr, s, name, loc,
tt_remote, 0, SQL_REMOTE, 0, 0, 0);
+ res = sql_trans_create_table(t, m->session->tr, s, name, url,
tt_remote, 0, SQL_REMOTE, 0, 0, 0);
}
return res;
}
diff --git
a/sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.test
b/sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.test
---
a/sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.test
+++
b/sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.test
@@ -45,7 +45,7 @@ query TTTT rowsort
select "name", "query", "type", "remark" from describe_table('sys', 'rt1')
----
rt1
-mapi:monetdb://localhost:50000/test
+monetdb://localhost./test
REMOTE TABLE
NULL
diff --git a/sql/test/mergetables/Tests/merge-tables-limitations.test
b/sql/test/mergetables/Tests/merge-tables-limitations.test
--- a/sql/test/mergetables/Tests/merge-tables-limitations.test
+++ b/sql/test/mergetables/Tests/merge-tables-limitations.test
@@ -172,7 +172,7 @@ select * from tst.my_tables where name =
----
tst
rmtbl
-mapi:monetdb://localhost:50000/demo
+monetdb://localhost./demo
5
0
0
diff --git a/sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test
b/sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test
--- a/sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test
+++ b/sql/test/rel-optimizers/Tests/join-merge-remote-replica-plan.test
@@ -8,7 +8,7 @@ statement ok
create remote table foo_p2 (n int, m text) on
'mapi:monetdb://localhost:50002/node2'
statement ok
-create remote table foo_p3 (n int, m text) on
'mapi:monetdb://localhost:50003/node3'
+create remote table foo_p3 (n int, m text) on 'monetdb://localhost:50003/node3'
statement ok
create merge table foo_merge (n int, m text)
@@ -34,7 +34,7 @@ statement ok
create remote table members_n2 (n int, m text) on
'mapi:monetdb://localhost:50002/node2'
statement ok
-create remote table members_n3 (n int, m text) on
'mapi:monetdb://localhost:50003/node3'
+create remote table members_n3 (n int, m text) on
'monetdb://localhost:50003/node3'
statement ok
create replica table members_rpl (n int, m text)
@@ -76,7 +76,7 @@ munion (
| | | | REMOTE("sys"."foo_p2") [ "foo_p2"."n" as "foo_merge"."n", "foo_p2"."m"
as "foo_merge"."m" ],
| | | | REMOTE("sys"."members_n2") [ "members_n2"."n" as "members_rpl"."n",
"members_n2"."m" as "members_rpl"."m", "members_n2"."%TID%" NOT NULL UNIQUE as
"members_rpl"."%TID%" ]
| | | ) [ ]
-| | ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m"
] REMOTE mapi:monetdb://localhost:50002/node2
+| | ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m"
] REMOTE monetdb://localhost.:50002/node2
| ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m" ],
| table (
| | project (
@@ -84,7 +84,7 @@ munion (
| | | | REMOTE("sys"."foo_p3") [ "foo_p3"."n" as "foo_merge"."n", "foo_p3"."m"
as "foo_merge"."m" ],
| | | | REMOTE("sys"."members_n3") [ "members_n3"."n" as "members_rpl"."n",
"members_n3"."m" as "members_rpl"."m", "members_n3"."%TID%" NOT NULL UNIQUE as
"members_rpl"."%TID%" ]
| | | ) [ ]
-| | ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m"
] REMOTE mapi:monetdb://localhost:50003/node3
+| | ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m"
] REMOTE monetdb://localhost:50003/node3
| ) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m" ]
) [ "foo_merge"."n", "foo_merge"."m", "members_rpl"."n", "members_rpl"."m" ]
diff --git a/sql/test/rel-optimizers/Tests/local-replica.test
b/sql/test/rel-optimizers/Tests/local-replica.test
--- a/sql/test/rel-optimizers/Tests/local-replica.test
+++ b/sql/test/rel-optimizers/Tests/local-replica.test
@@ -102,7 +102,7 @@ project (
| crossproduct (
| | table("sys"."foo_local") [ "foo_local"."n" NOT NULL as "foo_rpl_loc"."n",
"foo_local"."m" NOT NULL as "foo_rpl_loc"."m", "foo_local"."%TID%" NOT NULL
UNIQUE as "foo_rpl_loc"."%TID%" ],
| | table (
-| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ] REMOTE
mapi:monetdb://localhost:50002/node2
+| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ] REMOTE
monetdb://localhost.:50002/node2
| | ) [ "buz_rmt"."l" ]
| ) [ ]
) [ "foo_rpl_loc"."n" NOT NULL, "foo_rpl_loc"."m" NOT NULL, "buz_rmt"."l" ]
diff --git a/sql/test/rel-optimizers/Tests/remote-replica-plan.test
b/sql/test/rel-optimizers/Tests/remote-replica-plan.test
--- a/sql/test/rel-optimizers/Tests/remote-replica-plan.test
+++ b/sql/test/rel-optimizers/Tests/remote-replica-plan.test
@@ -34,7 +34,7 @@ plan select * from foo_rpl_rmt
table (
| project (
| | REMOTE("sys"."foo_r2") [ "foo_r2"."n" as "foo_rpl_rmt"."n", "foo_r2"."m"
as "foo_rpl_rmt"."m", "foo_r2"."%TID%" NOT NULL UNIQUE as "foo_rpl_rmt"."%TID%"
]
-| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m" ] REMOTE
mapi:monetdb://localhost:50002/node2
+| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m" ] REMOTE
monetdb://localhost.:50002/node2
) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m" ]
query T nosort
@@ -46,7 +46,7 @@ table (
| | | REMOTE("sys"."foo_r2") [ "foo_r2"."n" as "foo_rpl_rmt"."n", "foo_r2"."m"
as "foo_rpl_rmt"."m", "foo_r2"."%TID%" NOT NULL UNIQUE as "foo_rpl_rmt"."%TID%"
],
| | | REMOTE("sys"."bar_r2") [ "bar_r2"."n" as "bar_rpl_rmt"."n", "bar_r2"."m"
as "bar_rpl_rmt"."m", "bar_r2"."%TID%" NOT NULL UNIQUE as "bar_rpl_rmt"."%TID%"
]
| | ) [ ]
-| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "bar_rpl_rmt"."n",
"bar_rpl_rmt"."m" ] REMOTE mapi:monetdb://localhost:50002/node2
+| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "bar_rpl_rmt"."n",
"bar_rpl_rmt"."m" ] REMOTE monetdb://localhost.:50002/node2
) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "bar_rpl_rmt"."n", "bar_rpl_rmt"."m"
]
query T nosort
@@ -55,10 +55,10 @@ plan select * from foo_rpl_rmt_node2, ba
project (
| crossproduct (
| | table (
-| | | REMOTE("sys"."foo_r2") [ "foo_r2"."n" as "foo_rpl_rmt_node2"."n",
"foo_r2"."m" as "foo_rpl_rmt_node2"."m", "foo_r2"."%TID%" NOT NULL UNIQUE as
"foo_rpl_rmt_node2"."%TID%" ] REMOTE mapi:monetdb://localhost:50002/node2
+| | | REMOTE("sys"."foo_r2") [ "foo_r2"."n" as "foo_rpl_rmt_node2"."n",
"foo_r2"."m" as "foo_rpl_rmt_node2"."m", "foo_r2"."%TID%" NOT NULL UNIQUE as
"foo_rpl_rmt_node2"."%TID%" ] REMOTE monetdb://localhost.:50002/node2
| | ) [ "foo_rpl_rmt_node2"."n", "foo_rpl_rmt_node2"."m",
"foo_rpl_rmt_node2"."%TID%" NOT NULL UNIQUE ],
| | table (
-| | | REMOTE("sys"."bar_r3") [ "bar_r3"."n" as "bar_rpl_rmt_node3"."n",
"bar_r3"."m" as "bar_rpl_rmt_node3"."m", "bar_r3"."%TID%" NOT NULL UNIQUE as
"bar_rpl_rmt_node3"."%TID%" ] REMOTE mapi:monetdb://localhost:50003/node3
+| | | REMOTE("sys"."bar_r3") [ "bar_r3"."n" as "bar_rpl_rmt_node3"."n",
"bar_r3"."m" as "bar_rpl_rmt_node3"."m", "bar_r3"."%TID%" NOT NULL UNIQUE as
"bar_rpl_rmt_node3"."%TID%" ] REMOTE monetdb://localhost:50003/node3
| | ) [ "bar_rpl_rmt_node3"."n", "bar_rpl_rmt_node3"."m",
"bar_rpl_rmt_node3"."%TID%" NOT NULL UNIQUE ]
| ) [ ]
) [ "foo_rpl_rmt_node2"."n", "foo_rpl_rmt_node2"."m", "bar_rpl_rmt_node3"."n",
"bar_rpl_rmt_node3"."m" ]
@@ -72,7 +72,7 @@ table (
| | | REMOTE("sys"."foo_r2") [ "foo_r2"."n" as "foo_rpl_rmt"."n", "foo_r2"."m"
as "foo_rpl_rmt"."m", "foo_r2"."%TID%" NOT NULL UNIQUE as "foo_rpl_rmt"."%TID%"
],
| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ]
| | ) [ ]
-| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "buz_rmt"."l" ] REMOTE
mapi:monetdb://localhost:50002/node2
+| ) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "buz_rmt"."l" ] REMOTE
monetdb://localhost.:50002/node2
) [ "foo_rpl_rmt"."n", "foo_rpl_rmt"."m", "buz_rmt"."l" ]
query T nosort
@@ -81,10 +81,10 @@ plan select * from bar_rpl_rmt_node3, bu
project (
| crossproduct (
| | table (
-| | | REMOTE("sys"."bar_r3") [ "bar_r3"."n" as "bar_rpl_rmt_node3"."n",
"bar_r3"."m" as "bar_rpl_rmt_node3"."m", "bar_r3"."%TID%" NOT NULL UNIQUE as
"bar_rpl_rmt_node3"."%TID%" ] REMOTE mapi:monetdb://localhost:50003/node3
+| | | REMOTE("sys"."bar_r3") [ "bar_r3"."n" as "bar_rpl_rmt_node3"."n",
"bar_r3"."m" as "bar_rpl_rmt_node3"."m", "bar_r3"."%TID%" NOT NULL UNIQUE as
"bar_rpl_rmt_node3"."%TID%" ] REMOTE monetdb://localhost:50003/node3
| | ) [ "bar_rpl_rmt_node3"."n", "bar_rpl_rmt_node3"."m",
"bar_rpl_rmt_node3"."%TID%" NOT NULL UNIQUE ],
| | table (
-| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ] REMOTE
mapi:monetdb://localhost:50002/node2
+| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ] REMOTE
monetdb://localhost.:50002/node2
| | ) [ "buz_rmt"."l" ]
| ) [ ]
) [ "bar_rpl_rmt_node3"."n", "bar_rpl_rmt_node3"."m", "buz_rmt"."l" ]
diff --git a/sql/test/rel-optimizers/Tests/replicas-base.test
b/sql/test/rel-optimizers/Tests/replicas-base.test
--- a/sql/test/rel-optimizers/Tests/replicas-base.test
+++ b/sql/test/rel-optimizers/Tests/replicas-base.test
@@ -8,7 +8,7 @@ statement ok
create remote table foo_r2 (n int, m text) on
'mapi:monetdb://localhost:50002/node2'
statement ok
-create remote table foo_r3 (n int, m text) on
'mapi:monetdb://localhost:50003/node3'
+create remote table foo_r3 (n int, m text) on 'monetdb://localhost:50003/node3'
statement ok
create table bar_local (n int, m text)
@@ -20,7 +20,7 @@ statement ok
create remote table bar_r2 (n int, m text) on
'mapi:monetdb://localhost:50002/node2'
statement ok
-create remote table bar_r3 (n int, m text) on
'mapi:monetdb://localhost:50003/node3'
+create remote table bar_r3 (n int, m text) on 'monetdb://localhost:50003/node3'
statement ok
create remote table buz_rmt (l int) on 'mapi:monetdb://localhost:50002/node2'
diff --git a/sql/test/rel-optimizers/Tests/replicas-join-plan.test
b/sql/test/rel-optimizers/Tests/replicas-join-plan.test
--- a/sql/test/rel-optimizers/Tests/replicas-join-plan.test
+++ b/sql/test/rel-optimizers/Tests/replicas-join-plan.test
@@ -125,6 +125,6 @@ table (
| | | ) [ ],
| | | REMOTE("sys"."buz_rmt") [ "buz_rmt"."l" ]
| | ) [ ]
-| ) [ "foo_rpl"."n", "foo_rpl"."m", "bar_rpl"."n", "bar_rpl"."m",
"buz_rmt"."l" ] REMOTE mapi:monetdb://localhost:50002/node2
+| ) [ "foo_rpl"."n", "foo_rpl"."m", "bar_rpl"."n", "bar_rpl"."m",
"buz_rmt"."l" ] REMOTE monetdb://localhost.:50002/node2
) [ "foo_rpl"."n", "foo_rpl"."m", "bar_rpl"."n", "bar_rpl"."m", "buz_rmt"."l" ]
diff --git a/sql/test/sql_dump/Tests/dump.test
b/sql/test/sql_dump/Tests/dump.test
--- a/sql/test/sql_dump/Tests/dump.test
+++ b/sql/test/sql_dump/Tests/dump.test
@@ -323,7 +323,7 @@ CREATE TABLE "sys"."higher_scorers" ("na
CREATE TABLE "sys"."unknown_scorers" ("name" CHARACTER VARYING, "first_score"
INTEGER, "second_score" INTEGER);
CREATE TABLE "sfoo"."foo" ("fi" INTEGER NOT NULL, "fs" CHARACTER VARYING NOT
NULL);
CREATE TABLE "sbar"."bar" ("bi" INTEGER NOT NULL, "bs" CHARACTER VARYING NOT
NULL);
-CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON
'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON
'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE MERGE TABLE "sys"."scorers" ("name" CHARACTER VARYING, "first_score"
INTEGER, "second_score" INTEGER) PARTITION BY VALUES USING
("sys"."mod"("sys"."greatest"("first_score","second_score"),10));
CREATE MERGE TABLE "sys"."splitted" ("stamp" TIMESTAMP, "val" INTEGER)
PARTITION BY RANGE ON ("stamp");
CREATE MERGE TABLE "sys"."m1" ("i" INTEGER);
diff --git a/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
@@ -101333,7 +101333,7 @@ 9 "pass"
8 "attempt"
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
diff --git a/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
b/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/dump.stable.out
@@ -101333,7 +101333,7 @@ 9 "pass"
8 "attempt"
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
@@ -101357,7 +101357,7 @@ CREATE TABLE "testschema"."subtable_exp2
);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -101357,7 +101357,7 @@ CREATE TABLE "testschema"."subtable_exp2
);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.out
b/sql/test/testdb/Tests/dump-nogeom.stable.out
--- a/sql/test/testdb/Tests/dump-nogeom.stable.out
+++ b/sql/test/testdb/Tests/dump-nogeom.stable.out
@@ -101359,7 +101359,7 @@ CREATE TABLE "testschema"."subtable_exp2
);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
diff --git a/sql/test/testdb/Tests/dump.stable.out
b/sql/test/testdb/Tests/dump.stable.out
--- a/sql/test/testdb/Tests/dump.stable.out
+++ b/sql/test/testdb/Tests/dump.stable.out
@@ -101359,7 +101359,7 @@ CREATE TABLE "testschema"."subtable_exp2
);
CREATE REMOTE TABLE "testschema"."remotetable" (
"i" INTEGER
-) ON 'mapi:monetdb://remote.host.url:50000/dbname' WITH USER 'bob' ENCRYPTED
PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
+) ON 'monetdb://remote.host.url/dbname' WITH USER 'bob' ENCRYPTED PASSWORD
'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3';
CREATE TABLE "testschema"."""" (
"""" INTEGER
);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
