You are correct.

Patch against the latest HEAD attached.

Josh

Andrew Dunstan wrote:
Joshua Reich wrote:

Ok. Here is a diff taken from the top of the contrib tree. I have suppressed the notices in both the cube and earthdistance packages. All tests pass.


Doesn't this contain parts that have been already applied? It looks to me like you need to do a cvs update (and then a subsequent clean and test) before generating the diff.

cheers

andrew

---------------------------(end of broadcast)---------------------------
TIP 4: Have you searched our list archives?

              http://archives.postgresql.org
? cube/cube.diff
? cube/cubeparse.tab.c
? cube/diff
? cube/logfile
Index: cube/expected/cube.out
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/cube/expected/cube.out,v
retrieving revision 1.17
diff -c -r1.17 cube.out
*** cube/expected/cube.out      25 Jul 2006 23:23:44 -0000      1.17
--- cube/expected/cube.out      27 Jul 2006 15:01:36 -0000
***************
*** 5,16 ****
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of cube.sql.
  --
  \set ECHO none
! psql:cube.sql:10: NOTICE:  type "cube" is not yet defined
! DETAIL:  Creating a shell type definition.
! psql:cube.sql:14: NOTICE:  return type cube is only a shell
! psql:cube.sql:18: NOTICE:  return type cube is only a shell
! psql:cube.sql:23: NOTICE:  argument type cube is only a shell
  --
  -- testing the input and output functions
  --
--- 5,13 ----
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of cube.sql.
  --
+ SET client_min_messages = warning;
  \set ECHO none
! RESET client_min_messages;
  --
  -- testing the input and output functions
  --
Index: cube/sql/cube.sql
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/cube/sql/cube.sql,v
retrieving revision 1.9
diff -c -r1.9 cube.sql
*** cube/sql/cube.sql   25 Jul 2006 23:23:45 -0000      1.9
--- cube/sql/cube.sql   27 Jul 2006 15:01:37 -0000
***************
*** 6,14 ****
--- 6,16 ----
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of cube.sql.
  --
+ SET client_min_messages = warning;
  \set ECHO none
  \i cube.sql
  \set ECHO all
+ RESET client_min_messages;
  
  --
  -- testing the input and output functions
Index: earthdistance/expected/earthdistance.out
===================================================================
RCS file: 
/projects/cvsroot/pgsql/contrib/earthdistance/expected/earthdistance.out,v
retrieving revision 1.9
diff -c -r1.9 earthdistance.out
*** earthdistance/expected/earthdistance.out    14 Mar 2006 22:48:18 -0000      
1.9
--- earthdistance/expected/earthdistance.out    27 Jul 2006 15:01:37 -0000
***************
*** 5,14 ****
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of earthdistance.sql or cube.sql.
  --
  \set ECHO none
! psql:../cube/cube.sql:10: NOTICE:  type "cube" is not yet defined
! DETAIL:  Creating a shell type definition.
! psql:../cube/cube.sql:15: NOTICE:  argument type cube is only a shell
  --
  -- The radius of the Earth we are using.
  --
--- 5,13 ----
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of earthdistance.sql or cube.sql.
  --
+ SET client_min_messages = warning;
  \set ECHO none
! RESET client_min_messages;
  --
  -- The radius of the Earth we are using.
  --
Index: earthdistance/sql/earthdistance.sql
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/earthdistance/sql/earthdistance.sql,v
retrieving revision 1.7
diff -c -r1.7 earthdistance.sql
*** earthdistance/sql/earthdistance.sql 8 Nov 2002 20:22:12 -0000       1.7
--- earthdistance/sql/earthdistance.sql 27 Jul 2006 15:01:37 -0000
***************
*** 6,15 ****
--- 6,17 ----
  -- first, define the datatype.  Turn off echoing so that expected file
  -- does not depend on contents of earthdistance.sql or cube.sql.
  --
+ SET client_min_messages = warning;
  \set ECHO none
  \i ../cube/cube.sql
  \i earthdistance.sql
  \set ECHO all
+ RESET client_min_messages;
  
  --
  -- The radius of the Earth we are using.
---------------------------(end of broadcast)---------------------------
TIP 3: Have you checked our extensive FAQ?

               http://www.postgresql.org/docs/faq

Reply via email to