do_jdbc 0.10.0-java → 0.10.1-java

data/ChangeLog.markdown

@@ -0,0 +1,71 @@
+## 0.10.1 (unreleased, in git)
+
+* Switch to Jeweler for Gem building tasks (this change may be temporary).
+* Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
+  JRuby extensions, instead of our (broken) home-grown solution.
+
+### Changes (in detail)
+
+ * Use recursive RubyType#getRubyType for inference (Alex Coles) (commit 046c703)
+ * Revert "Added support for subclasses of supported types" (Alex Coles) (commit 8e64ca1)
+ * fixed situation where types for reader are a subclass of one the allowed types. added spec. (mkristian) (commit 67e3ef9)
+ * Added support for subclasses of supported types (Piotr Gega (pietia)) (commit 59923d1)
+ * Removed unnecessary wildcard boundation (Piotr Gega (pietia)) (commit 880c823)
+ * Closed resources that were not being closed when exceptional situations occures (Piotr Gega (pietia)) (commit da06fe8)
+ * Added helper method for closing both RS and ST object in one method (Piotr Gega (pietia)) (commit b43708f)
+ * StringUtil prevented from instantiating (Piotr Gega (pietia)) (commit 016ed27)
+ * Changed StringBuffer to StringBuilder where synchronization is not needed (Piotr Gega (pietia)) (commit 78cbc98)
+ * Closed not closed PS object (Closing moved to Reader) (Piotr Gega (pietia)) (commit 604218e)
+ * Updated Maven's configuration files (Piotr Gega (pietia)) (commit 137efd5)
+ * Added maven-pmd-plugin to pom.xml (Piotr Gega (pietia)) (commit bdd96e4)
+ * Revert "Always downcase field names" (Alex Coles) (commit 94c5936)
+ * return false on close if the Reader is already closed (mkristian) (commit ded1f9a)
+ * Remove merge conflict artefacts (Alex Coles) (commit 4e6efca)
+ * more optimisations:  * setting array/list size where possible  * avoiding object creation  * precompute TRUE,FALSE,NIL and reuse them  * switched one more ivar to java instance variable  * replace getter/setter with direct field invocation  * removed some precondition check and merge two methods (mkristian) (commit 0336dc3)
+ * Fix broken logic for type inference in Command (Alex Coles) (commit 8617aae)
+ * Refactoring to use Java fields not ivars (Alex Coles) (commit cfe59f4)
+ * Removed deprecated code (i.e. java.sql.Date#getHours()) (Piotr Gęga (pietia)) (commit ee4f9e0)
+ * Removed ability to instantiate DataObjects (Piotr Gęga (pietia)) (commit 8b91539)
+ * extracted JDBC URI generation as driver getJdbcUri method which is overridden for Oracle driver (Raimonds Simanovskis) (commit 3f32c3b)
+ * Add comment - RS.close() not needed (Piotr Gęga (pietia)) (commit 56d9a75)
+ * Code cleanups (Unused imports,unused ++, Forgot @param) (Piotr Gęga (pietia)) (commit 8861643)
+ * Close UnmarshalStream object (Piotr Gega (pietia)) (commit 90a59c2)
+ * Javadoc starter step (Piotr Gega (pietia)) (commit 1204f7d)
+ * Removed Javadoc @params for non-existent methods' parameters (Piotr Gega (pietia)) (commit 7b4560f)
+ * Fix Typo(Unneeded invocation on object that may be a null) (Piotr Gega (pietia)) (commit 9f45f88)
+ * Extlib Removal: Object to DO#full_const_get (Alex Coles) (commit 8cc2da4)
+ * Fix missed usage of ivar in Transaction (Alex Coles) (commit 847263f)
+ * Always downcase field names (Alex Coles) (commit 060e778)
+ * Fix for JRuby 1.4RCx: ivars/Java objects (Alex Coles) (commit 34a091e)
+ * Fix unquoted path in Rake compile task (Alex Coles) (commit 176926b)
+ * Remove unwanted cast (Alex Coles) (commit 3fa36c0)
+ * Teach To The Test: JRuby/MRI Fixnums (Alex Coles) (commit 677211f)
+ * Fix for large Bignum args (Alex Coles) (commit 37c95cd)
+ * Handle user/password defaults (Alex Coles) (commit ea9109d)
+ * Fix path handling when connecting with a URI (Peter Brant) (commit 2d7b1ae)
+
+## 0.10.0 2009-09-15
+
+First release of DataObjects' comprehensive support for JRuby that should be
+suitable for widespread testing.
+
+Please also read the accompanying release notes for individual drivers.
+
+### Changes
+
+  * Since the test gem was released, substantial work has been done to
+  . Parti to Raimonds Simanovskis
+    (rsim) and Kristian Meier (mkristian) for substantial patches.
+
+### Known Issues
+
+  * Error
+  * URI parsing
+  * Reports
+  * Connection via JNDI is not yet fully implemented.
+  * Problem with PATH syntax compiling on Windows with JRuby.
+  http://sources.redhat.com/ml/kawa/2000/msg00311.html
+
+## 0.9.12 2009-05-17
+
+* Initial testing version released

data/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2009 Alex Coles, Ikonoklastik Productions
+Copyright (c) 2008 - 2010 Alex Coles, Ikonoklastik Productions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -1,26 +1,50 @@
-do_jdbc 'Doppio'
-================
+# do_jdbc 'Doppio'
 
-*Native JDBC Support for DataObjects*
+* <http://dataobjects.info>
+
+## Description
+
+Native JDBC Support for DataObjects.
+
+## Features/Problems
 
 do_jdbc is a gem wrapper for the common library that uses JDBC to support DO
 drivers running on the JRuby implementation.
 
-Testing and Installation
-------------------------
+## Synopsis
+
+This is a support library and should not be used directly.
+
+## Requirements
+
+ * JRuby 1.3.1 + (1.4+ recommended)
+ * `data_objects` gem
+
+## Install
+
+To install the gem:
+
+    jruby -S gem install do_jdbc
+
+Normally, you would not install do_jdbc directly. Instead it should be installed
+when installing DO drivers on JRuby, thanks to RubyGems dependency resolution.
 
-Please see <http://datamapper.org/doku.php?id=jruby:contribute> for the current
-details on building do_jdbc from source and running specs against JDBC variant
-drivers.
+To compile and install from source:
 
-Licensing and Copyright
------------------------
+ * 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` with `jruby -S rake install`.
+ * Install this driver with `jruby -S rake install`.
 
-This code is licensed under the under an **MIT License**. Please see
-MIT-LICENSE.
+## Developers
 
-Copyright (c) 2008-2009 Alexander Coles, Ikonoklastik Productions
+See the DataObjects wiki for more comprehensive information:
+<http://wiki.github.com/datamapper/do/jruby>.
 
+## License
 
-* Contact the developer directly:
-   - <alex@alexcolesportfolio.com> | myabc on #datamapper, #merb IRC
+This code is licensed under an **MIT (X11) License**. Please see the
+accompanying `LICENSE` file.

data/Rakefile

@@ -1,19 +1,54 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-require 'pathname'
-require 'lib/do_jdbc/version'
+ROOT = Pathname(__FILE__).dirname.expand_path
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
+require ROOT + 'lib/do_jdbc/version'
 
-Dir['tasks/*.rake'].sort.each { |f| import f }
+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'])
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext-java/target ])
 
 task :default do
   # do nothing
 end
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'do_jdbc'
+    gem.version     = DataObjects::Jdbc::VERSION
+    gem.summary     = 'DataObjects JDBC support library'
+    gem.description = 'Provides JDBC support for usage in DO drivers for JRuby'
+    gem.platform    = 'java'
+    gem.files       = FileList['lib/**/*.rb', 'tasks/**/*.rake', 'LICENSE',
+                                'Rakefile', '*.{markdown,rdoc,txt,yml}',
+                                'lib/*.jar']
+    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
+
+    gem.add_dependency 'data_objects', DataObjects::Jdbc::VERSION
+
+    gem.add_development_dependency 'rake-compiler', '~>0.7'
+
+    gem.has_rdoc = false
+    gem.rubyforge_project = 'dorb'
+    gem.authors     = [ 'Alex Coles' ]
+    gem.email       = 'alex@alexcolesportfolio.com'
+  end
+
+  Rake::Task['build'].clear_actions if Rake::Task.task_defined?('build')
+  task :build => [ :java, :gem ]
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/lib/do_jdbc/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Jdbc
-    VERSION = "0.10.0"
+    VERSION = '0.10.1'.freeze
   end
 end

data/tasks/compile.rake

@@ -0,0 +1,26 @@
+begin
+  gem 'rake-compiler', '~>0.7'
+  require 'rake/javaextensiontask'
+
+  # Hack to avoid "allocator undefined for Proc" issue when unpacking Gems:
+  # gemspec provided by Jeweler uses Rake::FileList for files, test_files and
+  # extra_rdoc_files, and procs cannot be marshalled.
+  def gemspec
+    @clean_gemspec ||= eval("#{Rake.application.jeweler.gemspec.to_ruby}") # $SAFE = 3\n
+  end
+
+  Rake::JavaExtensionTask.new('do_jdbc_internal', gemspec) do |ext|
+    ext.ext_dir = 'src/main/java'
+  end
+
+  # do_jdbc is only available for JRuby: the normal behaviour of rake-compiler
+  # is to only chain 'compile:PLATFORM' tasks to 'compile' where PLATFORM is the
+  # platform of the current interpreter (i.e. 'compile:java' to 'compile' only
+  # if running on JRuby). However, we always want to compile for Java, even if
+  # running from MRI.
+  task 'compile:do_jdbc_internal' => ['compile:do_jdbc_internal:java']
+  task 'compile' => ['compile:java']
+
+rescue LoadError
+  warn "To compile, install rake-compiler (gem install rake-compiler)"
+end

data/tasks/release.rake

@@ -1,75 +1,14 @@
-begin
-  gem 'rubyforge', '~> 1.0.1'
-  require 'rubyforge'
-rescue Exception
-  nil
+desc 'Builds all gems (native, binaries for JRuby and Windows)'
+task :build_all do
+  `rake clean`
+  `rake java gem`
 end
 
-if defined?(RubyForge) then
-  if defined?(GEM_SPEC) then
-    desc 'Package and upload to RubyForge'
-    task :release do |t|
-      ver = ENV['VERSION'] or fail "Must supply VERSION (rake release VERSION=x.y.z)."
-
-      # compare versions to avoid mistakes
-      unless ver == GEM_SPEC.version.to_s then
-        fail "Version mismatch (supplied and specification versions differ)."
-      end
-
-      # no rubyforge project? no release for you!
-      if GEM_SPEC.rubyforge_project == 'TODO' or GEM_SPEC.rubyforge_project.nil? then
-        fail "Must define rubyforge_project in your gem specification."
-      end
-
-      # instantiate a RubyForge object
-      rf = RubyForge.new
-
-      # read project info and overview
-      notes = begin
-                r = File.read("README.markdown")
-                r.split(/^(.*\n\-+)/)[1..4].join.strip
-              rescue
-                warn "Missing README.markdown"
-                ''
-              end
-
-      # read changes
-      changes = begin
-                  h = File.read("HISTORY.markdown")
-                  h.split(/^(##+ .*)/)[1..2].join.strip
-                rescue
-                  warn "Missing HISTORY.markdown"
-                  ''
-                end
-
-      # build the configuration for the release
-      config = Hash.new
-      config["release_notes"] = notes
-      config["release_changes"] = changes
-      config["preformatted"] = true
-
-      # prepare configuration
-      rf.configure config
-
-      files = FileList["pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version}*.*"].to_a
-      fail "No files found for the release." if files.empty?
-
-      puts "Logging in RubyForge..."
-      rf.login
-
-      puts "Files to upload:"
-      files.each do |f|
-        puts "  * #{f}"
-      end
-
-      puts "Releasing #{GEM_SPEC.name} version #{GEM_SPEC.version}..."
-      rf.add_release GEM_SPEC.rubyforge_project, GEM_SPEC.name, GEM_SPEC.version, *files
-      puts "Done."
-    end
-    #Rake::Task['release'].prerequisites.unshift('clean')
-  else
-    warn "no GEM_SPEC is found or defined. 'release' task cannot work without it."
+desc 'Release all gems (native, binaries for JRuby and Windows)'
+task :release_all => :build_all do
+  Dir["pkg/do_jdbc-#{DataObjects::Jdbc::VERSION}*.gem"].each do |gem_path|
+    command = "gem push #{gem_path}"
+    puts "Executing #{command.inspect}:"
+    sh command
   end
-else
-  warn "rubyforge gem is required to generate releases, please install it (gem install rubyforge)."
 end

metadata

@@ -1,105 +1,84 @@
 --- !ruby/object:Gem::Specification 
-extensions: []
-
-homepage: http://github.com/datamapper/do
-executables: []
-
-version: !ruby/object:Gem::Version 
-  version: 0.10.0
-post_install_message: 
-date: 2009-09-16 00:00:00 Z
-files: 
-- lib/do_jdbc.rb
-- lib/do_jdbc/version.rb
-- tasks/gem.rake
-- tasks/install.rake
-- tasks/native.rake
-- tasks/release.rake
-- tasks/spec.rake
-- MIT-LICENSE
-- Rakefile
-- HISTORY.markdown
-- README.markdown
-- Manifest.txt
-rubygems_version: 1.3.4
-rdoc_options: []
-
-signing_key: 
-cert_chain: []
-
 name: do_jdbc
-has_rdoc: false
+version: !ruby/object:Gem::Version 
+  version: 0.10.1
 platform: java
-summary: DataObjects JDBC support library
-default_executable: 
+authors: 
+- Alex Coles
+autorequire: 
 bindir: bin
-licenses: []
-
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_ruby_version: !ruby/object:Gem::Requirement 
-  version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-require_paths: 
-- lib
-specification_version: 3
-test_files: []
+cert_chain: []
 
+date: 2010-01-09 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: addressable
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    version: 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: extlib
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    version: 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.12
-- !ruby/object:Gem::Dependency 
-  type: :runtime
   name: data_objects
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.1
+    version: 
 - !ruby/object:Gem::Dependency 
+  name: rake-compiler
   type: :development
-  name: rspec
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: "0.7"
+    version: 
 description: Provides JDBC support for usage in DO drivers for JRuby
 email: alex@alexcolesportfolio.com
-authors: 
-- Alex Coles
-extra_rdoc_files: []
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.markdown
+- ChangeLog.markdown
+- LICENSE
+files: 
+- lib/do_jdbc/version.rb
+- lib/do_jdbc.rb
+- tasks/compile.rake
+- tasks/release.rake
+- LICENSE
+- Rakefile
+- ChangeLog.markdown
+- README.markdown
+- lib/do_jdbc_internal.jar
+has_rdoc: false
+homepage: 
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: dorb
-autorequire: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: DataObjects JDBC support library
+test_files: []
+

data/HISTORY.markdown

@@ -1,6 +0,0 @@
-## 0.10.0 2009-10-15
-
-* First release that provides comprehensive support for JDBC.
-
-## 0.9.12 2009-05-17
-* Initial testing version released

data/Manifest.txt

@@ -1,26 +0,0 @@
-MIT-LICENSE
-HISTORY.markdown
-INSTALL
-MIT-LICENSE
-Manifest.txt
-README.markdown
-README.markdown
-Rakefile
-build.xml
-lib/do_jdbc.rb
-lib/do_jdbc/date_formatter.rb
-lib/do_jdbc/datetime_formatter.rb
-lib/do_jdbc/time_formatter.rb
-lib/do_jdbc/version.rb
-lib/do_jdbc_internal.jar
-src/java/AbstractDataObjectsExtService.java
-src/java/data_objects/Command.java
-src/java/data_objects/Connection.java
-src/java/data_objects/DataObjects.java
-src/java/data_objects/DataObjectsUtils.java
-src/java/data_objects/Reader.java
-src/java/data_objects/Result.java
-src/java/data_objects/RubyType.java
-src/java/data_objects/Transaction.java
-src/java/data_objects/drivers/AbstractDriverDefinition.java
-src/java/data_objects/drivers/DriverDefinition.java

data/tasks/gem.rake

@@ -1,8 +0,0 @@
-require 'rubygems/package_task'
-
-GEM_SPEC = eval(File.read('do_jdbc.gemspec'))
-
-gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
-  pkg.need_tar = false
-  pkg.need_zip = false
-end

data/tasks/install.rake

@@ -1,15 +0,0 @@
-def sudo_gem(cmd)
-  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
-end
-
-# Installation
-
-desc "Install #{GEM_SPEC.name} #{GEM_SPEC.version}"
-task :install => [ :package ] do
-  sudo_gem "install pkg/#{GEM_SPEC.name}-#{GEM_SPEC.version} --no-update-sources"
-end
-
-desc "Uninstall #{GEM_SPEC.name} #{GEM_SPEC.version}"
-task :uninstall => [ :clean ] do
-  sudo_gem "uninstall #{GEM_SPEC.name} -v#{GEM_SPEC.version} -I -x"
-end

data/tasks/native.rake

@@ -1,4 +0,0 @@
-if (tasks_dir = ROOT.parent + 'tasks').directory?
-  require tasks_dir + 'ext_helper_java'
-  setup_java_extension("#{GEM_SPEC.name}_internal", GEM_SPEC, :source_dir => 'src/main/java', :add_buildr_task => false)
-end

data/tasks/spec.rake

@@ -1,19 +0,0 @@
-# Specs
-require 'spec/rake/spectask'
-
-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
-    t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
-end