do_postgres 0.10.0-x86-mingw32 → 0.10.1-x86-mingw32

data/ChangeLog.markdown

@@ -0,0 +1,22 @@
+## 0.10.1 (unreleased, in git)
+
+* Support for Ruby 1.8 and 1.9 on Windows.
+* Switch to Jeweler for Gem building tasks (this change may be temporary).
+* Switch to using Bacon for running specs: This should make specs friendlier to
+  new Ruby implementations that are not yet 100% MRI-compatible, and in turn,
+  prepared the road for our own IronRuby and MacRuby support.
+* Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
+  JRuby extensions, instead of our (broken) home-grown solution.
+
+## 0.9.12 2009-05-17
+* Improvements
+  * Windows support
+
+## 0.9.11 2009-01-19
+* Improvements
+  * Ruby 1.9 support
+* Fixes
+  * Fix build issue on certain platforms introduces with 0.9.10
+
+## 0.9.9 2008-11-27
+* No changes since 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008, 2009 Yehuda Katz, Dirkjan Bussink
+Copyright (c) 2007 - 2010 Yehuda Katz, Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,4 +1,107 @@
-do_postgres
-===========
+# do_postgres
 
-A PostgreSQL driver for DataObjects
+* <http://dataobjects.info>
+
+## Description
+
+A PostgreSQL driver for DataObjects.
+
+## Features/Problems
+
+This driver implements the DataObjects API for the PostgreSQL relational database.
+
+## Synopsis
+
+An example of usage:
+
+    # default user (postgres, postgres), default port (5432)
+    DataObjects::Connection.new("postgres://host/database")
+    # specified user, specified port
+    DataObjects::Connection.new("postgres://user:pass@host:8888/database")
+
+    @connection = DataObjects::Connection.new("postgres://localhost/employees")
+    @reader = @connection.create_command('SELECT * FROM users').execute_reader
+    @reader.next!
+
+In the future, the `Connection` constructor will be able to be passed either a
+DataObjects-style URL or JDBC style URL, when using do\_postgres on JRuby.
+However, this feature is not currently working reliably and is a known issue.
+
+## Requirements
+
+This driver is provided for the following platforms:
+ * Ruby MRI (1.8.6/7), 1.9: tested on Linux, Mac OS X and Windows platforms.
+ * JRuby 1.3.1 + (1.4+ recommended).
+ * Rubinius (experimental).
+
+Additionally you should have the following prerequisites:
+ * `data_objects` gem
+ * `do_jdbc` gem (shared library), if running on JRuby.
+
+## Install
+
+To install the gem:
+
+    gem install do_postgres
+
+To compile and install from source:
+
+* Install rake-compiler: `gem install rake-compiler`.
+
+* For MRI/Rubinius extensions:
+  * Install the `gcc` compiler. On OS X, you should install XCode tools. On
+    Ubuntu, run `apt-get install build-essential`.
+  * Install Ruby and PostgreSQL client.
+  * Install the Ruby and PostgreSQL development headers.
+    * On Debian-Linux distributions, you can install the following packages
+      with `apt`: `ruby-dev` `libpostgresql-dev`.
+  * If you want to cross-compile for Windows:
+    * Install MinGW:
+      * On Debian-Linux distributions, you can install the following package
+        with `apt`: `mingw32`.
+      * On OS X, this can install the following package with MacPorts: `i386-mingw32-gcc`.
+    * Run `rake-compiler cross-ruby`.
+    * Run `rake-compiler update-config`.
+
+ * For JRuby extensions:
+   * Install the Java Development Kit (provided if you are
+     on a recent version of Mac OS X) from <http://java.sun.com>.
+   * Install a recent version of JRuby. Ensure `jruby` is in your `PATH` and/or
+     you have configured the `JRUBY_HOME` environment variable to point to your
+     JRuby installation.
+   * Install `data_objects` and `do_jdbc` with `jruby -S rake install`.
+
+ * Then, install this driver with `(jruby -S) rake install`.
+
+For more information, see the PostgreSQL driver wiki page:
+<http://wiki.github.com/datamapper/do/postgresql>.
+
+## Developers
+
+Follow the above installation instructions. Additionally, you'll need:
+  * `bacon` gem for running specs.
+  * `YARD` gem for generating documentation.
+
+See the DataObjects wiki for more comprehensive information on installing and
+contributing to the JRuby-variant of this driver:
+<http://wiki.github.com/datamapper/do/jruby>.
+
+To run specs:
+
+    rake spec
+
+To run specs without compiling extensions first:
+
+    rake spec_no_compile
+
+To run individual specs:
+
+    rake spec TEST=spec/connection_spec.rb
+
+(Note that the `rake` task uses a `TEST` parameter, not `SPEC`. This is because
+the `Rake::TestTask` is used for executing the Bacon specs).
+
+## License
+
+This code is licensed under an **MIT (X11) License**. Please see the
+accompanying `LICENSE` file.

