*** empty log message ***

Michael Meskes · Michael Meskes · commit 7ff8a1803075 · 1999-11-02T12:11:53.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -700,3 +700,8 @@ Fri Oct 29 21:36:25 CEST 1999
 	- Fixed bug that caused ecpg to not allow FOR UPDATE.
 	- Set ecpg version to 2.6.9
 
+Mon Nov  1 11:22:06 CET 1999
+
+	- Print SQL error message to STDERR instead of STDOUT.
+	- Added a fourth test source.
+	- Set library version to 3.0.5.
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
@@ -6,13 +6,13 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.49 1999/10/13 11:38:35 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.50 1999/11/02 12:11:53 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
 NAME= ecpg
 SO_MAJOR_VERSION= 3
-SO_MINOR_VERSION= 0.4
+SO_MINOR_VERSION= 0.5
 
 SRCDIR= @top_srcdir@
 include $(SRCDIR)/Makefile.global
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
@@ -1294,7 +1294,7 @@ void
 sqlprint(void)
 {
 	sqlca.sqlerrm.sqlerrmc[sqlca.sqlerrm.sqlerrml] = '\0';
-	printf("sql error %s\n", sqlca.sqlerrm.sqlerrmc);
+	fprintf(stderr, "sql error %s\n", sqlca.sqlerrm.sqlerrmc);
 }
 
 static bool
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
@@ -1,22 +1,17 @@
-all: test1 test2 test3 perftest
+all: test1 test2 test3 test4 perftest
 
 LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq -lcrypt
 
-test1: test1.c
-test1.c: test1.pgc
-	/usr/local/pgsql/bin/ecpg $?
+.SUFFIXES: .pgc .c
 
+test1: test1.c
 test2: test2.c
-test2.c: test2.pgc
-	/usr/local/pgsql/bin/ecpg $?
-
 test3: test3.c
-test3.c: test3.pgc
-	/usr/local/pgsql/bin/ecpg $?
-
+test4: test4.c
 perftest: perftest.c
-perftest.c:perftest.pgc
+
+.pgc.c:
 	/usr/local/pgsql/bin/ecpg $?
 
 clean:
-	-/bin/rm test1 test2 test3 perftest *.c log
+	-/bin/rm test1 test2 test3 test4 perftest *.c log
diff --git a/src/interfaces/ecpg/test/header_test.h b/src/interfaces/ecpg/test/header_test.h
@@ -1,19 +1,16 @@
 exec sql include sqlca;
 
-exec sql whenever sqlerror
-do
-				PrintAndStop();
-exec sql whenever sqlwarning
-do
-				warn();
+exec sql whenever sqlerror do PrintAndStop(msg);
+exec sql whenever sqlwarning do warn();
 
-void		PrintAndStop(void)
+void PrintAndStop(msg)
 {
+	fprintf(stderr, "Error in statement '%s':\n", msg);
 	sqlprint();
 	exit(-1);
 }
 
-void		warn(void)
+void warn(void)
 {
 	fprintf(stderr, "Warning: At least one column was truncated\n");
 }
diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc
@@ -1,4 +1,4 @@
-exec sql whenever sqlerror sqlprint;
+exec sql include header_test;
 
 exec sql include sqlca;
 

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`# Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.49 1999/10/13 11:38:35 momjian Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.50 1999/11/02 12:11:53 meskes Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`13`	`13`	`NAME= ecpg`
`14`	`14`	`SO_MAJOR_VERSION= 3`
`15`		`-SO_MINOR_VERSION= 0.4`
	`15`	`+SO_MINOR_VERSION= 0.5`
`16`	`16`
`17`	`17`	`SRCDIR= @top_srcdir@`
`18`	`18`	`include $(SRCDIR)/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -1294,7 +1294,7 @@ void`
`1294`	`1294`	`sqlprint(void)`
`1295`	`1295`	`{`
`1296`	`1296`	`sqlca.sqlerrm.sqlerrmc[sqlca.sqlerrm.sqlerrml] = '\0';`
`1297`		`- printf("sql error %s\n", sqlca.sqlerrm.sqlerrmc);`
	`1297`	`+ fprintf(stderr, "sql error %s\n", sqlca.sqlerrm.sqlerrmc);`
`1298`	`1298`	`}`
`1299`	`1299`
`1300`	`1300`	`static bool`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,16 @@`
`1`	`1`	`exec sql include sqlca;`
`2`	`2`
`3`		`-exec sql whenever sqlerror`
`4`		`-do`
`5`		`- PrintAndStop();`
`6`		`-exec sql whenever sqlwarning`
`7`		`-do`
`8`		`- warn();`
	`3`	`+exec sql whenever sqlerror do PrintAndStop(msg);`
	`4`	`+exec sql whenever sqlwarning do warn();`
`9`	`5`
`10`		`-void PrintAndStop(void)`
	`6`	`+void PrintAndStop(msg)`
`11`	`7`	`{`
	`8`	`+ fprintf(stderr, "Error in statement '%s':\n", msg);`
`12`	`9`	`sqlprint();`
`13`	`10`	`exit(-1);`
`14`	`11`	`}`
`15`	`12`
`16`		`-void warn(void)`
	`13`	`+void warn(void)`
`17`	`14`	`{`
`18`	`15`	`fprintf(stderr, "Warning: At least one column was truncated\n");`
`19`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-exec sql whenever sqlerror sqlprint;`
	`1`	`+exec sql include header_test;`
`2`	`2`
`3`	`3`	`exec sql include sqlca;`
`4`	`4`