version 0.3-0

cran · Dec 29, 2011 · 195c2b6 · 195c2b6
1 parent 2157d2c
commit 195c2b6
Show file tree

Hide file tree

Showing 45 changed files with 6,318 additions and 854 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,72 @@
+2011-12-29  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Prepare for release. As the last update makes many incompatibilities,
+	the version number is large update.
+	Remove dbBeginTransaction which is not defined in DBI.
+
+	* ChangeLog
+	* DESCRIPTION
+	* NAMESPACE
+	* R/PostgreSQL.R
+	* inst/NEWS
+	* man/dbCommit-methods.Rd 
+
+2011-12-03  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Remove exported names that are not defined in DBI and may conflict other packages.
+	Remove safe.write, which is not used anymore.
+	Don't use make.db.names, which prevents using natural names.
+	Move dbBuildTableDefinition to postgresqlBuildTableDefinition.
+	Move isIdCurrent to isPostgresqlIdCurrent
+	row.names be integer rather than charactor for sqldf compatibility.
+
+	* NAMESPACE
+	* R/PostgreSQL.R
+	* R/PostgreSQLSupport.R
+	* R/dbObjectId.R
+	* man/safe.write.Rd
+	* man/dbBuildTableDefinition.Rd
+	* man/postgresqlBuildTableDefinition.Rd
+	* man/make.db.names-methods.Rd
+	* man/dbObjectId-class.Rd
+	* man/isIdCurrent.Rd
+	* man/isPostgresqlIdCurrent.Rd	
+	* man/postgresqlSupport.Rd
+
+2011-12-02  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Add clean: target to clean the libpq subdir on darwin
+
+	* src/Makevars.in
+
+2011-11-24  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Use internal libpq for Mac OS X without PostgreSQL installation
+
+	* config.guess
+	* config.sub
+	* configure
+	* configure.in
+	* install-sh
+	* Makevars.in
+	* src/libpq/netdb.h
+	* src/libpq/pwd.h	
+
+2011-11-22  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
+
+	Restructuring libpq directory so that the dynamic library for 
+	Mac OS X / darwin can be made with make -f Makefile.darwin in that
+	directory. Move windows specific include files to wininclude/ so
+	that they do not interfere darwin.  Configuration dependent files
+	are separated as *.win and *.darwin and that should be copied 
+	at the first step of make.  This is not enabled in OS X, though.
+
+	* ChangeLog
+	* src/Makevars.win
+	* src/libpq
+	* src/libpq/getaddrinfo.c: MinGW-w64 compatibility
+	* src/libpq/pg_config_os.h.win: MinGW-w64 compatibility
+
 2011-11-16  Tomoaki NISHIYAMA  <tomoakin@kenroku.asrc.kanazawa-u.ac.jp>
 
 	add LICENSE file

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,21 +1,21 @@
 Package: RPostgreSQL
-Version: 0.2-1
-Date: $Date: 2011-11-15 10:05:36 +0900 (Tue, 15 Nov 2011) $
+Version: 0.3-0
+Date: $Date: 2011-12-29 20:31:45 +0900 (Thu, 29 Dec 2011) $
 Title: R interface to the PostgreSQL database system
 Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar Prayaga (during 2008), Neil Tiffin
 Maintainer: Tomoaki Nishiyama <tomoakin@kenroku.kanazawa-u.ac.jp>
 Description: Database interface and PostgreSQL driver for R
  This package provides a Database Interface (DBI) compliant 
  driver for R to access PostgreSQL database systems.  
  .
-  In order to build and install this package from source, PostgreSQL 
+   In order to build and install this package from source, PostgreSQL 
  itself must be present your system to provide PostgreSQL functionality 
  via its libraries and header files. These files are provided as
  postgresql-devel package under some Linux distributions.
  .
-  On Microsoft Windows system the attached libpq library source will be used.
+   On Microsoft Windows system the attached libpq library source will be used.
  .
-  A wiki and issue tracking system for the package are available
+   A wiki and issue tracking system for the package are available
  at Google Code at https://code.google.com/p/rpostgresql/ .
 LazyLoad: true
 Depends: R (>= 2.9.0), methods, DBI (>= 0.1-4)
@@ -25,6 +25,6 @@ Copyright: Authors listed above, PostgreSQL Global Development Group,
 Collate: S4R.R zzz.R PostgreSQLSupport.R dbObjectId.R PostgreSQL.R
 URL: https://code.google.com/p/rpostgresql/,
         http://www.stat.bell-labs.com/RS-DBI, http://www.postgresql.org
-Packaged: 2011-11-16 13:29:58 UTC; tomoaki
+Packaged: 2011-12-29 11:33:03 UTC; tomoaki
 Repository: CRAN
-Date/Publication: 2011-11-17 11:25:30
+Date/Publication: 2011-12-30 11:22:37
diff --git a/MD5 b/MD5
@@ -1,18 +1,20 @@
-f1217e6c31e71c068b3571b935f1492f *ChangeLog
-df16d8e79cc7ad4b7d59b1c4b39b724e *DESCRIPTION
+261387fd2213ff4891e5215377f57304 *ChangeLog
+621ee210aae73326e24758cb1371481e *DESCRIPTION
 2627b2b4195d23fd892e25c925a01f93 *LICENSE
-a083b892f1d4735d8fb7c1249de4079c *NAMESPACE
-971309a88657cd2b87c444edc7a240c8 *R/PostgreSQL.R
-d490653d2c1a17c3cf756717b6ba91c1 *R/PostgreSQLSupport.R
+07abd6526506cad69dacbcd85056df39 *NAMESPACE
+2d9f70685a274782a6294593052b35c9 *R/PostgreSQL.R
+0dbd1b84e34cab9b0aef0a9f6bc67f88 *R/PostgreSQLSupport.R
 f1e33290ef23cbc9449f04fcbce86312 *R/S4R.R
-ca61a6a3db4052daa9bfb77b39f8d32a *R/dbObjectId.R
+ae8e0a406bd6a67e42a78955c7f52bb7 *R/dbObjectId.R
 c2656a583e3cdce783d45843fcff2dbf *R/zzz.R
 4b5e59c53d38086590d8d8553853ab04 *cleanup
-773d62a37eb2e922460f0341b07bdcf5 *configure
-c367fd46241b4d4df7ebb91c21035a4e *configure.in
+cd97f90bb8f96381bc90618f20f92e37 *config.guess
+1909cacd8bdd9e8b01df53649a497e74 *config.sub
+3a574e3eddc22cf029d1c4835227f4e9 *configure
+477fd14f85829c063699aa9ae871cf95 *configure.in
 d41d8cd98f00b204e9800998ecf8427e *configure.win
 a93eb17deebc9c9f4831891d57225b88 *inst/ANNOUNCEMENT
-6419c9e50f2b5da2e8e2bc1a35f21914 *inst/NEWS
+955d38471d059fdf5135aa37568c05e9 *inst/NEWS
 86063092fe732dcbc47a4830ca72703c *inst/README
 b73cbf6aae0e4d6ece79307f8a86713f *inst/THANKS
 f9bf927d77f5afe307d48292d82b935f *inst/TODO
@@ -23,7 +25,8 @@ b42cfbf562a28612beb8acfe0f716c61 *inst/devTests/demo.r
 0cda913b0e5e9141de5ee02ce25bff4d *inst/devTests/timeTypeComparison.r
 5c86f87f1eb660bf799f2a6e49e75175 *inst/devTests/transactionManagement.r
 cb8f0f0ce13da24f66f2ac2422cdbc01 *inst/devTests/typeTest.r
-77eac735f644004b6edac1586d7b11b6 *inst/doc/DBI.pdf
+d64267f49f5bae8c983da408c5f8295b *inst/doc/DBI.pdf
+d41d8cd98f00b204e9800998ecf8427e *install-sh
 3189110650497edadc574cf9deda2e7a *man/PostgreSQL.Rd
 34be8b01589cc63c1e2c14fc923a0296 *man/PostgreSQLConnection-class.Rd
 0c1f3f1574eb65bb535771cdf1445264 *man/PostgreSQLDriver-class.Rd
@@ -32,45 +35,46 @@ fb8d66f2760e85ca9feb85e662b82d4b *man/PostgreSQLResult-class.Rd
 78a38a9a8bcbb702d481059eac7a0bc9 *man/S4R.Rd
 d541cbaa9168c4d82b0d7e1e0288de9a *man/dbApply-methods.Rd
 03b366bccc90c81553c337f03b174e18 *man/dbApply.Rd
-5b0286cadfc219959e6dd94bffd9773f *man/dbBuildTableDefinition.Rd
 e8793fead8804448561a8ef74d1ec9f5 *man/dbCallProc-methods.Rd
-6161c493b615d3268145b2561e131609 *man/dbCommit-methods.Rd
+048861a5b7e12b1bdb93b1abaf9b841d *man/dbCommit-methods.Rd
 0fe9f7d5c7aa82dfdc4594d5b029f354 *man/dbConnect-methods.Rd
 9d7463dd5c62ad6702dc32ee19e3d6f0 *man/dbDataType-methods.Rd
 16246c517381c4a0e74d36ffbc2aceae *man/dbDriver-methods.Rd
 5e4129ab26a9e7b0f2fe1aa4f9c9a4f4 *man/dbGetInfo-methods.Rd
 063fdd9be6e9440d405ada10da29bf2c *man/dbListTables-methods.Rd
-1f401a3b221a4a74051245a041d2595b *man/dbObjectId-class.Rd
+e5dcc62d043e378ffdb08cea2843811f *man/dbObjectId-class.Rd
 36bafe436524fea4a766cac5ce3c5e4c *man/dbReadTable-methods.Rd
 27c949fc943dcd0a41b61b04cc6724c4 *man/dbSendQuery-methods.Rd
 adbcc9466e503793f67868bad5dd9b41 *man/dbSetDataMappings-methods.Rd
 9f49bb52f31cefb5e3bd8f66aecc1a35 *man/fetch-methods.Rd
-aef8560a58ffaa3354ba2a548ea39ac8 *man/isIdCurrent.Rd
-10934b7b2eb4f46d9b8ef94a2f2971c1 *man/make.db.names-methods.Rd
+1d66e31f344b817db3ea90719f14c2b3 *man/isPostgresqlIdCurrent.Rd
+cf55e6b7dbfc0e553833452c1e56d460 *man/make.db.names-methods.Rd
+09e873e5bfb1341f94a0384fe54bd2e8 *man/postgresqlBuildTableDefinition.Rd
 efefe77c91468729e7f3f44d2baa9e96 *man/postgresqlDBApply.Rd
-dc62aab5a4ce07716e7cbd69c82cb070 *man/postgresqlSupport.Rd
-e22aeddbc1c8d8d04ee0f536166713eb *man/safe.write.Rd
+53c37275687ec67b72eecaee8864148f *man/postgresqlSupport.Rd
 1fa83980e75922372ce35309a6d37ab7 *man/summary-methods.Rd
-24aa0fad49df0e4479cdfd2f99cd1f64 *src/Makevars.in
-93e644d809bb329b6fd170d73bc6d989 *src/Makevars.win
-360d56ab8e16e5ad9f01681f6df2e9ab *src/RS-DBI.c
+dfb46290a95f007ee31c9b1629cb48c1 *src/Makevars.in
+369b2e58786107e237d9b802c91e5ad2 *src/Makevars.win
+cc7a9148d6dd10737d8d920f477ecd22 *src/RS-DBI.c
 998b2d43ef87d0b5b6e5e286b1766d8f *src/RS-DBI.h
