Remove int16 from libpgeasy examples. Improve error reporting.

bmomjian · bmomjian · commit ccab6f740230 · 2002-06-07T16:53:40.000Z
diff --git a/src/interfaces/libpgeasy/examples/pginsert.c b/src/interfaces/libpgeasy/examples/pginsert.c
@@ -18,7 +18,6 @@ main(int argc, char **argv)
 	float		afloat;
 	double		adouble;
 	char		achar[11],
-				achar16[17],
 				abpchar[11],
 				avarchar[51],
 				atext[51];
@@ -41,7 +40,6 @@ main(int argc, char **argv)
 			afloat 	float4, \
 			adouble float8, \
 			achar	char, \
-			achar16	char(16), \
 			abpchar char(10), \
 			avarchar varchar(50), \
 			atext	text, \
@@ -58,7 +56,6 @@ main(int argc, char **argv)
 			'Betty', \
 			'Charley', \
 			'Doug', \
-			'Ernie', \
 			'now' )", row);
 		doquery(query);
 
@@ -73,18 +70,16 @@ main(int argc, char **argv)
 					 &afloat,
 					 &adouble,
 					 achar,
-					 achar16,
 					 abpchar,
 					 avarchar,
 					 atext,
 					 &aabstime) != END_OF_TUPLES)
-			printf("int %d\nfloat %f\ndouble %f\nchar %s\nchar16 %s\n\
+			printf("int %d\nfloat %f\ndouble %f\nchar %s\n\
 bpchar %s\nvarchar %s\ntext %s\nabstime %s",
 				   aint,
 				   afloat,
 				   adouble,
 				   achar,
-				   achar16,
 				   abpchar,
 				   avarchar,
 				   atext,
diff --git a/src/interfaces/libpgeasy/examples/pgnulltest.c b/src/interfaces/libpgeasy/examples/pgnulltest.c
@@ -20,7 +20,6 @@ main(int argc, char **argv)
 	float		afloat;
 	double		adouble;
 	char		achar[11],
-				achar16[17],
 				abpchar[11],
 				avarchar[51],
 				atext[51];
@@ -29,7 +28,6 @@ main(int argc, char **argv)
 				afloat_null,
 				adouble_null,
 				achar_null,
-				achar16_null,
 				abpchar_null,
 				avarchar_null,
 				atext_null,
@@ -52,7 +50,6 @@ main(int argc, char **argv)
             afloat  float4, \
             adouble float8, \
             achar   char, \
-            achar16 char(16), \
             abpchar char(10), \
             avarchar varchar(50), \
             atext   text, \
@@ -68,8 +65,7 @@ main(int argc, char **argv)
 			'', \
 			'', \
 			'', \
-			'', \
-			'');");
+			CURRENT_TIMESTAMP::abstime);");
 #else
 	sprintf(query, "INSERT INTO testfetch VALUES ( \
             NULL, \
@@ -79,7 +75,6 @@ main(int argc, char **argv)
 			NULL, \
 			NULL, \
 			NULL, \
-			NULL, \
 			NULL);");
 #endif
 	doquery(query);
@@ -99,8 +94,6 @@ main(int argc, char **argv)
 					   &adouble_null,
 					   achar,
 					   &achar_null,
-					   achar16,
-					   &achar16_null,
 					   abpchar,
 					   &abpchar_null,
 					   avarchar,
@@ -109,30 +102,28 @@ main(int argc, char **argv)
 					   &atext_null,
 					   &aabstime,
 					   &aabstime_null) != END_OF_TUPLES)
-		printf("int %d\nfloat %f\ndouble %f\nchar %s\nchar16 %s\n\
+		printf("int %d\nfloat %f\ndouble %f\nchar %s\n\
 bpchar %s\nvarchar %s\ntext %s\nabstime %s\n",
 			   aint,
 			   afloat,
 			   adouble,
 			   achar,
-			   achar16,
 			   abpchar,
 			   avarchar,
 			   atext,
 			   ctime(&aabstime));
-	printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\nchar16 %d\n\
+
+	printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\n\
 bpchar %d\nvarchar %d\ntext %d\nabstime %d\n",
 		   aint_null,
 		   afloat_null,
 		   adouble_null,
 		   achar_null,
-		   achar16_null,
 		   abpchar_null,
 		   avarchar_null,
 		   atext_null,
 		   aabstime_null);
 
-
 	doquery("CLOSE c_testfetch");
 	doquery("COMMIT WORK");
 	printf("--- %-d rows inserted so far\n", row);
diff --git a/src/interfaces/libpgeasy/libpgeasy.c b/src/interfaces/libpgeasy/libpgeasy.c
@@ -92,11 +92,11 @@ doquery(char *query)
 		 PQresultStatus(res) == PGRES_FATAL_ERROR))
 	{
 		if (res != NULL)
-			fprintf(stderr, "query error:  %s\n", PQcmdStatus(res));
+			fprintf(stderr, "query error:  %s\n", PQresultErrorMessage(res));
 		else
 			fprintf(stderr, "connection error:  %s\n", PQerrorMessage(conn));
 		PQfinish(conn);
-		halt("failed request:  %s\n", query);
+		halt("failed query:  %s\n", query);
 	}
 	tuple = 0;
 	return res;

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,11 @@ doquery(char *query)`
`92`	`92`	`PQresultStatus(res) == PGRES_FATAL_ERROR))`
`93`	`93`	`{`
`94`	`94`	`if (res != NULL)`
`95`		`- fprintf(stderr, "query error: %s\n", PQcmdStatus(res));`
	`95`	`+ fprintf(stderr, "query error: %s\n", PQresultErrorMessage(res));`
`96`	`96`	`else`
`97`	`97`	`fprintf(stderr, "connection error: %s\n", PQerrorMessage(conn));`
`98`	`98`	`PQfinish(conn);`
`99`		`- halt("failed request: %s\n", query);`
	`99`	`+ halt("failed query: %s\n", query);`
`100`	`100`	`}`
`101`	`101`	`tuple = 0;`
`102`	`102`	`return res;`