MonetDB: odbc_loader - fix problem with file_loader()

[Martin van Dinther via checkin-list]

Changeset: d4398ec93f50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d4398ec93f50
Modified Files:
        sql/common/sql_types.c
        sql/server/rel_select.c
Branch: odbc_loader
Log Message:

fix problem with file_loader()


diffs (32 lines):

diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1711,8 +1711,12 @@ sqltypeinit( allocator *sa)
        f = sql_create_union(sa, "copyfrombinary", "", "", TRUE, SCALE_FIX, 0, 
TABLE, 3, STR, STR, INT);
        f->varres = 1;
 
-       f = sql_create_union(sa, "file_loader", "", "", TRUE, SCALE_FIX, 0, 
TABLE, 1, STR); /* file_loader */
-       f = sql_create_union(sa, "proto_loader", "", "", TRUE, SCALE_FIX, 0, 
TABLE, 1, STR); /* proto_loader */
+       /* file_loader */
+       f = sql_create_union(sa, "file_loader", "", "", TRUE, SCALE_FIX, 0, 
TABLE, 1, STR);
+       f->varres = 1;
+
+       /* generic proto_loader which expects an URI starting with the protocol 
like: 'odbc:' or 'monetdb:' or 'file:' */
+       f = sql_create_union(sa, "proto_loader", "", "", TRUE, SCALE_FIX, 0, 
TABLE, 1, STR);
        f->varres = 1;
 
        /* sys_update_schemas, sys_update_tables */
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -833,6 +833,10 @@ rel_named_table_function(sql_query *quer
 
        if (!sname && strcmp(fname, "proto_loader") == 0) {
                rel = rel_proto_loader(sql, exps, tl, tname);
+               if (!rel) {
+                       /* no supported protocol found in uri, try file_loader 
*/
+                       rel = rel_file_loader(sql, exps, tl, tname);
+               }
                if (!rel)
                        return NULL;
        } else if (!sname && strcmp(fname, "file_loader") == 0) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org