data/Rakefile

@@ -1,16 +1,63 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-require 'pathname'
-require 'lib/do_postgres/version'
+ROOT = Pathname(__FILE__).dirname.expand_path
+
+require ROOT + 'lib/do_postgres/version'
+
+JRUBY    = RUBY_PLATFORM =~ /java/
+IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
+WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
+SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
+BINARY_VERSION = '8.3.9'
+
+CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_postgres/Makefile ext-java/target ])
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'do_postgres'
+    gem.version     = DataObjects::Postgres::VERSION
+    gem.summary     = 'DataObjects PostgreSQL Driver'
+    gem.description = 'Implements the DataObjects API for PostgreSQL'
+    gem.platform    = Gem::Platform::RUBY
+    gem.files       = Dir['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
+                          'ext/**/*.{rb,c,h}', 'LICENSE', 'Rakefile',
+                          '*.{markdown,rdoc,txt,yml}']
+    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
+    gem.test_files  = FileList['spec/**/*.rb']
+
+    # rake-compiler should generate gemspecs for other platforms (e.g. 'java')
+    # and modify dependencies and extensions appropriately
+    gem.extensions << 'ext/do_postgres/extconf.rb'
+
+    gem.add_dependency 'data_objects', DataObjects::Postgres::VERSION
+
+    gem.add_development_dependency 'bacon',         '~>1.1'
+    gem.add_development_dependency 'rake-compiler', '~>0.7'
+
+    gem.has_rdoc = false
+    gem.rubyforge_project = 'dorb'
+    gem.authors     = [ 'Dirkjan Bussink' ]
+    gem.email       = 'd.bussink@gmail.com'
+  end
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '5.0.77'
+  if JRUBY
+    Rake::Task['build'].clear_actions   if Rake::Task.task_defined?('build')
+    Rake::Task['install'].clear_actions if Rake::Task.task_defined?('install')
+    task :build => [ :java, :gem ]
+    task :install do
+      sh "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem install pkg/do_postgres-#{DataObjects::Postgres::VERSION}-java.gem"
+    end
+  end
 
-Dir['tasks/*.rake'].sort.each { |f| import f }
+  Jeweler::GemcutterTasks.new
 
-CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_postgres_ext/Makefile ext-java/target ])
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/ext/do_postgres/compat.h

