Improve error message from failed LOAD command (include

kernel's error description when file is not accessible).

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index ea63eccd490dc172b3c39132faca2d550f32aee3..eb1d155ac450e9a67a7f7e01a85ba63cc2c0e2bc 100644 (file)
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -612,22 +612,12 @@ ProcessUtility(Node *parsetree,
                case T_LoadStmt:
                        {
                                LoadStmt   *stmt = (LoadStmt *) parsetree;
-                               FILE       *fp;
-                               char       *filename;
 
                                PS_SET_STATUS(commandTag = "LOAD");
                                CHECK_IF_ABORTED();
 
-                               filename = stmt->filename;
-                               closeAllVfds();
-#ifndef __CYGWIN32__
-                               if ((fp = AllocateFile(filename, "r")) == NULL)
-#else
-                               if ((fp = AllocateFile(filename, "rb")) == NULL)
-#endif
-                                       elog(ERROR, "LOAD: could not open file '%s'", filename);
-                               FreeFile(fp);
-                               load_file(filename);
+                               closeAllVfds(); /* probably not necessary... */
+                               load_file(stmt->filename);
                        }
                        break;
 

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 3459707adebd52a2864e577c101cc46c3b657519..8308552764b5a7f760ba0fccdb3e5a736de7fc8f 100644 (file)
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -148,7 +148,7 @@ handle_load(char *filename, char *funcname)
                if (file_scanner == (DynamicFileList *) NULL)
                {
                        if (stat(filename, &stat_buf) == -1)
-                               elog(ERROR, "stat failed on file %s", filename);
+                               elog(ERROR, "stat failed on file '%s': %m", filename);
 
                        for (file_scanner = file_list;
                                 file_scanner != (DynamicFileList *) NULL
@@ -237,13 +237,17 @@ void
 load_file(char *filename)
 {
        DynamicFileList *file_scanner,
-                          *p;
+                                  *p;
        struct stat stat_buf;
-
        int                     done = 0;
 
+       /*
+        * We need to do stat() in order to determine whether this is the
+        * same file as a previously loaded file; it's also handy so as to
+        * give a good error message if bogus file name given.
+        */
        if (stat(filename, &stat_buf) == -1)
-               elog(ERROR, "stat failed on file %s", filename);
+               elog(ERROR, "LOAD: could not open file '%s': %m", filename);
 
        if (file_list != (DynamicFileList *) NULL
                && !NOT_EQUAL(stat_buf, *file_list))