-5b488ef734010f7afc260ad6c304727b *src/RS-PQescape.c
-71c5da238e490560ef26298c574e5314 *src/RS-PostgreSQL.c
+36dbad7938bb2d8b33267b7363c8ef09 *src/RS-PQescape.c
+a6b48d7f0b91479d3b2174b338b3c9fa *src/RS-PostgreSQL.c
 a097d25581003eb54dba6f63338e0ad4 *src/RS-PostgreSQL.h
-496beffb676fac86d5c66858b41eece0 *src/RS-pgsql-copy.c
+9df3f59ddf2ae1c959651a25ff8377b3 *src/RS-pgsql-copy.c
 6422d3349928db0c1b94509e8b1d7557 *src/RS-pgsql-getResult.c
 3029b173216fd1941bc6c9d4fbbd3249 *src/RS-pgsql-pqexec.c
 25f7757eb3ce49bd5c0faf5d38995a84 *src/S4R.h
 77057ba352b034dc40f586b1d1bc366e *src/install.libs.R
 ef344a9f1740fa86ca1465e306fc30bf *src/libpq/COPYRIGHT
-5b90ef53641b473c86c005bc67f187dd *src/libpq/Makefile
-1713343aee2a98ddd61575d234296d3c *src/libpq/Makefile.global.win32
+70210c09c015458c661a500f794d90cd *src/libpq/Makefile.darwin
+ad0f605aa54b56a24bad2eaff5f9e770 *src/libpq/Makefile.global.darwin
+68fccef5a928cb81f1ac95bc34d722f2 *src/libpq/Makefile.global.win32
 8f0de03c91bc82b1e1aeb7db7887615e *src/libpq/Makefile.global.win64
 27f3f61b48248452f421f708fcc383ca *src/libpq/Makefile.port
+cd612b52f4c8225182a8dbd899de2b18 *src/libpq/Makefile.port.darwin
 647192f64017e456bf5e06f3863e5b6a *src/libpq/Makefile.shlib
+47e0409e9d91e5d88113ea064cf86444 *src/libpq/Makefile.win
 92c6d2478320dcb7596b189e1404f462 *src/libpq/README
-4cae11cc0c3bf77885b72b91efbee2fa *src/libpq/arpa/inet.h
 81fa40bc86309f5f19a5173a0691fc0e *src/libpq/bcc32.mak
 f6603683fd65a79d90fe3e5036416d98 *src/libpq/blibpqdll.def
 7e3d6085467e76c82e87bdea1d207cfa *src/libpq/c.h
@@ -88,7 +92,7 @@ b6912e592c3cd685ff215a02b5c5c57c *src/libpq/fe-print.c
 ca4db5c3bed90289825dc97c1645089f *src/libpq/fe-protocol2.c
 8002a285b31897f9ab2140a8f33e9809 *src/libpq/fe-protocol3.c
 b42de4a87499436f38f4dc990f08d2b7 *src/libpq/fe-secure.c
-7795b5dc08f93c87d874926f8c654afe *src/libpq/getaddrinfo.c
+35e68a9b154334d7d8c21e5226191f46 *src/libpq/getaddrinfo.c
 76855922e8fd0f21cc447dde44a0049a *src/libpq/getaddrinfo.h
 320944de061a55634f09b43d114fde9f *src/libpq/inet_aton.c
 432749fd6aec100b5f505eedc59b77d8 *src/libpq/inet_net_ntop.c
@@ -116,15 +120,16 @@ c544bf6c9ee787e0fbf5ca281f19b3c9 *src/libpq/libpqddll.def
 5dbd31ecc66e578f0975bd09f5893f4f *src/libpq/libpqdll.def
 a0dac5fc25df3d478c46fcdf859a4a77 *src/libpq/mb/pg_wchar.h
 58ea4a0910632af9a7c5bc1bdfbc5119 *src/libpq/md5.c