@@ -0,0 +1,55 @@
+#ifndef RUBY_COMPAT_H
+#define RUBY_COMPAT_H
+
+/*
+ * Rules for better ruby C extensions:
+ *
+ * Never use the R<TYPE> macros directly, always use R<TYPE>_<FIELD>
+ *
+ * Never compare with RBASIC(obj)->klass, always use
+ *   rb_obj_is_instance_of()
+ *
+ * Never use RHASH(obj)->tbl or RHASH_TBL().
+ *
+ */
+
+
+// Array
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(obj) RARRAY(obj)->ptr
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(obj) RARRAY(obj)->len
+#endif
+
+// String
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(obj) RSTRING(obj)->ptr
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(obj) RSTRING(obj)->len
+#endif
+
+#ifndef rb_str_ptr
+#define rb_str_ptr(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_ptr_readonly
+#define rb_str_ptr_readonly(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_flush
+#define rb_str_flush(str)
+#endif
+
+#ifndef rb_str_update
+#define rb_str_update(str)
+#endif
+
+#ifndef rb_str_len
+#define rb_str_len(str) RSTRING_LEN(str)
+#endif
+
+#endif

data/ext/{do_postgres_ext/do_postgres_ext.c → do_postgres/do_postgres.c}

@@ -15,6 +15,10 @@
 /* On Windows this stuff is also defined by Postgres, but we don't
    want to use Postgres' version actually */
 #undef fsync
+#undef ftruncate
+#undef fseeko
+#undef ftello
+#undef stat
 #undef vsnprintf
 #undef snprintf
 #undef sprintf
@@ -32,6 +36,7 @@
 #include <ctype.h>
 #include <time.h>
 #include "error.h"
+#include "compat.h"
 
 #define ID_CONST_GET rb_intern("const_get")
 #define ID_PATH rb_intern("path")
@@ -40,20 +45,6 @@
 
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
 #define POSTGRES_CLASS(klass, parent) (rb_define_class_under(mPostgres, klass, parent))
-#define DEBUG(value) data_objects_debug(value)
-#define RUBY_CLASS(name) rb_const_get(rb_cObject, rb_intern(name))
-
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(a) RARRAY(a)->len
-#endif
 
 #ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
@@ -122,8 +113,8 @@ static void data_objects_debug(VALUE string, struct timeval* start) {
   struct timeval stop;
   char *message;
 
-  char *query = RSTRING_PTR(string);
-  int length  = RSTRING_LEN(string);
+  const char *query = rb_str_ptr_readonly(string);
+  size_t length     = rb_str_len(string);
   char total_time[32];
   do_int64 duration = 0;
 
@@ -142,9 +133,9 @@ static void data_objects_debug(VALUE string, struct timeval* start) {
   }
 }
 
-static char * get_uri_option(VALUE query_hash, char * key) {
+static const char * get_uri_option(VALUE query_hash, const char * key) {
   VALUE query_value;
-  char * value = NULL;
+  const char * value = NULL;
 
   if(!rb_obj_is_kind_of(query_hash, rb_cHash)) { return NULL; }
 
@@ -178,7 +169,7 @@ static int jd_from_date(int year, int month, int day) {
   }
   a = year / 100;
   b = 2 - a + (a / 4);
-  return floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524;
+  return (int) (floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
 }
 
 static VALUE parse_date(const char *date) {
@@ -268,8 +259,8 @@ static VALUE parse_date_time(const char *date) {
     if ( is_dst > 0 )
       gmt_offset -= is_dst;
 
-    hour_offset = -(gmt_offset / 3600);
-    minute_offset = -(gmt_offset % 3600 / 60);
+    hour_offset = -((int)gmt_offset / 3600);
+    minute_offset = -((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -315,7 +306,7 @@ static VALUE parse_time(const char *date) {
     // right padding usec with 0. e.g. '012' will become 12000 microsecond, since Time#local use microsecond
     sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d.%s", &year, &month, &day, &hour, &min, &sec, subsec);
     usec   = atoi(subsec);
-    usec  *= pow(10, (6 - strlen(subsec)));
+    usec  *= (int) pow(10, (6 - strlen(subsec)));
   } else {
     tokens = sscanf(date, "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
     if (tokens == 3) {
@@ -384,7 +375,7 @@ static VALUE typecast(const char *value, long length, const VALUE type, int enco
     PQfreemem(unescaped);
     return byte_array;
   } else if (type == rb_cClass) {
-    return rb_funcall(rb_cObject, rb_intern("full_const_get"), 1, rb_str_new(value, length));
+    return rb_funcall(mDO, rb_intern("full_const_get"), 1, rb_str_new(value, length));
   } else if (type == rb_cObject) {
     return rb_marshal_load(rb_str_new(value, length));
   } else if (type == rb_cNilClass) {
@@ -498,11 +489,11 @@ static VALUE build_query_from_args(VALUE klass, int count, VALUE *args[]) {
 static VALUE cConnection_quote_string(VALUE self, VALUE string) {
   PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
 
-  const char *source = RSTRING_PTR(string);
-  int source_len     = RSTRING_LEN(string);
+  const char *source = rb_str_ptr_readonly(string);
+  size_t source_len  = rb_str_len(string);
 
   char *escaped;
-  int quoted_length = 0;
+  size_t quoted_length = 0;
   VALUE result;
 
   // Allocate space for the escaped version of 'string'
@@ -524,8 +515,8 @@ static VALUE cConnection_quote_string(VALUE self, VALUE string) {
 static VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
   PGconn *db = DATA_PTR(rb_iv_get(self, "@connection"));
 
-  const unsigned char *source = (unsigned char*) RSTRING_PTR(string);
-  size_t source_len     = RSTRING_LEN(string);
+  const unsigned char *source = (unsigned char*) rb_str_ptr_readonly(string);
+  size_t source_len     = rb_str_len(string);
 
   unsigned char *escaped;
   unsigned char *escaped_quotes;
@@ -563,6 +554,8 @@ static PGresult* cCommand_execute_sync(VALUE self, PGconn *db, VALUE query) {
 
   response = PQexec(db, str);
 
+  data_objects_debug(query, &start);
+
   if (response == NULL) {
     if(PQstatus(db) != CONNECTION_OK) {
       PQreset(db);
@@ -580,7 +573,6 @@ static PGresult* cCommand_execute_sync(VALUE self, PGconn *db, VALUE query) {
     }
   }
 
-  data_objects_debug(query, &start);
   return response;
 }
 #else
@@ -611,13 +603,15 @@ static PGresult* cCommand_execute_async(VALUE self, PGconn *db, VALUE query) {
     }
 
     if(!retval) {
-      rb_raise(eConnectionError, PQerrorMessage(db));
+      rb_raise(eConnectionError, "%s", PQerrorMessage(db));
     }
   }
 
   gettimeofday(&start, NULL);
   socket_fd = PQsocket(db);
 
+  data_objects_debug(query, &start);
+
   for(;;) {
       FD_ZERO(&rset);
       FD_SET(socket_fd, &rset);
@@ -631,7 +625,7 @@ static PGresult* cCommand_execute_async(VALUE self, PGconn *db, VALUE query) {
       }
 
       if (PQconsumeInput(db) == 0) {
-          rb_raise(eConnectionError, PQerrorMessage(db));
+          rb_raise(eConnectionError, "%s", PQerrorMessage(db));
       }
 
       if (PQisBusy(db) == 0) {
@@ -639,7 +633,6 @@ static PGresult* cCommand_execute_async(VALUE self, PGconn *db, VALUE query) {
       }
   }
 
-  data_objects_debug(query, &start);
   return PQgetResult(db);
 }
 #endif
@@ -698,14 +691,14 @@ static void full_connect(VALUE self, PGconn *db) {
 
   PGresult *result = NULL;
   VALUE r_host, r_user, r_password, r_path, r_port, r_query, r_options;
-  char *host = NULL, *user = NULL, *password = NULL, *path;
-  char *database = "", *port = "5432";
+  char *host = NULL, *user = NULL, *password = NULL, *path = NULL, *database = NULL;
+  const char *port = "5432";
   VALUE encoding = Qnil;
-  char *search_path = NULL;
+  const char *search_path = NULL;
   char *search_path_query = NULL;
-  char *backslash_off = "SET backslash_quote = off";
-  char *standard_strings_on = "SET standard_conforming_strings = on";
-  char *warning_messages = "SET client_min_messages = warning";
+  const char *backslash_off = "SET backslash_quote = off";
+  const char *standard_strings_on = "SET standard_conforming_strings = on";
+  const char *warning_messages = "SET client_min_messages = warning";
 
   if((r_host = rb_iv_get(self, "@host")) != Qnil) {
     host     = StringValuePtr(r_host);
@@ -747,7 +740,7 @@ static void full_connect(VALUE self, PGconn *db) {
   );
 
   if ( PQstatus(db) == CONNECTION_BAD ) {
-    rb_raise(eConnectionError, PQerrorMessage(db));
+    rb_raise(eConnectionError, "%s", PQerrorMessage(db));
   }
 
   if (search_path != NULL) {
@@ -757,32 +750,32 @@ static void full_connect(VALUE self, PGconn *db) {
     result = cCommand_execute(self, db, r_query);
 
     if (PQresultStatus(result) != PGRES_COMMAND_OK) {
-      free(search_path_query);
+      free((void *)search_path_query);
       raise_error(self, result, r_query);
     }
 
-    free(search_path_query);
+    free((void *)search_path_query);
   }
 
   r_options = rb_str_new2(backslash_off);
   result = cCommand_execute(self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
-    rb_warn(PQresultErrorMessage(result));
+    rb_warn("%s", PQresultErrorMessage(result));
   }
 
   r_options = rb_str_new2(standard_strings_on);
   result = cCommand_execute(self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
-    rb_warn(PQresultErrorMessage(result));
+    rb_warn("%s", PQresultErrorMessage(result));
   }
 
   r_options = rb_str_new2(warning_messages);
   result = cCommand_execute(self, db, r_options);
 
   if (PQresultStatus(result) != PGRES_COMMAND_OK) {
-    rb_warn(PQresultErrorMessage(result));
+    rb_warn("%s", PQresultErrorMessage(result));
   }
 
   encoding = rb_iv_get(self, "@encoding");
@@ -790,16 +783,16 @@ static void full_connect(VALUE self, PGconn *db) {
 #ifdef HAVE_PQSETCLIENTENCODING
   VALUE pg_encoding = rb_hash_aref(CONST_GET(mEncoding, "MAP"), encoding);
   if(pg_encoding != Qnil) {
-    if(PQsetClientEncoding(db, RSTRING_PTR(pg_encoding))) {
-      rb_raise(eConnectionError, "Couldn't set encoding: %s", RSTRING_PTR(encoding));
+    if(PQsetClientEncoding(db, rb_str_ptr_readonly(pg_encoding))) {
+      rb_raise(eConnectionError, "Couldn't set encoding: %s", rb_str_ptr_readonly(encoding));
     } else {
 #ifdef HAVE_RUBY_ENCODING_H
-      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(RSTRING_PTR(encoding))));
+      rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index(rb_str_ptr_readonly(encoding))));
 #endif
       rb_iv_set(self, "@pg_encoding", pg_encoding);
     }
   } else {
-    rb_warn("Encoding %s is not a known Ruby encoding for PostgreSQL\n", RSTRING_PTR(encoding));
+    rb_warn("Encoding %s is not a known Ruby encoding for PostgreSQL\n", rb_str_ptr_readonly(encoding));
     rb_iv_set(self, "@encoding", rb_str_new2("UTF-8"));
 #ifdef HAVE_RUBY_ENCODING_H
     rb_iv_set(self, "@encoding_id", INT2FIX(rb_enc_find_index("UTF-8")));
@@ -997,7 +990,7 @@ static VALUE cReader_field_count(VALUE self) {
   return rb_iv_get(self, "@field_count");
 }
 
-void Init_do_postgres_ext() {
+void Init_do_postgres() {
   rb_require("date");
   rb_require("bigdecimal");