Drop PQprint() and related routines

Author: Tomoaki Nishiyama

RPostgreSQL/ChangeLog

@@ -1,3 +1,7 @@
+2025-03-28  Tomoaki NISHIYAMA <tomoaki@sci.u-toyama.ac.jp>
+        * Makevars.win rely on pkgconfig to find libpq on windows envirionment.
+        * Drop PQprint and related routines from the attached libpq library.
+
 2024-09-30  Tomoaki NISHIYAMA <tomoaki@sci.u-toyama.ac.jp>
         * Simplify tests
 

RPostgreSQL/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RPostgreSQL
-Version: 0.7-7
-Date: 2024-09-30
+Version: 0.7-8
+Date: 2025-03-28
 Title: R Interface to the 'PostgreSQL' Database System
 Maintainer: Tomoaki Nishiyama <tomoaki@sci.u-toyama.ac.jp>
 Description: Database interface and 'PostgreSQL' driver for 'R'.
@@ -14,9 +14,12 @@ Description: Database interface and 'PostgreSQL' driver for 'R'.
 LazyLoad: true
 Depends: R (>= 3.4.0), methods, DBI (>= 0.3)
 License: GPL-3 | file LICENSE
-Copyright: Authors listed above, PostgreSQL Global Development Group, and The Regents of the University of California
+Copyright: Authors listed above, PostgreSQL Global Development Group,
+        and The Regents of the University of California
 Collate: S4R.R zzz.R PostgreSQLSupport.R dbObjectId.R PostgreSQL.R
