do_postgres 0.10.2 → 0.10.3

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.3 2011-01-30
+* Reworked transactions
+* Fix a DST bug that could cause datetimes in the wrong timezone
+
 ## 0.10.2 2010-05-19
 * Make Encoding.default_internal aware
 * Rework logging for making callbacks possible

data/Rakefile

@@ -11,7 +11,7 @@ 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.10'
+BINARY_VERSION = '8.3.13'
 
 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 ])
 
@@ -38,7 +38,7 @@ begin
     gem.add_dependency 'data_objects', DataObjects::Postgres::VERSION
 
     gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '~>0.7'
+    gem.add_development_dependency 'rake-compiler', '= 0.7.0'
 
     gem.has_rdoc = false
     gem.rubyforge_project = 'dorb'

data/ext/do_postgres/do_postgres.c

@@ -201,10 +201,10 @@ static VALUE parse_date_time(const char *date) {
   do_int64 num, den;
 
   long int gmt_offset;
-  int is_dst;
+  int dst_adjustment;
 
   time_t rawtime;
-  struct tm * timeinfo;
+  struct tm timeinfo;
 
   int tokens_read, max_tokens;
 
@@ -234,22 +234,50 @@ static VALUE parse_date_time(const char *date) {
     }
     // We read the Date and Time, default to the current locale's offset
 
+    tzset();
+
     // Get localtime
     time(&rawtime);
-    timeinfo = localtime(&rawtime);
+#ifdef HAVE_LOCALTIME_R
+    localtime_r(&rawtime, &timeinfo);
+#else
+    // Thread unsafe, this is used on Windows...
+    timeinfo = *localtime(&rawtime);
+#endif
 
-    is_dst = timeinfo->tm_isdst * 3600;
+    timeinfo.tm_sec = sec;
+    timeinfo.tm_min = min;
+    timeinfo.tm_hour = hour;
+    timeinfo.tm_mday = day;
+    timeinfo.tm_mon = month;
+    timeinfo.tm_year = year - 1900;
+    timeinfo.tm_isdst = -1;
+
+    // Update tm_isdst
+    mktime(&timeinfo);
+
+    if (timeinfo.tm_isdst) {
+      dst_adjustment = 3600;
+    } else {
+      dst_adjustment = 0;
+    }
 
+#ifdef HAVE_GMTIME_R
     // Reset to GM Time
-    timeinfo = gmtime(&rawtime);
+    gmtime_r(&rawtime, &timeinfo);
+#else
+    // Same as for localtime_r above
+    timeinfo = *gmtime(&rawtime);
+#endif
 
-    gmt_offset = mktime(timeinfo) - rawtime;
+    gmt_offset = rawtime - mktime(&timeinfo);
 
-    if ( is_dst > 0 )
-      gmt_offset -= is_dst;
+    if (dst_adjustment) {
+      gmt_offset += dst_adjustment;
+    }
 
-    hour_offset = -((int)gmt_offset / 3600);
-    minute_offset = -((int)gmt_offset % 3600 / 60);
+    hour_offset = ((int)gmt_offset / 3600);
+    minute_offset = ((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -820,7 +848,11 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv[], VALUE self) {
   status = PQresultStatus(response);
 
   if ( status == PGRES_TUPLES_OK ) {
-    insert_id = INT2NUM(atoi(PQgetvalue(response, 0, 0)));
+    if (PQgetlength(response, 0, 0) == 0)  {
+      insert_id = Qnil;
+    } else {
+      insert_id = INT2NUM(atoi(PQgetvalue(response, 0, 0)));
+    }
     affected_rows = INT2NUM(atoi(PQcmdTuples(response)));
   }
   else if ( status == PGRES_COMMAND_OK ) {
@@ -984,6 +1016,7 @@ static VALUE cReader_field_count(VALUE self) {
 
 void Init_do_postgres() {
   rb_require("date");
+  rb_require("rational");
   rb_require("bigdecimal");
   rb_require("data_objects");
 

data/ext/do_postgres/extconf.rb

@@ -20,13 +20,13 @@ def have_build_env
   have_header('catalog/pg_type.h')
 end
 
-$CFLAGS << '-UENABLE_NLS -DHAVE_GETTIMEOFDAY -DHAVE_CRYPT' if RUBY_PLATFORM =~ /mswin|mingw/
+$CFLAGS << ' -UENABLE_NLS -DHAVE_GETTIMEOFDAY -DHAVE_CRYPT' if RUBY_PLATFORM =~ /mswin|mingw/
 
 dir_config('pgsql-server', config_value('includedir-server'), config_value('libdir'))
 dir_config('pgsql-client', config_value('includedir'), config_value('libdir'))
 dir_config('pgsql-win32') if RUBY_PLATFORM =~ /mswin|mingw/
 
-desired_functions = %w(PQsetClientEncoding pg_encoding_to_char PQfreemem)
+desired_functions = %w(localtime_r gmtime_r PQsetClientEncoding pg_encoding_to_char PQfreemem)
 compat_functions = %w(PQescapeString PQexecParams)
 
 if have_build_env

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    VERSION = '0.10.2'
+    VERSION = '0.10.3'
   end
 end

data/spec/connection_spec.rb

@@ -19,16 +19,22 @@ describe DataObjects::Postgres::Connection do
   # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
 
   describe 'byte array quoting' do
+    # There are two possible byte array quotings available: hex or escape.
+    # The default changed from escape to hex in version 9, so these specs
+    # check for either.
+    #
+    # http://developer.postgresql.org/pgdocs/postgres/datatype-binary.html
+    # http://developer.postgresql.org/pgdocs/postgres/release-9-0.html (E.3.2.3.)
     it 'should properly escape non-printable ASCII characters' do
-      @connection.quote_byte_array("\001").should.match(/'\\?\\001'/)
+      ["'\\001'", "'\\x01'"].should.include @connection.quote_byte_array("\001")
     end
 
     it 'should properly escape bytes with the high bit set' do
-      @connection.quote_byte_array("\210").should.match(/'\\?\\210'/)
+      ["'\\210'", "'\\x88'"].should.include @connection.quote_byte_array("\210")
     end
 
     it 'should not escape printable ASCII characters' do
-      @connection.quote_byte_array("a").should == "'a'"
+      ["'a'", "'\\x61'"].should.include @connection.quote_byte_array("a")
     end
   end
 end

data/spec/error/sql_error_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/error/sql_error_spec'
+
+describe 'DataObjects::Postgres raising SQLError' do
+  behaves_like 'raising a SQLError'
+end

data/spec/spec_helper.rb

@@ -139,6 +139,10 @@ module DataObjectsSpecHelpers
       update widgets set release_timestamp = NULL where id = 9
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = '2008-07-14 00:31:12' where id = 10
+    EOF
+
     conn.close
 
   end

data/tasks/compile.rake

@@ -73,7 +73,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-postgres', '>=8.2'
-      gem.add_dependency 'do_jdbc',       '0.10.2'
+      gem.add_dependency 'do_jdbc',       '0.10.3'
     end
   end
 rescue LoadError

data/tasks/release.rake

@@ -3,7 +3,7 @@ task :build_all do
   `rake clean`
   `rake build`
   `rake java gem`
-  `rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1`
+  `rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2`
 end
 
 desc 'Release all gems (native, binaries for JRuby and Windows)'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -48,13 +53,16 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
-        version: "0.7"
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id003
 description: Implements the DataObjects API for PostgreSQL
@@ -84,6 +92,7 @@ files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -115,23 +124,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DataObjects PostgreSQL Driver
@@ -139,6 +152,7 @@ test_files:
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
+- spec/error/sql_error_spec.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb