Commit 1de9615a authored by Tom Lane's avatar Tom Lane

Use separate SQLSTATE codes for file not found/file exists, rather than

lumping them into ERRCODE_UNDEFINED_OBJECT/ERRCODE_DUPLICATE_OBJECT.
This seems reasonable since 'object' was meant to refer to 'object in the
database' and a file is outside the database.  Per request from Dave
Cramer.
parent 0b511f07
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.119 2003/08/08 21:42:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.120 2003/08/26 21:15:27 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -530,14 +530,14 @@ errcode_for_file_access(void) ...@@ -530,14 +530,14 @@ errcode_for_file_access(void)
edata->sqlerrcode = ERRCODE_INSUFFICIENT_PRIVILEGE; edata->sqlerrcode = ERRCODE_INSUFFICIENT_PRIVILEGE;
break; break;
/* Object not found */ /* File not found */
case ENOENT: /* No such file or directory */ case ENOENT: /* No such file or directory */
edata->sqlerrcode = ERRCODE_UNDEFINED_OBJECT; edata->sqlerrcode = ERRCODE_UNDEFINED_FILE;
break; break;
/* Duplicate object */ /* Duplicate file */
case EEXIST: /* File exists */ case EEXIST: /* File exists */
edata->sqlerrcode = ERRCODE_DUPLICATE_OBJECT; edata->sqlerrcode = ERRCODE_DUPLICATE_FILE;
break; break;
/* Wrong object type or state */ /* Wrong object type or state */
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* $Id: errcodes.h,v 1.4 2003/08/04 00:43:32 momjian Exp $ * $Id: errcodes.h,v 1.5 2003/08/26 21:15:27 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -294,6 +294,8 @@ ...@@ -294,6 +294,8 @@
/* Class 58 - System Error (class borrowed from DB2) */ /* Class 58 - System Error (class borrowed from DB2) */
/* (we define this as errors external to PostgreSQL itself) */ /* (we define this as errors external to PostgreSQL itself) */
#define ERRCODE_IO_ERROR MAKE_SQLSTATE('5','8', '0','3','0') #define ERRCODE_IO_ERROR MAKE_SQLSTATE('5','8', '0','3','0')
#define ERRCODE_UNDEFINED_FILE MAKE_SQLSTATE('5','8', 'P','0','1')
#define ERRCODE_DUPLICATE_FILE MAKE_SQLSTATE('5','8', 'P','0','2')
/* Class F0 - Configuration File Error (PostgreSQL-specific error class) */ /* Class F0 - Configuration File Error (PostgreSQL-specific error class) */
#define ERRCODE_CONFIG_FILE_ERROR MAKE_SQLSTATE('F','0', '0','0','0') #define ERRCODE_CONFIG_FILE_ERROR MAKE_SQLSTATE('F','0', '0','0','0')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment