Changeset: 799341da8b59 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/799341da8b59
Modified Files:
sql/server/rel_select.c
sql/test/file_loader/Tests/file_loader_function.test
sql/test/file_loader/Tests/file_loader_string.test
Branch: default
Log Message:
Added some more tests. Simplified error message.
diffs (93 lines):
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
@@ -588,7 +588,7 @@ rel_file_loader(mvc *sql, list *exps, li
if (list_length(exps) == 1 && f && f->func->varres &&
strlen(f->func->mod) == 0 && strlen(f->func->imp) == 0) {
char *err =
file_loader_add_table_column_types(sql, f, nexps, res_exps, tname);
if (err)
- return sql_error(sql, ERR_NOTFOUND,
SQLSTATE(42000) "SELECT: file_loader function type resolutions failed '%s'",
err);
+ return sql_error(sql, ERR_NOTFOUND,
SQLSTATE(42000) "SELECT: file_loader function failed '%s'", err);
}
sql_exp *e = exp_op(sql->sa, nexps, f);
sql_rel *rel = rel_table_func(sql->sa, NULL, e,
res_exps, TABLE_PROD_FUNC);
diff --git a/sql/test/file_loader/Tests/file_loader_function.test
b/sql/test/file_loader/Tests/file_loader_function.test
--- a/sql/test/file_loader/Tests/file_loader_function.test
+++ b/sql/test/file_loader/Tests/file_loader_function.test
@@ -1,21 +1,30 @@
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename missing'
+statement error 42000!SELECT: file_loader function failed 'Filename missing'
select * from file_loader('')
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
+statement error 42000!SELECT: file_loader function failed 'Filename extension
missing'
select * from file_loader('FileNotFound')
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from file_loader('/tmp/FileNotFound.csv')
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension 'gz' missing'
+statement error 42000!SELECT: file_loader function failed 'Filename extension
'gz' missing'
select * from file_loader('/tmp/FileNotFound.gz')
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from file_loader('/tmp/FileNotFound.csv.gz')
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from file_loader(R'C:\temp\FileNotFound.csv.gz')
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from file_loader('/tmp/FileNotFound.csv.gz') as file
+
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from file_loader('/tmp/FileNotFound.csv.gz') as file(col1, col2)
+
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from file_loader('/tmp/FileNotFound.csv') file(col1, col2)
+
statement error 42000!SELECT: no such table returning function
'sys'.'file_loader'(char)
select * from sys.file_loader('')
diff --git a/sql/test/file_loader/Tests/file_loader_string.test
b/sql/test/file_loader/Tests/file_loader_string.test
--- a/sql/test/file_loader/Tests/file_loader_string.test
+++ b/sql/test/file_loader/Tests/file_loader_string.test
@@ -1,21 +1,30 @@
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename missing'
+statement error 42000!SELECT: file_loader function failed 'Filename missing'
select * from ''
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
+statement error 42000!SELECT: file_loader function failed 'Filename extension
missing'
select * from 'FileNotFound'
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
+statement error 42000!SELECT: file_loader function failed 'Filename extension
missing'
select * from '/tmp/FileNotFound'
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from '/tmp/FileNotFound.csv'
-statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension 'gz' missing'
+statement error 42000!SELECT: file_loader function failed 'Filename extension
'gz' missing'
select * from '/tmp/FileNotFound.gz'
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from '/tmp/FileNotFound.csv.gz'
-statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+statement error 42000!SELECT: file_loader function failed 'File not found'
select * from R'C:\temp\FileNotFound.csv.gz'
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from '/tmp/FileNotFound.csv.gz' as file
+
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from '/tmp/FileNotFound.csv.gz' as file(col1, col2)
+
+statement error 42000!SELECT: file_loader function failed 'File not found'
+select * from '/tmp/FileNotFound.csv' file(col1, col2)
+
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
