do_postgres 0.10.8 → 0.10.9

data/ChangeLog.markdown

@@ -1,3 +1,8 @@
+## 0.10.9 2012-08-13
+
+* Improved RETURNING handling on JRuby
+* Allow for an empty database name
+
 ## 0.10.8 2012-02-10
 
 * Ruby 1.9.3 compatibility on Windows

data/Rakefile

@@ -15,7 +15,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.15'
+BINARY_VERSION = '8.4.12'
 
 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 ])
 

data/ext/do_postgres/do_common.c

@@ -185,6 +185,10 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
+  if(!year && !month && !day) {
+    return Qnil;
+  }
+
   return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
@@ -237,6 +241,10 @@ VALUE data_objects_parse_date_time(const char *date) {
   fmt_datetime = strchr(date, '.') ? _fmt_datetime_tz_subsec : _fmt_datetime_tz_normal;
   tokens_read  = sscanf(date, fmt_datetime, &year, &month, &day, &hour, &min, &sec, &hour_offset, &minute_offset);
 
+  if(!year && !month && !day && !hour && !min && !sec) {
+    return Qnil;
+  }
+
   switch (tokens_read) {
     case 8:
       minute_offset *= hour_offset < 0 ? -1 : 1;

data/ext/do_postgres/do_postgres.c

@@ -395,7 +395,7 @@ void do_postgres_full_connect(VALUE self, PGconn *db) {
   }
 
   if (!database || !*database) {
-    rb_raise(eConnectionError, "Database must be specified");
+    database = NULL;
   }
 
   VALUE r_query = rb_iv_get(self, "@query");

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    VERSION = '0.10.8'
+    VERSION = '0.10.9'
   end
 end

data/lib/do_postgres.rb

@@ -11,7 +11,7 @@ if RUBY_PLATFORM =~ /java/
 
   begin
     java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Postgres::JDBC_DRIVER, true)
-  rescue
+  rescue java.lang.ClassNotFoundException
     require 'jdbc/postgres' # the JDBC driver, packaged as a gem
   end
 

data/spec/command_spec.rb

@@ -6,4 +6,40 @@ require 'data_objects/spec/shared/command_spec'
 describe DataObjects::Postgres::Command do
   it_should_behave_like 'a Command'
   it_should_behave_like 'a Command with async'
+
+  describe 'query with RETURNING while not returning result' do
+    before do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      @select_command = @connection.create_command("SELECT name FROM users WHERE id = 900")
+      @upsert_command = @connection.create_command("
+          WITH upsert AS
+            (UPDATE users SET name = ? WHERE id = 900 RETURNING id)
+          INSERT INTO users (id, name)
+          SELECT 900, 'dbussink' WHERE NOT EXISTS (SELECT 1 FROM upsert)")
+    end
+
+    after do
+      @connection.close
+    end
+
+    it "should work with a writable CTE acting as an Upsert" do
+      reader = @select_command.execute_reader
+      reader.to_a.size.should == 0
+      reader.close
+
+      @upsert_command.execute_non_query('jwkoelewijn')
+
+      reader = @select_command.execute_reader
+      reader.next!
+      reader.values[0].should == 'dbussink'
+      reader.close
+
+      @upsert_command.execute_non_query('jwkoelewijn')
+
+      reader = @select_command.execute_reader
+      reader.next!
+      reader.values[0].should == 'jwkoelewijn'
+      reader.close
+    end
+  end
 end

data/spec/connection_spec.rb

@@ -16,6 +16,7 @@ describe DataObjects::Postgres::Connection do
 
   it_should_behave_like 'a Connection'
   it_should_behave_like 'a Connection with authentication support'
+  it_should_behave_like 'a Connection allowing default database'
   it_should_behave_like 'a Connection with JDBC URL support' if JRUBY
 
   describe 'byte array quoting' do

data/tasks/compile.rake

@@ -40,7 +40,7 @@ begin
       At the time of building this gem, the necessary DLL files where available
       in the following download:
 
-      http://wwwmaster.postgresql.org/redir/107/h/binary/v#{BINARY_VERSION}/win32/postgresql-#{BINARY_VERSION}-1-binaries-no-installer.zip
+      http://wwwmaster.postgresql.org/redir/107/h/binary/v#{BINARY_VERSION}/win32/postgresql-#{BINARY_VERSION}-1-windows-binaries.zip
 
       You can put the following files available in this package in your Ruby bin
       directory, for example C:\\Ruby\\bin
@@ -70,7 +70,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.8'
+      gem.add_dependency 'do_jdbc',       '0.10.9'
     end
   end
 rescue LoadError

data/tasks/retrieve.rake

@@ -33,7 +33,7 @@ begin
   end
 
   version = BINARY_VERSION
-  file "vendor/postgresql-#{version}-1-binaries-no-installer.zip" => ['vendor'] do |t|
+  file "vendor/postgresql-#{version}-1-windows-binaries.zip" => ['vendor'] do |t|
     url = "http://wwwmaster.postgresql.org/redir/107/h/binary/v#{version}/win32/#{File.basename(t.name)}"
     when_writing "downloading #{t.name}" do
       cd File.dirname(t.name) do
@@ -42,7 +42,7 @@ begin
     end
   end
 
-  file "vendor/pgsql/include/pg_config.h" => ["vendor/postgresql-#{version}-1-binaries-no-installer.zip"] do |t|
+  file "vendor/pgsql/include/pg_config.h" => ["vendor/postgresql-#{version}-1-windows-binaries.zip"] do |t|
     full_file = File.expand_path(t.prerequisites.last)
     when_writing "creating #{t.name}" do
       cd "vendor" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_postgres
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 8
-  version: 0.10.8
+  - 9
+  version: 0.10.9
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -15,33 +14,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 Z
+date: 2011-03-29 00:00:00 +02: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: 39
         segments: 
         - 0
         - 10
-        - 8
-        version: 0.10.8
+        - 9
+        version: 0.10.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
@@ -52,11 +48,9 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
@@ -114,6 +108,7 @@ files:
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
+has_rdoc: true
 homepage: 
 licenses: []
 
@@ -123,27 +118,23 @@ 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.8.14
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects PostgreSQL Driver