Fix badly broken RelationGetRelationName().

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 51832c6f3eee44e86d28d3b4cfef2f062953c2e6..5eae99578ee6a03b667d864b75a6a8aa0eb45f0f 100644 (file)
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.48 2001/06/19 12:03:41 momjian Exp $
+ * $Id: rel.h,v 1.49 2001/06/19 21:28:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -221,9 +221,10 @@ extern void RelationSetIndexSupport(Relation relation,
  * Handle temp relations
  */
 #define PG_TEMP_REL_PREFIX "pg_temp"
+#define PG_TEMP_REL_PREFIX_LEN 7
 
 #define is_temp_relname(relname) \
-               (strncmp(relname, PG_TEMP_REL_PREFIX, strlen(PG_TEMP_REL_PREFIX)) == 0)
+               (strncmp(relname, PG_TEMP_REL_PREFIX, PG_TEMP_REL_PREFIX_LEN) == 0)
 
 /*
  * RelationGetPhysicalRelationName
@@ -252,12 +253,12 @@ extern void RelationSetIndexSupport(Relation relation,
  */
 #define RelationGetRelationName(relation) \
 (\
-       !is_temp_relname(relation) \
+       is_temp_relname(RelationGetPhysicalRelationName(relation)) \
        ? \
-               RelationGetPhysicalRelationName(relation) \
-       : \
                get_temp_rel_by_physicalname( \
                        RelationGetPhysicalRelationName(relation)) \
+       : \
+               RelationGetPhysicalRelationName(relation) \
 )