do_postgres 0.9.11 → 0.9.12

data/ext/do_postgres_ext/extconf.rb

@@ -28,8 +28,11 @@ def have_build_env
   have_header('catalog/pg_type.h')
 end
 
+$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/
 
 required_libraries = []
 desired_functions = %w(PQsetClientEncoding pg_encoding_to_char PQfreemem)
@@ -39,7 +42,6 @@ if have_build_env
   required_libraries.each(&method(:have_library))
   desired_functions.each(&method(:have_func))
   $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
-
   if RUBY_VERSION < '1.8.6'
     $CFLAGS << ' -DRUBY_LESS_THAN_186'
   end

data/lib/do_postgres.rb

@@ -26,8 +26,11 @@ if RUBY_PLATFORM =~ /java/
 
         def character_set
           # JDBC API does not provide an easy way to get the current character set
-          # For now, we code the character_set used as utf8
-          "utf8"
+          reader = self.create_command("SELECT pg_client_encoding()").execute_reader
+          reader.next!
+          char_set = reader.values.to_s
+          reader.close
+          char_set.downcase
         end
 
       end

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    VERSION = "0.9.11"
+    VERSION = "0.9.12"
   end
 end

data/spec/command_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/command_spec'
+
+describe DataObjects::Postgres::Command do
+  it_should_behave_like 'a Command'
+  it_should_behave_like 'a Command with async'
+end

data/spec/connection_spec.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/connection_spec'
+
+describe DataObjects::Postgres::Connection do
+
+  before :all do
+    @driver = CONFIG.scheme
+    @user   = CONFIG.user
+    @password = CONFIG.pass
+    @host   = CONFIG.host
+    @port   = CONFIG.port
+    @database = CONFIG.database
+  end
+
+  it_should_behave_like 'a Connection'
+  it_should_behave_like 'a Connection with authentication support'
+end

data/spec/encoding_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/encoding_spec'
+
+describe DataObjects::Postgres::Connection do
+  it_should_behave_like 'a driver supporting encodings'
+end

data/spec/lib/rspec_immediate_feedback_formatter.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'data_objects', 'spec', 'lib', 'rspec_immediate_feedback_formatter'))

data/spec/reader_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/reader_spec'
+
+describe DataObjects::Postgres::Reader do
+  it_should_behave_like 'a Reader'
+end

data/spec/result_spec.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'data_objects/spec/result_spec'
+
+describe DataObjects::Postgres::Result do
+  it_should_behave_like 'a Result'
+
+  before :all do
+    setup_test_environment
+  end
+
+  describe 'without using RETURNING' do
+
+    before :each do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      @result    = @connection.create_command("INSERT INTO users (name) VALUES (?)").execute_non_query("monkey")
+    end
+
+    after :each do
+      @connection.close
+    end
+
+    it { @result.should respond_to(:affected_rows) }
+
+    describe 'affected_rows' do
+
+      it 'should return the number of created rows' do
+        @result.affected_rows.should == 1
+      end
+
+    end
+
+    it { @result.should respond_to(:insert_id) }
+
+    describe 'insert_id' do
+
+      it 'should return nil' do
+        @result.insert_id.should be_nil
+      end
+
+      it 'should be retrievable through curr_val' do
+        # This is actually the 4th record inserted
+        reader = @connection.create_command("SELECT currval('users_id_seq')").execute_reader
+        reader.next!
+        reader.values.first.should == 4
+      end
+
+    end
+
+  end
+
+  describe 'when using RETURNING' do
+
+    before :each do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      @result    = @connection.create_command("INSERT INTO users (name) VALUES (?) RETURNING id").execute_non_query("monkey")
+    end
+
+    after :each do
+      @connection.close
+    end
+
+    it { @result.should respond_to(:affected_rows) }
+
+    describe 'affected_rows' do
+
+      it 'should return the number of created rows' do
+        @result.affected_rows.should == 1
+      end
+
+    end
+
+    it { @result.should respond_to(:insert_id) }
+
+    describe 'insert_id' do
+
+      it 'should return the generated key value' do
+        @result.insert_id.should == 2
+      end
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,20 +3,22 @@ JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
 
-gem 'rspec', '>=1.1.3'
+gem 'rspec', '>1.1.12'
 require 'spec'
 
 require 'date'
 require 'ostruct'
 require 'pathname'
 require 'fileutils'
-require 'bigdecimal'
 
 # put data_objects from repository in the load path
 # DO NOT USE installed gem of data_objects!
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data_objects', 'lib'))
 require 'data_objects'
 
+DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
+Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
+
 if JRUBY
   $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
   require 'do_jdbc'
@@ -31,68 +33,99 @@ FileUtils.mkdir_p(File.dirname(log_path))
 
 DataObjects::Postgres.logger = DataObjects::Logger.new(log_path, :debug)
 
-POSTGRES = OpenStruct.new
-POSTGRES.user = ENV['DO_PG_USER'] || 'postgres'
-POSTGRES.pass = ENV['DO_PG_PASS'] || ''
-POSTGRES.host = ENV['DO_PG_HOST'] || '127.0.0.1'
-POSTGRES.hostname = ENV['DO_PG_HOSTNAME'] || 'localhost'
-POSTGRES.port     = ENV['DO_PG_PORT'] || '5432'
-POSTGRES.database = ENV['DO_PG_DATABASE'] || 'do_test'
-
-DO_POSTGRES_SPEC_URI = Addressable::URI::parse(ENV["DO_PG_SPEC_URI"] ||
-                    "postgres://#{POSTGRES.user}:#{POSTGRES.pass}@#{POSTGRES.hostname}:#{POSTGRES.port}/#{POSTGRES.database}")
-
-module PostgresSpecHelpers
-
-  def ensure_users_table_and_return_connection
-    connection = DataObjects::Connection.new(DO_POSTGRES_SPEC_URI)
-    connection.create_command("DROP TABLE users").execute_non_query rescue nil
-    connection.create_command("DROP TABLE companies").execute_non_query rescue nil
-    connection.create_command(<<-EOF).execute_non_query
-      CREATE TABLE users (
-        id serial NOT NULL,
-        "name" text,
-        registered boolean DEFAULT false,
-        money double precision DEFAULT 1908.56,
-        created_on date DEFAULT ('now'::text)::date,
-        created_at timestamp without time zone DEFAULT now(),
-        born_at time without time zone DEFAULT now(),
-        fired_at timestamp with time zone DEFAULT now(),
-        amount numeric(10,2) DEFAULT 11.1,
-        company_id integer DEFAULT 1
-      )
-      WITHOUT OIDS;
+at_exit { DataObjects.logger.flush }
+
+Spec::Runner.configure do |config|
+  config.include(DataObjects::Spec::PendingHelpers)
+end
+
+CONFIG = OpenStruct.new
+CONFIG.scheme   = 'postgres'
+CONFIG.user     = ENV['DO_POSTGRES_USER'] || 'postgres'
+CONFIG.pass     = ENV['DO_POSTGRES_PASS'] || ''
+CONFIG.host     = ENV['DO_POSTGRES_HOST'] || 'localhost'
+CONFIG.port     = ENV['DO_POSTGRES_PORT'] || '5432'
+CONFIG.database = ENV['DO_POSTGRES_DATABASE'] || '/do_test'
+
+CONFIG.uri = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.sleep = "SELECT pg_sleep(1)"
+
+module DataObjectsSpecHelpers
+
+  def setup_test_environment
+    conn = DataObjects::Connection.new(CONFIG.uri)
+
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "invoices"
     EOF
 
-    connection.create_command(<<-EOF).execute_non_query
-      CREATE TABLE companies (
-        id serial NOT NULL,
-        "name" character varying
-      )
-      WITHOUT OIDS;
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "users"
     EOF
 
-    return connection
-  end
+    conn.create_command(<<-EOF).execute_non_query
+      DROP TABLE IF EXISTS "widgets"
+    EOF
 
-  def insert(query, *args)
-    result = @connection.create_command(query[/\) RETURNING.*/i] ? query : "#{query} RETURNING id").execute_non_query(*args)
-    result.insert_id
-  end
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "users" (
+        "id" SERIAL,
+        "name" VARCHAR(200) default 'Billy' NULL,
+        "fired_at" timestamp,
+        PRIMARY KEY  ("id")
+      );
+    EOF
 
-  def exec(query, *args)
-    @connection.create_command(query).execute_non_query(*args)
-  end
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "invoices" (
+        "id" SERIAL,
+        "invoice_number" varchar(50) NOT NULL,
+        PRIMARY KEY  ("id")
+      );
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      CREATE TABLE "widgets" (
+        "id" SERIAL,
+        "code" char(8) default 'A14' NULL,
+        "name" varchar(200) default 'Super Widget' NULL,
+        "shelf_location" text NULL,
+        "description" text NULL,
+        "image_data" bytea NULL,
+        "ad_description" text NULL,
+        "ad_image" bytea NULL,
+        "whitepaper_text" text NULL,
+        "cad_drawing" bytea NULL,
+        "flags" boolean default false,
+        "number_in_stock" smallint default 500,
+        "number_sold" integer default 0,
+        "super_number" bigint default 9223372036854775807,
+        "weight" float default 1.23,
+        "cost1" double precision default 10.23,
+        "cost2" decimal(8,2) default 50.23,
+        "release_date" date default '2008-02-14',
+        "release_datetime" timestamp default '2008-02-14 00:31:12',
+        "release_timestamp" timestamp with time zone default '2008-02-14 00:31:31',
+        PRIMARY KEY  ("id")
+      );
+    EOF
 
-  def select(query, types = nil, *args)
-    begin
-      command = @connection.create_command(query)
-      command.set_types types unless types.nil?
-      reader = command.execute_reader(*args)
-      reader.next!
-      yield reader
-    ensure
-      reader.close
+    1.upto(16) do |n|
+      conn.create_command(<<-EOF).execute_non_query
+        insert into widgets(code, name, shelf_location, description, image_data, ad_description, ad_image, whitepaper_text, cad_drawing, super_number, weight) VALUES ('W#{n.to_s.rjust(7,"0")}', 'Widget #{n}', 'A14', 'This is a description', 'IMAGE DATA', 'Buy this product now!', 'AD IMAGE DATA', 'String', 'CAD \\001 \\000 DRAWING'::bytea, 1234, 13.4);
+      EOF
     end
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = true where id = 2
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set ad_description = NULL where id = 3
+    EOF
+
+    conn.close
+
   end
+
 end

data/spec/typecast/array_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/array_spec'
+
+describe 'DataObjects::Postgres with Array' do
+  it_should_behave_like 'supporting Array'
+end

data/spec/typecast/bigdecimal_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/bigdecimal_spec'
+
+describe 'DataObjects::Postgres with BigDecimal' do
+  it_should_behave_like 'supporting BigDecimal'
+  it_should_behave_like 'supporting BigDecimal autocasting'
+end

data/spec/typecast/boolean_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/boolean_spec'
+
+describe 'DataObjects::Postgres with Boolean' do
+  it_should_behave_like 'supporting Boolean'
+  it_should_behave_like 'supporting Boolean autocasting'
+end

data/spec/typecast/byte_array_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/byte_array_spec'
+
+describe 'DataObjects::Postgres with ByteArray' do
+  it_should_behave_like 'supporting ByteArray'
+end

data/spec/typecast/class_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/class_spec'
+
+describe 'DataObjects::Postgres with Class' do
+  it_should_behave_like 'supporting Class'
+end

data/spec/typecast/date_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/date_spec'
+
+describe 'DataObjects::Postgres with Date' do
+  it_should_behave_like 'supporting Date'
+  it_should_behave_like 'supporting Date autocasting'
+end

data/spec/typecast/datetime_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/datetime_spec'
+
+describe 'DataObjects::Postgres with DateTime' do
+  it_should_behave_like 'supporting DateTime'
+  it_should_behave_like 'supporting DateTime autocasting'
+end

data/spec/typecast/float_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/float_spec'
+
+describe 'DataObjects::Postgres with Float' do
+  it_should_behave_like 'supporting Float'
+  it_should_behave_like 'supporting Float autocasting'
+end