postgres 0.7.9.2008.01.03 → 0.7.9.2008.01.09

data/README

@@ -59,27 +59,55 @@ For example:
   ruby extconf.rb --with-pgsql-include=/usr/local/pgsql/include \
                   --with-pgsql-lib=/usr/local/pgsql/lib
 
-- How to use ?
-
-You need to specify:
+- Modules
 
-  require 'pg' or
-  require 'postgres'
+'pg': The 'pg' module is the newer module, that has been greatly improved, and
+  is almost a complete rewrite. It is not backwards compatible. Use this module
+  for newly written code. It should be more stable, less buggy, and has more
+  features.
 
-These are two different modules, with important differences.
+'postgres': Older module, maintained for backwards compatibility. It 
+  has known flaws that aren't reasonably fixable without breaking backwards
+  compatibility. Use this module if you have code that already works, and 
+  you just want the fixes that I've committed to this module (for instance,
+  this module is compatible with PostgreSQL 8.3).
 
-The 'postgres' module is the older module, maintained for backwards
-compatibility. It has known flaws that aren't reasonably fixable without
-breaking backwards compatibility. Use this module if you have code that
-already works, and you just want the fixes that I've committed to this
-module (for instance, this module is compatible with PostgreSQL 8.3).
-
-The 'pg' module is the newer module, that has been greatly improved, and
-is almost a complete rewrite. It is not backwards compatible. Use this module
-for newly written code. It should be more stable, less buggy, and has more
-features.
+- How to use ?
 
-See the RDoc documentation for detailed usage instructions.
+This gem builds and installs two PostgreSQL database adapters, 'postgres'
+and 'pg'. 'postgres' is currently (Jan 2008) the recommended PostgreSQL
+adapter for use with Rails.
+
+The standard way to download and install the most current stable  
+version of the postgres gem (from http://gems.rubyforge.org) is to use  
+the RubyGem package manager. You may need to supply RubyGem with the 
+location of the libpq library and the libpq.h and libpq/libpq-fs.h 
+files, and may need to run as root.
+If you installed from source on a Unix system you can locate these  
+libpq files with:
+find <path to install directory> -name "libpq-fe.h" -print
+With binary distributions, you may need to install additional  
+PostgreSQL development libraries to get these files.
+
+Then run:
+sudo gem install postgres -- --with-pgsql-include-dir=<location of  
+Postgresql>/include --with-pgsql-lib-dir=<location of Postgresql/lib
+
+Example:
+on Mac OS X with PostgreSQL in /Library/PostgreSQL8 use
+--with-pgsql-include-dir=/Library/PostgreSQL8/include --with-pgsql-lib- 
+dir=/Library/PostgreSQL8/lib
+
+To use the postgres adapter with Rails:
+refer to it as
+adapter: postgresql
+in your database:yaml file
+
+The pg adapter cannot be used with Rails yet and is available for  
+testing and developer use.
+
+To use these modules in Ruby directly (not Rails), refer to the RDoc
+documentation.
 
 - Acknowledgments
 

data/ext/extconf.rb

@@ -19,33 +19,16 @@ end
 
 dir_config('pgsql', config_value('include'), config_value('lib'))
 
-desired_functions = %w(
-	PQsetClientEncoding 
-	PQfreemem 
-	PQescapeStringConn
-	PQprepare
-	PQescapeString
-	PQexecParams
-	PQconnectionUsedPassword
-	PQisthreadsafe
-	PQnparams
-	PQparamtype
-	PQsendDescribePrepared
-	PQsendDescribePortal
-	PQsendPrepare
-	PQencryptPassword
-	PQdescribePrepared
-	PQdescribePortal
-	lo_create
-	lo_truncate
-	pg_encoding_to_char 
-)
+required_libraries = []
+desired_functions = %w(PQsetClientEncoding pg_encoding_to_char PQfreemem PQserverVersion)
+compat_functions = %w(PQescapeString PQexecParams)
 
 if have_build_env
+  required_libraries.each(&method(:have_library))
   desired_functions.each(&method(:have_func))
-  $OBJS = ['pg.o','compat.o']
-  $CFLAGS << ' -Wall -Wmissing-prototypes'
-  create_makefile("pg")
+  $objs = ['postgres.o','libpq-compat.o'] if compat_functions.all?(&method(:have_func))
+  $CFLAGS << ' -Wall '
+  create_makefile("postgres")
 else
   puts 'Could not find PostgreSQL build environment (libraries & headers): Makefile not created'
 end

data/{compat-ruby-postgres → ext}/postgres.c

@@ -15,14 +15,16 @@
 #include "ruby.h"
 #include "rubyio.h"
 
-#if RUBY_VM == 1
-  /* ruby 1.9 */
-#include "ruby/st.h"
-#include "ruby/intern.h"
-#else
-  /* ruby 1.8 */
+#if RUBY_VM != 1
+#define RUBY_18_COMPAT
+#endif
+
+#ifdef RUBY_18_COMPAT
 #include "st.h"
 #include "intern.h"
+#else
+#include "ruby/st.h"
+#include "ruby/intern.h"
 #endif
 
 /* grep '^#define' $(pg_config --includedir)/server/catalog/pg_type.h | grep OID */
@@ -53,14 +55,6 @@ PQserverVersion(const PGconn *conn)
 #define RSTRING_PTR(x) RSTRING((x))->ptr
 #endif /* RSTRING_PTR */
 
-#if RUBY_VM == 1
-  /* ruby 1.9 */
-#define RB_REG_NEW(s, len, opt) rb_reg_new(rb_str_new((s),(len)), opt)
-#else
-  /* ruby 1.8 */
-#define RB_REG_NEW(s, len, opt) rb_reg_new((s), (len), (opt))
-#endif
-
 #ifndef HAVE_PG_ENCODING_TO_CHAR
 #define pg_encoding_to_char(x) "SQL_ASCII"
 #endif
@@ -925,7 +919,6 @@ pgconn_get_notify(obj)
     return ary;
 }
 
-static VALUE pg_escape_regex;
 static VALUE pg_escape_str;
 static ID    pg_gsub_bang_id;
 
@@ -980,7 +973,8 @@ pgconn_insert_table(obj, table, values)
                 rb_str_cat(buffer, "\\N",2);
             } else {
                 s = rb_obj_as_string(row->ptr[j]);
-                rb_funcall(s,pg_gsub_bang_id,2,pg_escape_regex,pg_escape_str);
+                rb_funcall(s,pg_gsub_bang_id,2,
+					rb_str_new("([\\t\\n\\\\])", 10),pg_escape_str);
                 rb_str_cat(buffer, StringValuePtr(s), RSTRING_LEN(s));
             }
         }
@@ -2617,8 +2611,6 @@ void
 Init_postgres()
 {
     pg_gsub_bang_id = rb_intern("gsub!");
-    pg_escape_regex = RB_REG_NEW("([\\t\\n\\\\])", 10, 0);
-    rb_global_variable(&pg_escape_regex);
     pg_escape_str = rb_str_new("\\\\\\1", 4);
     rb_global_variable(&pg_escape_str);
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: postgres
 version: !ruby/object:Gem::Version 
-  version: 0.7.9.2008.01.03
-date: 2008-01-03 00:00:00 -08:00
+  version: 0.7.9.2008.01.09
+date: 2008-01-09 00:00:00 -08:00
 summary: Ruby extension library providing an API to PostgreSQL
 require_paths: 
 - lib
@@ -39,24 +39,19 @@ files:
 - GPL
 - LICENSE
 - README
-- ext/compat.c
-- ext/compat.h
-- ext/pg.h
-- ext/pg.c
-- compat-ruby-postgres/libpq-compat.c
-- compat-ruby-postgres/type-oids.h
-- compat-ruby-postgres/postgres.c
+- ext/libpq-compat.c
+- ext/type-oids.h
+- ext/postgres.c
 test_files: []
 
 rdoc_options: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- ext/postgres.c
 executables: []
 
 extensions: 
 - ext/extconf.rb
-- compat-ruby-postgres/extconf.rb
 requirements: 
 - PostgreSQL libpq library and headers
 dependencies: []

data/compat-ruby-postgres/extconf.rb

@@ -1,34 +0,0 @@
-if RUBY_VERSION < '1.3'
-  puts 'This library is for ruby-1.3 or higher.'
-  exit 1
-end
-
-require 'mkmf'
-
-def config_value(type)
-  ENV["POSTGRES_#{type.upcase}"] || pg_config(type)
-end
-
-def pg_config(type)
-  IO.popen("pg_config --#{type}dir").readline.chomp rescue nil
-end
-
-def have_build_env
-  have_library('pq') && have_header('libpq-fe.h') && have_header('libpq/libpq-fs.h')
-end
-
-dir_config('pgsql', config_value('include'), config_value('lib'))
-
-required_libraries = []
-desired_functions = %w(PQsetClientEncoding pg_encoding_to_char PQfreemem PQserverVersion)
-compat_functions = %w(PQescapeString PQexecParams)
-
-if have_build_env
-  required_libraries.each(&method(:have_library))
-  desired_functions.each(&method(:have_func))
-  $objs = ['postgres.o','libpq-compat.o'] if compat_functions.all?(&method(:have_func))
-  $CFLAGS << ' -Wall '
-  create_makefile("postgres")
-else
-  puts 'Could not find PostgreSQL build environment (libraries & headers): Makefile not created'
-end