-URL: https://github.com/tomoakin/RPostgreSQL, https://cran.r-project.org/package=DBI, https://www.postgresql.org
+URL: https://github.com/tomoakin/RPostgreSQL,
+        https://cran.r-project.org/package=DBI,
+        https://www.postgresql.org
 Authors@R: c(person(given = "Joe",
                        family = "Conway",
                        role = "aut"),
@@ -34,3 +37,10 @@ Authors@R: c(person(given = "Joe",
                 person(given = "Neil",
                        family = "Tiffin",
                        role = "aut"))
+NeedsCompilation: yes
+Packaged: 2025-03-28 01:35:52 UTC; tomoaki
+Author: Joe Conway [aut],
+  Dirk Eddelbuettel [aut],
+  Tomoaki Nishiyama [aut, cre],
+  Sameer Kumar Prayaga [aut] (during 2008),
+  Neil Tiffin [aut]

RPostgreSQL/src/libpq/Makefile.darwin

@@ -37,7 +37,7 @@ LIBS := $(LIBS:-lpgport=)
 
 # We can't use Makefile variables here because the MSVC build system scrapes
 # OBJS from this file.
-OBJS=	fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+OBJS=	fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
 	fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
 	libpq-events.o
 # libpgport C files we always use

RPostgreSQL/src/libpq/Makefile.win

@@ -48,7 +48,7 @@ LIBS := $(LIBS:-lpgport=)
 
 # We can't use Makefile variables here because the MSVC build system scrapes
 # OBJS from this file.
-OBJS=	fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+OBJS=	fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-lobj.o \
 	fe-protocol2.o fe-protocol3.o pqexpbuffer.o fe-secure.o \
 	libpq-events.o
 # libpgport C files we always use

RPostgreSQL/src/libpq/bcc32.mak

@@ -92,7 +92,6 @@ CLEAN :
 	-@erase "$(INTDIR)\fe-exec.obj"
 	-@erase "$(INTDIR)\fe-lobj.obj"
 	-@erase "$(INTDIR)\fe-misc.obj"
-	-@erase "$(INTDIR)\fe-print.obj"
 	-@erase "$(INTDIR)\fe-secure.obj"
 	-@erase "$(INTDIR)\libpq-events.obj"
 	-@erase "$(INTDIR)\pqexpbuffer.obj"
@@ -138,7 +137,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\fe-exec.obj" \
 	"$(INTDIR)\fe-lobj.obj" \
 	"$(INTDIR)\fe-misc.obj" \
-	"$(INTDIR)\fe-print.obj" \
 	"$(INTDIR)\fe-secure.obj" \
 	"$(INTDIR)\libpq-events.obj" \
 	"$(INTDIR)\pqexpbuffer.obj" \

RPostgreSQL/src/libpq/blibpqdll.def

@@ -50,9 +50,6 @@ EXPORTS
     _PQgetisnull               @ 47
     _PQclear                   @ 48
     _PQmakeEmptyPGresult       @ 49
-    _PQprint                   @ 50
-    _PQdisplayTuples           @ 51
-    _PQprintTuples             @ 52
     _lo_open                   @ 53
     _lo_close                  @ 54
     _lo_read                   @ 55
@@ -223,9 +220,6 @@ EXPORTS
     PQgetisnull               = _PQgetisnull
     PQclear                   = _PQclear
     PQmakeEmptyPGresult       = _PQmakeEmptyPGresult
-    PQprint                   = _PQprint
-    PQdisplayTuples           = _PQdisplayTuples
-    PQprintTuples             = _PQprintTuples
     lo_open                   = _lo_open
     lo_close                  = _lo_close
     lo_read                   = _lo_read

RPostgreSQL/src/libpq/exports.txt

@@ -49,9 +49,6 @@ PQgetlength               46
 PQgetisnull               47
 PQclear                   48
 PQmakeEmptyPGresult       49
-PQprint                   50
-PQdisplayTuples           51
-PQprintTuples             52
 lo_open                   53
 lo_close                  54
 lo_read                   55

RPostgreSQL/src/libpq/libpq-fe.h

@@ -167,23 +167,6 @@ typedef struct pgNotify
 typedef void (*PQnoticeReceiver) (void *arg, const PGresult *res);
 typedef void (*PQnoticeProcessor) (void *arg, const char *message);
 
-/* Print options for PQprint() */
-typedef char pqbool;
-
-typedef struct _PQprintOpt
-{
-	pqbool		header;			/* print output field headings and row count */
-	pqbool		align;			/* fill align the fields */
-	pqbool		standard;		/* old brain dead format */
-	pqbool		html3;			/* output html tables */
-	pqbool		expanded;		/* expand tables */
-	pqbool		pager;			/* use pager for output if needed */
-	char	   *fieldSep;		/* field separator */
-	char	   *tableOpt;		/* insert to HTML <table ...> */
-	char	   *caption;		/* HTML <caption> */
-	char	  **fieldName;		/* null terminated array of replacement field
-								 * names */
-} PQprintOpt;
 
 /* ----------------
  * Structure for the conninfo parameter definitions returned by PQconndefaults
@@ -533,28 +516,6 @@ extern unsigned char *PQescapeBytea(const unsigned char *from, size_t from_lengt
 
 
 
-/* === in fe-print.c === */
-
-extern void PQprint(FILE *fout,				/* output stream */
-		const PGresult *res,
-		const PQprintOpt *ps);	/* option structure */
-
-/*
- * really old printing routines
- */
-extern void PQdisplayTuples(const PGresult *res,
-				FILE *fp,		/* where to send the output */
-				int fillAlign,	/* pad the fields with spaces */
-				const char *fieldSep,	/* field separator */
-				int printHeader,	/* display headers? */
-				int quiet);
-
-extern void PQprintTuples(const PGresult *res,
-			  FILE *fout,		/* output stream */
-			  int printAttName, /* print attribute names */
-			  int terseOutput,	/* delimiter bars */
-			  int width);		/* width of column, if 0, use variable width */
-
 
 /* === in fe-lobj.c === */
 

RPostgreSQL/src/libpq/libpqddll.def

@@ -50,9 +50,6 @@ EXPORTS
     PQgetisnull               @ 47
     PQclear                   @ 48
     PQmakeEmptyPGresult       @ 49
-    PQprint                   @ 50
-    PQdisplayTuples           @ 51
-    PQprintTuples             @ 52
     lo_open                   @ 53
     lo_close                  @ 54
     lo_read                   @ 55

RPostgreSQL/src/libpq/libpqdll.def

@@ -50,9 +50,6 @@ EXPORTS
     PQgetisnull               @ 47
     PQclear                   @ 48
     PQmakeEmptyPGresult       @ 49
-    PQprint                   @ 50
-    PQdisplayTuples           @ 51
-    PQprintTuples             @ 52
     lo_open                   @ 53
     lo_close                  @ 54
     lo_read                   @ 55