-cfed432d1e862194c9d7d4ad3825152c *src/libpq/netdb.h
-598821c8d2b484bb02ac46b9bd19b6bf *src/libpq/netinet/in.h
 0f530ef990e31c4d1d8846355b21433d *src/libpq/nls.mk
 591fcbd4602ea8aa38d3933a2fd8edc8 *src/libpq/noblock.c
 53c7cba0a18f270cb27ca5cd0a8fe39a *src/libpq/open.c
-a7f14b752cf6cfc80f5805462f097445 *src/libpq/pg_config.h
+2ee708f79f469f49d70e9f32f114f8ee *src/libpq/pg_config.h.darwin
+a7f14b752cf6cfc80f5805462f097445 *src/libpq/pg_config.h.win
 6e87ad70bd75ee52979dbd79dd2757ed *src/libpq/pg_config_manual.h
-e3a99f96132aaa565ebfac0b422c4373 *src/libpq/pg_config_os.h
-5d38f79637e5d954690553ea6c886b81 *src/libpq/pg_config_paths.h
+a37d3d0227d5546d364f4364152aea1b *src/libpq/pg_config_os.h.darwin
+925f82c05f230d1a1660bb0600cf41f0 *src/libpq/pg_config_os.h.win
+5d38f79637e5d954690553ea6c886b81 *src/libpq/pg_config_paths.h.darwin
+5d38f79637e5d954690553ea6c886b81 *src/libpq/pg_config_paths.h.win
 67dd9d47c05e99220210707dbbe8fe13 *src/libpq/pg_service.conf.sample
 2fc8987699670052720f0e50d9aa65b7 *src/libpq/pgsleep.c
 1ddedb705fd0c2d3dac3ac4007583795 *src/libpq/pgstrcasecmp.c
@@ -137,18 +142,21 @@ dce5ee7a0dc21e9e8f9900833862a979 *src/libpq/pqexpbuffer.h
 c6509da073988f5cf798504688442e63 *src/libpq/pqsignal.h
 c18860b10e49a49e546ac4c081a2bb7c *src/libpq/pthread-win32.c
 1508c7669b0ecac16eb52594ce521b03 *src/libpq/pthread-win32.h
-ee8cd495cd23d4dec2eefbdc537f33f4 *src/libpq/pwd.h
 9a0df9e44a33b8a4dba5f37c7fbf375b *src/libpq/snprintf.c
 074de10a61155a67b9f2414a516e8bbb *src/libpq/strlcpy.c
-d982865355149572df8b37929da4894a *src/libpq/sys/socket.h
-328dc7600d5a2acd6b82acc37cb6b7ce *src/libpq/sys/wait.h
 b16f3a73527079d3dbf0470f80c96a3f *src/libpq/thread.c
 80097bb3b80795f3a1f79c5569fece88 *src/libpq/wchar.c
 ae5ff84a1464a71dc36f0030c7c93423 *src/libpq/win32.c
 6411c74abfb7e08ff4ea01a680cbb346 *src/libpq/win32.h
 19c6c698b953b2ae1a55834df9e9a032 *src/libpq/win32.mak
 35c3dfe3358e7534e18549b2d70bfe24 *src/libpq/win32error.c
 09c2f2968550edddb77f5a1213f939f5 *src/libpq/win32setlocale.c
+4cae11cc0c3bf77885b72b91efbee2fa *src/libpq/wininclude/arpa/inet.h
+cfed432d1e862194c9d7d4ad3825152c *src/libpq/wininclude/netdb.h
+598821c8d2b484bb02ac46b9bd19b6bf *src/libpq/wininclude/netinet/in.h
+ee8cd495cd23d4dec2eefbdc537f33f4 *src/libpq/wininclude/pwd.h
+d982865355149572df8b37929da4894a *src/libpq/wininclude/sys/socket.h
+328dc7600d5a2acd6b82acc37cb6b7ce *src/libpq/wininclude/sys/wait.h
 f62197ce4f6f73cf0f62b9c99493d736 *tests/connectWithNull.R
 bc4feb5f45590b44f80befe2930a8a21 *tests/connectWithNull.Rout.save
 3f379b98fb19a5875ee1f50bfaa4401a *tests/createTableMixedCaseTest.R

diff --git a/NAMESPACE b/NAMESPACE
@@ -17,7 +17,6 @@ exportClasses(
 exportMethods(
    coerce,
    dbApply,
-   dbBeginTransaction,
    dbCallProc,
    dbClearResult,
    dbColumnInfo,
@@ -59,8 +58,8 @@ exportMethods(
 ## regular functions (most of these will be made private)
 export(
   PostgreSQL,
-  dbBuildTableDefinition,
-  isIdCurrent,
+  postgresqlBuildTableDefinition,
+  isPostgresqlIdCurrent,
   .PostgreSQLKeywords,
   postgresqlInitDriver,
   postgresqlCloseDriver,
@@ -89,8 +88,7 @@ export(
   postgresqlEscapeStrings,
   postgresqlDataType,
   postgresqlQuoteId,
-  postgresqlTableRef,
-  safe.write
+  postgresqlTableRef
 )
 
 ## constants

diff --git a/R/PostgreSQL.R b/R/PostgreSQL.R
@@ -1,5 +1,5 @@
 ## PostgreSQL.R
-## $Id: PostgreSQL.R 189 2011-10-01 13:16:39Z dirk.eddelbuettel $
+## $Id: PostgreSQL.R 223 2011-12-29 11:31:45Z tomoakin@kenroku.kanazawa-u.ac.jp $
 
 ## This package was developed as a part of Summer of Code program organized by Google.
 ## Thanks to David A. James & Saikat DebRoy, the authors of RMySQL package.
@@ -12,26 +12,11 @@
 
 ##.PostgreSQLRCS <- "$Id: PostgreSQL.R,v 0.1 2008/06/10 14:00:00$"
 .PostgreSQLPkgName <- "RPostgreSQL"
-.PostgreSQLVersion <- "0.2-0"       ##package.description(.PostgreSQLPkgName, fields = "Version")
+.PostgreSQLVersion <- "0.3-0"       ##package.description(.PostgreSQLPkgName, fields = "Version")
 .PostgreSQL.NA.string <- "\\N"      ## on input, PostgreSQL interprets \N as NULL (NA)
 
 setOldClass("data.frame")      ## to appease setMethod's signature warnings...
 
-## ------------------------------------------------------------------
-## Begin DBI extensions:
-##
-## dbBeginTransaction
-##
-setGeneric("dbBeginTransaction",
-           def = function(conn, ...)
-           standardGeneric("dbBeginTransaction"),
-           valueClass = "logical"
-           )
-##
-## End DBI extensions
-## ------------------------------------------------------------------
-
-
 ##
 ## Class: DBIObject
 ##
@@ -120,7 +105,7 @@ setMethod("dbGetQuery",
 
 setMethod("dbGetException", "PostgreSQLConnection",
           def = function(conn, ...){
-              if(!isIdCurrent(conn))
+              if(!isPostgresqlIdCurrent(conn))
                   stop(paste("expired", class(conn)))
               .Call("RS_PostgreSQL_getException", as(conn, "integer"),
                     PACKAGE = .PostgreSQLPkgName)
@@ -264,9 +249,6 @@ setMethod("dbRollback", "PostgreSQLConnection",
           }
           )
 
-setMethod("dbBeginTransaction", "PostgreSQLConnection",
-          def = function(conn, ...) postgresqlTransactionStatement(conn, "BEGIN")
-          )
 
 ##
 ## Class: DBIResult
@@ -377,7 +359,7 @@ setMethod("dbDataType",
 setMethod("make.db.names",
           signature(dbObj="PostgreSQLObject", snames = "character"),
           def = function(dbObj, snames,keywords,unique, allow.keywords,...){
-              make.db.names.default(snames, keywords = .PostgreSQLKeywords,unique, allow.keywords)
+              postgresqlQuoteId(snames)
           },
           valueClass = "character"
           )