Changeset: ff714c7a4c36 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ff714c7a4c36
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:
Approve file_loader error messages
diffs (95 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
@@ -541,12 +541,11 @@ file_loader_add_table_column_types(mvc *
char *ext = strrchr(filename, '.'), *ep = ext;
if (ext) {
- ext=ext+1;
+ ext = ext + 1;
ext = mkLower(sa_strdup(sql->sa, ext));
}
-
if (!ext)
- return "extension missing";
+ return "Filename extension missing";
file_loader_t *fl = fl_find(ext);
if (!fl) {
@@ -563,7 +562,7 @@ file_loader_add_table_column_types(mvc *
fl = fl_find(ext);
}
if (!fl)
- return sa_message(sql->ta, "extension '%s' missing",
ext?ext:"");
+ return sa_message(sql->ta, "Filename extension '%s'
missing", ext?ext:"");
}
str err = fl->add_types(sql, f, filename, res_exps, tname);
if (err)
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,12 +1,28 @@
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename missing'
select * from file_loader('')
-statement error 42000!Table expression without table name
-select * from file_loader('filenotfound')
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
+select * from file_loader('FileNotFound')
+
+statement error 42000!SELECT: file_loader function type resolutions 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'
+select * from file_loader('/tmp/FileNotFound.gz')
-statement error server crash
+statement error 42000!SELECT: file_loader function type resolutions 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'
+select * from file_loader(R'C:\temp\FileNotFound.csv.gz')
+
+
+statement error 42000!SELECT: no such table returning function
'sys'.'file_loader'(char)
select * from sys.file_loader('')
-statement error server crash
-select * from sys.file_loader('filenotfound')
+statement error 42000!SELECT: no such table returning function
'sys'.'file_loader'(char(12))
+select * from sys.file_loader('FileNotFound')
+statement error 42000!SELECT: no such table returning function
'sys'.'file_loader'(char(16))
+select * from sys.file_loader('FileNotFound.csv')
+
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,15 +1,21 @@
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename missing'
select * from ''
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
select * from 'FileNotFound'
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension missing'
select * from '/tmp/FileNotFound'
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
select * from '/tmp/FileNotFound.csv'
-statement error 42000!Table expression without table name
+statement error 42000!SELECT: file_loader function type resolutions failed
'Filename extension 'gz' missing'
+select * from '/tmp/FileNotFound.gz'
+
+statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
select * from '/tmp/FileNotFound.csv.gz'
+statement error 42000!SELECT: file_loader function type resolutions failed
'File not found'
+select * from R'C:\temp\FileNotFound.csv.gz'
+
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
