do_postgres 0.9.12-java → 0.10.0-java

data/{History.txt → HISTORY.markdown}

@@ -1,8 +1,12 @@
-== 0.9.11 2009-01-19
+## 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
+## 0.9.9 2008-11-27
 * No changes since 0.9.8

data/Manifest.txt

@@ -1,8 +1,8 @@
 .gitignore
-History.txt
+HISTORY.markdown
 LICENSE
 Manifest.txt
-README.txt
+README.markdown
 Rakefile
 autobuild.rb
 buildfile

data/{README.txt → README.markdown}

@@ -1,3 +1,4 @@
-= do_postgres
+do_postgres
+===========
 
 A PostgreSQL driver for DataObjects

data/Rakefile

@@ -8,9 +8,9 @@ require 'lib/do_postgres/version'
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
 BINARY_VERSION = '5.0.77'
 
-Dir['tasks/*.rake'].each { |f| import f }
+Dir['tasks/*.rake'].sort.each { |f| import f }
 
 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 ])

data/lib/do_postgres.rb

@@ -1,21 +1,28 @@
-require 'rubygems'
 require 'data_objects'
 if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
-  gem 'jdbc-postgres'
-  require 'jdbc/postgres' # the JDBC driver, packaged as a gem
-end
 
-require 'do_postgres_ext'
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_postgres', 'version'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_postgres', 'transaction'))
+  driver = 'org.postgresql.Driver'
+  begin
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+  rescue
+    require 'jdbc/postgres' # the JDBC driver, packaged as a gem
+  end
 
-if RUBY_PLATFORM =~ /java/
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,
   # which is currently not working as expected.
-  import 'org.postgresql.Driver'
+  java_import driver
+
+end
+
+require 'do_postgres_ext'
+require 'do_postgres/version'
+require 'do_postgres/transaction'
+require 'do_postgres/encoding'
+
+if RUBY_PLATFORM =~ /java/
 
   module DataObjects
     module Postgres
@@ -23,16 +30,6 @@ if RUBY_PLATFORM =~ /java/
         def self.pool_size
           20
         end
-
-        def character_set
-          # JDBC API does not provide an easy way to get the current character set
-          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
     end
   end

data/lib/do_postgres/encoding.rb

@@ -0,0 +1,42 @@
+module DataObjects
+  module Postgres
+    module Encoding
+      MAP = {
+        "Big5"          => "BIG5",
+        "GB2312"        => "EUC_CN",
+        "EUC-JP"        => "EUC_JP",
+        "EUC-KR"        => "EUC_KR",
+        "EUC-TW"        => "EUC_TW",
+        "GB18030"       => "GB18030",
+        "GBK"           => "GBK",
+        "ISO-8859-5"    => "ISO_8859_5",
+        "ISO-8859-6"    => "ISO_8859_6",
+        "ISO-8859-7"    => "ISO_8859_7",
+        "ISO-8859-8"    => "ISO_8859_8",
+        "KOI8-U"        => "KOI8",
+        "ISO-8859-1"    => "LATIN1",
+        "ISO-8859-2"    => "LATIN2",
+        "ISO-8859-3"    => "LATIN3",
+        "ISO-8859-4"    => "LATIN4",
+        "ISO-8859-9"    => "LATIN5",
+        "ISO-8859-10"   => "LATIN6",
+        "ISO-8859-13"   => "LATIN7",
+        "ISO-8859-14"   => "LATIN8",
+        "ISO-8859-15"   => "LATIN9",
+        "ISO-8859-16"   => "LATIN10",
+        "Emacs-Mule"    => "MULE_INTERNAL",
+        "SJIS"          => "SJIS",
+        "US-ASCII"      => "SQL_ASCII",
+        "CP949"         => "UHC",
+        "UTF-8"         => "UTF8",
+        "IBM866"        => "WIN866",
+        "Windows-874"   => "WIN874",
+        "Windows-1250"  => "WIN1250",
+        "Windows-1251"  => "WIN1251",
+        "Windows-1252"  => "WIN1252",
+        "Windows-1256"  => "WIN1256",
+        "Windows-1258"  => "WIN1258"
+      }
+    end
+  end
+end

data/lib/do_postgres/transaction.rb

@@ -10,7 +10,17 @@ module DataObjects
         connection.create_command(cmd).execute_non_query
       end
 
+      def begin_prepared
+        cmd = "BEGIN"
+        connection.create_command(cmd).execute_non_query
+      end
+
       def commit
+        cmd = "COMMIT"
+        connection.create_command(cmd).execute_non_query
+      end
+
+      def commit_prepared
         cmd = "COMMIT PREPARED '#{id}'"
         connection.create_command(cmd).execute_non_query
       end

data/lib/do_postgres/version.rb

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

data/spec/encoding_spec.rb

@@ -4,5 +4,16 @@ 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'
+  unless JRUBY
+    # Do NOT test this on JRuby:
+    #
+    #   http://jdbc.postgresql.org/documentation/80/connect.html
+    #
+    #   According to the Postgres documentation, as of Postgres 7.2, multibyte
+    #   support is enabled by default in the server. The underlying JDBC Driver
+    #   handles setting the internal client_encoding setting appropriately. It
+    #   can be overridden -- but for now, we won't support doing this.
+    #
+    it_should_behave_like 'a driver supporting encodings'
+  end
 end

data/spec/spec_helper.rb

@@ -11,21 +11,24 @@ require 'ostruct'
 require 'pathname'
 require 'fileutils'
 
+dir = File.dirname(__FILE__)
+lib_path = File.expand_path("#{dir}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 # 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 }
+do_lib_path = File.expand_path("#{dir}/../../data_objects/lib")
+$LOAD_PATH.unshift do_lib_path unless $LOAD_PATH.include?(do_lib_path)
 
 if JRUBY
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  jdbc_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
+  $LOAD_PATH.unshift jdbc_lib_path unless $LOAD_PATH.include?(jdbc_lib_path)
   require 'do_jdbc'
 end
 
-# put the pre-compiled extension in the path to be found
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '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 }
 require 'do_postgres'
 
 log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
@@ -111,8 +114,8 @@ module DataObjectsSpecHelpers
     EOF
 
     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);
+      conn.create_command(<<-EOF).execute_non_query(::Extlib::ByteArray.new("CAD \001 \000 DRAWING"))
+        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', ?, 1234, 13.4)
       EOF
     end
 
@@ -124,6 +127,30 @@ module DataObjectsSpecHelpers
       update widgets set ad_description = NULL where id = 3
     EOF
 
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set flags = NULL where id = 4
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost1 = NULL where id = 5
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set cost2 = NULL where id = 6
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_date = NULL where id = 7
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_datetime = NULL where id = 8
+    EOF
+
+    conn.create_command(<<-EOF).execute_non_query
+      update widgets set release_timestamp = NULL where id = 9
+    EOF
+
     conn.close
 
   end

data/tasks/gem.rake

@@ -1,61 +1,8 @@
 require 'rubygems/package_task'
 
-GEM_SPEC = Gem::Specification.new do |s|
-  # basic information
-  s.name        = "do_postgres"
-  s.version     = DataObjects::Postgres::VERSION
-
-  # description and details
-  s.summary     = 'DataObjects PostgreSQL Driver'
-  s.description = "Implements the DataObjects API for PostgreSQL"
-
-  # dependencies
-  s.add_dependency "addressable", "~>2.0.0"
-  s.add_dependency "extlib", "~>0.9.12"
-  s.add_dependency "data_objects", DataObjects::Postgres::VERSION
-
-  if JRUBY
-    s.add_dependency "jdbc-postgres", ">=8.2"
-    s.add_dependency "do_jdbc", DataObjects::Postgres::VERSION
-    s.platform = "java"
-    # components, files and paths
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}", "lib/*.jar"]
-  else
-    s.platform    = Gem::Platform::RUBY
-    s.extensions << 'ext/do_postgres_ext/extconf.rb'
-    # components, files and paths
-    s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake", "ext/**/*.{rb,c}",
-                        "LICENSE", "Rakefile", "*.{rdoc,txt,yml}"]
-  end
-
-  # development dependencies
-  s.add_development_dependency 'rspec', '~>1.2.0'
-
-
-  s.require_path = 'lib'
-
-  # documentation
-  s.has_rdoc = false
-
-  # project information
-  s.homepage          = 'http://github.com/datamapper/do'
-  s.rubyforge_project = 'dorb'
-
-  # author and contributors
-  s.author      = 'Dirkjan Bussink'
-  s.email       = 'd.bussink@gmail.com'
-end
+GEM_SPEC = eval(File.read('do_postgres.gemspec'))
 
 gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
-  pkg.need_tar = false
-  pkg.need_zip = false
+  pkg.need_tar = true
+  pkg.need_zip = true
 end
-
-file "#{GEM_SPEC.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'w') { |f| f.puts GEM_SPEC.to_yaml }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{GEM_SPEC.name}.gemspec"]

data/tasks/release.rake

@@ -8,7 +8,7 @@ end
 if defined?(RubyForge) then
   if defined?(GEM_SPEC) then
     desc 'Package and upload to RubyForge'
-    task :release => [:package] do |t|
+    task :release do |t|
       ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
 
       # compare versions to avoid mistakes
@@ -26,19 +26,19 @@ if defined?(RubyForge) then
 
       # read project info and overview
       notes = begin
-                r = File.read("README.rdoc")
-                r.split(/^(=+ .*)/)[1..4].join.strip
+                r = File.read("README.markdown")
+                r.split(/^(.*\n\-+)/)[1..4].join.strip
               rescue
-                warn "Missing README.rdoc"
+                warn "Missing README.markdown"
                 ''
               end
 
       # read changes
       changes = begin
-                  h = File.read("History.txt")
-                  h.split(/^(==+ .*)/)[1..2].join.strip
+                  h = File.read("HISTORY.markdown")
+                  h.split(/^(##+ .*)/)[1..2].join.strip
                 rescue
-                  warn "Missing History.txt"
+                  warn "Missing HISTORY.markdown"
                   ''
                 end
 

data/tasks/retrieve.rake

@@ -41,9 +41,8 @@ begin
     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
-        sh "wget -c #{url} || curl -C - -O #{url}"
+        sh "wget -c #{url} || curl -L -C - -O #{url}"
       end
-      touch t.name
     end
   end
 

data/tasks/spec.rake

@@ -5,6 +5,7 @@ desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec => [ :clean, :compile ]) do |t|
   t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
   t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
+  t.libs << 'lib'
 
   begin
     # RCov is run by default, except on the JRuby platform

metadata

@@ -28,6 +28,7 @@ specification_version: 3
 default_executable: 
 files: 
 - lib/do_postgres.rb
+- lib/do_postgres/encoding.rb
 - lib/do_postgres/transaction.rb
 - lib/do_postgres/version.rb
 - spec/command_spec.rb
@@ -58,9 +59,9 @@ files:
 - tasks/spec.rake
 - LICENSE
 - Rakefile
-- History.txt
+- HISTORY.markdown
+- README.markdown
 - Manifest.txt
-- README.txt
 - lib/do_postgres_ext.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -70,17 +71,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 requirements: []
 
 authors: 
 - Dirkjan Bussink
-date: 2009-05-16 22:00:00 +00:00
+date: 2009-09-19 22:00:00 +00:00
 platform: java
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.10.0
 require_paths: 
 - lib
 dependencies: 
@@ -89,7 +90,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: "2.0"
     version: 
   type: :runtime
   version_requirement: 
@@ -109,7 +110,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.10.0
     version: 
   type: :runtime
   version_requirement: 
@@ -129,7 +130,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 0.10.0
     version: 
   type: :runtime
   version_requirement: 
@@ -145,4 +146,4 @@ dependencies:
   version_requirement: 
   name: rspec
 bindir: bin
-has_rdoc: false
+has_rdoc: true