database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Improve error message from failed LOAD command (include

Browse Source 
kernel's error description when file is not accessible).
This commit is contained in:
Tom Lane 1999-05-22 19:49:42 +00:00
parent b21005fa7c
commit f9f90b21b2
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/tcop/utility.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.59 1999/03/17 22:53:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.60 1999/05/22 19:49:42 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -612,22 +612,12 @@ ProcessUtility(Node *parsetree,
case T_LoadStmt: case T_LoadStmt:
{ {
LoadStmt *stmt = (LoadStmt *) parsetree; LoadStmt *stmt = (LoadStmt *) parsetree;
FILE *fp;
char *filename;
PS_SET_STATUS(commandTag = "LOAD"); PS_SET_STATUS(commandTag = "LOAD");
CHECK_IF_ABORTED(); CHECK_IF_ABORTED();
filename = stmt->filename; closeAllVfds(); /* probably not necessary... */
closeAllVfds(); load_file(stmt->filename);
#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);
} }
break; break;

14
src/backend/utils/fmgr/dfmgr.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.24 1999/05/10 00:46:13 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.25 1999/05/22 19:49:41 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -148,7 +148,7 @@ handle_load(char *filename, char *funcname)
if (file_scanner == (DynamicFileList *) NULL) if (file_scanner == (DynamicFileList *) NULL)
{ {
if (stat(filename, &stat_buf) == -1) 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; for (file_scanner = file_list;
file_scanner != (DynamicFileList *) NULL file_scanner != (DynamicFileList *) NULL
@ -237,13 +237,17 @@ void
load_file(char *filename) load_file(char *filename)
{ {
DynamicFileList *file_scanner, DynamicFileList *file_scanner,
*p; *p;
struct stat stat_buf; struct stat stat_buf;
int done = 0; 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) 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 if (file_list != (DynamicFileList *) NULL
&& !NOT_EQUAL(stat_buf, *file_list)) && !NOT_EQUAL(stat_buf, *file_list))