Small changes to use the absolute path to system catalogs.

tglsfdc · tglsfdc · commit f9b232f0190a · 2003-05-16T13:37:00.000Z
Greg Sabino Mullane
diff --git a/src/pl/tcl/modules/pltcl_loadmod.in b/src/pl/tcl/modules/pltcl_loadmod.in
@@ -84,7 +84,7 @@ proc __PLTcl_loadmod_check_table {conn tabname expnames exptypes} {
     set found 0
 
     pg_select $conn "select C.relname, A.attname, A.attnum, T.typname 	\
-    		from pg_class C, pg_attribute A, pg_type T		\
+    		from pg_catalog.pg_class C, pg_catalog.pg_attribute A, pg_catalog.pg_type T		\
 		where C.relname = '$tabname'				\
 		  and A.attrelid = C.oid				\
 		  and A.attnum > 0					\
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
@@ -31,7 +31,7 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.69 2003/02/06 17:02:11 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.70 2003/05/16 13:37:00 tgl Exp $
  *
  **********************************************************************/
 
@@ -309,7 +309,7 @@ pltcl_init_load_unknown(Tcl_Interp *interp)
 	/************************************************************
 	 * Check if table pltcl_modules exists
 	 ************************************************************/
-	spi_rc = SPI_exec("select 1 from pg_class "
+	spi_rc = SPI_exec("select 1 from pg_catalog.pg_class "
 					  "where relname = 'pltcl_modules'", 1);
 	SPI_freetuptable(SPI_tuptable);
 	if (spi_rc != SPI_OK_SELECT)
diff --git a/src/pl/tcl/test/test_setup.sql b/src/pl/tcl/test/test_setup.sql
@@ -319,7 +319,7 @@ create function check_primkey() returns trigger as '
 	    # Lookup the fields type in pg_attribute
 	    #
 	    set n [spi_exec "select T.typname			\\
-	        from pg_type T, pg_attribute A, pg_class C	\\
+	        from pg_catalog.pg_type T, pg_catalog.pg_attribute A, pg_catalog.pg_class C	\\
 		where C.relname  = ''[quote $keyrel]''		\\
 		  and C.oid      = A.attrelid			\\
 		  and A.attname  = ''[quote $key]''		\\
@@ -343,7 +343,7 @@ create function check_primkey() returns trigger as '
 	#
 	# Lookup and remember the table name for later error messages
 	#
-	spi_exec "select relname from pg_class			\\
+	spi_exec "select relname from pg_catalog.pg_class	\\
 		where oid = ''$TG_relid''::oid"
 	set GD($planrel) $relname
     }

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ create function check_primkey() returns trigger as '`
`319`	`319`	`# Lookup the fields type in pg_attribute`
`320`	`320`	`#`
`321`	`321`	`set n [spi_exec "select T.typname \\`
`322`		`- from pg_type T, pg_attribute A, pg_class C \\`
	`322`	`+ from pg_catalog.pg_type T, pg_catalog.pg_attribute A, pg_catalog.pg_class C \\`
`323`	`323`	`where C.relname = ''[quote $keyrel]'' \\`
`324`	`324`	`and C.oid = A.attrelid \\`
`325`	`325`	`and A.attname = ''[quote $key]'' \\`
`@@ -343,7 +343,7 @@ create function check_primkey() returns trigger as '`
`343`	`343`	`#`
`344`	`344`	`# Lookup and remember the table name for later error messages`
`345`	`345`	`#`
`346`		`- spi_exec "select relname from pg_class \\`
	`346`	`+ spi_exec "select relname from pg_catalog.pg_class \\`
`347`	`347`	`where oid = ''$TG_relid''::oid"`
`348`	`348`	`set GD($planrel) $relname`
`349`	`349`	`}`