mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated version.

Browse Source
This commit is contained in:
Bruce Momjian 1996-09-26 00:48:48 +00:00
parent fd067981be
commit dac4058722
3 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
contrib/pginterface/pginterface.c
View File

@ -99,15 +99,15 @@ PGresult *doquery(char *query)
int fetch(void *param, ...) int fetch(void *param, ...)
{ {
va_list ap; va_list ap;
int arg, num_args; int arg, num_fields;
num_args = PQnfields(res); num_fields = PQnfields(res);
if (tuple >= PQntuples(res)) if (tuple >= PQntuples(res))
return END_OF_TUPLES; return END_OF_TUPLES;
va_start(ap, param); va_start(ap, param);
for (arg = 0; arg < num_args; arg++) for (arg = 0; arg < num_fields; arg++)
{ {
if (param != NULL) if (param != NULL)
{ {
@ -127,36 +127,43 @@ int fetch(void *param, ...)
/* /*
** **
** fetchisnull - returns tuple number (starts at 0), or the value END_OF_TUPLES ** fetchwithnulls - returns tuple number (starts at 0),
** NULL pointers are skipped ** or the value END_OF_TUPLES
** Returns true or false into null indicator variables ** Returns true or false into null indicator variables
** NULL pointers are skipped
*/ */
int fetchisnull(void *param, ...) int fetchwithnulls(void *param, ...)
{ {
va_list ap; va_list ap;
int arg, num_args; int arg, num_fields;
if (tuple == 0) num_fields = PQnfields(res);
halt("pginterface:fetchisnull(): You must call fetch() first.\n");
num_args = PQnfields(res); if (tuple >= PQntuples(res))
if (tuple-1 >= PQntuples(res))
return END_OF_TUPLES; return END_OF_TUPLES;
va_start(ap, param); va_start(ap, param);
for (arg = 0; arg < num_args; arg++) for (arg = 0; arg < num_fields; arg++)
{ {
if (param != NULL) if (param != NULL)
{ {
if (PQgetisnull(res,tuple-1,arg) != 0) if (PQfsize(res, arg) == -1)
*(int *)param = 1; {
memcpy(param,PQgetvalue(res,tuple,arg),PQgetlength(res,tuple,arg));
((char *)param)[PQgetlength(res,tuple,arg)] = NUL;
}
else else
*(int *)param = 0; memcpy(param,PQgetvalue(res,tuple,arg),PQfsize(res,arg));
} }
param = va_arg(ap, char *); param = va_arg(ap, char *);
if (PQgetisnull(res,tuple,arg) != 0)
*(int *)param = 1;
else
*(int *)param = 0;
param = va_arg(ap, char *);
} }
va_end(ap); va_end(ap);
return tuple-1; return tuple++;
} }
/* /*

2
contrib/pginterface/pginterface.h
View File

@ -7,7 +7,7 @@ PGresult *doquery(char *query);
PGconn *connectdb(); PGconn *connectdb();
void disconnectdb(); void disconnectdb();
int fetch(void *param, ...); int fetch(void *param, ...);
int fetchisnull(void *param, ...); int fetchwithnulls(void *param, ...);
void on_error_continue(); void on_error_continue();
void on_error_stop(); void on_error_stop();

31
contrib/pginterface/pgnulltest.c
View File

@ -3,14 +3,14 @@
* *
*/ */
/*#define TEST_NON_NULLS*/ #define TEST_NON_NULLS
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include <halt.h>
#include <libpq-fe.h> #include <libpq-fe.h>
#include "halt.h" #include <pginterface.h>
#include "pginterface.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -84,16 +84,25 @@ int main(int argc, char **argv)
doquery("FETCH ALL IN c_testfetch"); doquery("FETCH ALL IN c_testfetch");
if (fetch( if (fetchwithnulls(
&aint, &aint,
&aint_null,
&afloat, &afloat,
&afloat_null,
&adouble, &adouble,
&adouble_null,
achar, achar,
&achar_null,
achar16, achar16,
&achar16_null,
abpchar, abpchar,
&abpchar_null,
avarchar, avarchar,
&avarchar_null,
atext, atext,
&aabstime) != END_OF_TUPLES) &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\nchar16 %s\n\
bpchar %s\nvarchar %s\ntext %s\nabstime %s\n", bpchar %s\nvarchar %s\ntext %s\nabstime %s\n",
aint, aint,
@ -105,16 +114,6 @@ bpchar %s\nvarchar %s\ntext %s\nabstime %s\n",
avarchar, avarchar,
atext, atext,
ctime(&aabstime)); ctime(&aabstime));
if (fetchisnull(
&aint_null,
&afloat_null,
&adouble_null,
&achar_null,
&achar16_null,
&abpchar_null,
&avarchar_null,
&atext_null,
&aabstime_null) != END_OF_TUPLES)
printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\nchar16 %d\n\ printf("NULL:\nint %d\nfloat %d\ndouble %d\nchar %d\nchar16 %d\n\
bpchar %d\nvarchar %d\ntext %d\nabstime %d\n", bpchar %d\nvarchar %d\ntext %d\nabstime %d\n",
aint_null, aint_null,
@ -130,7 +129,7 @@ bpchar %d\nvarchar %d\ntext %d\nabstime %d\n",
doquery("CLOSE c_testfetch"); doquery("CLOSE c_testfetch");
doquery("COMMIT WORK"); doquery("COMMIT WORK");
printf("--- 1 row inserted\n"); printf("--- %-d rows inserted so far\n",row);
row++; row++;