activerecord-jdbc-adapter 1.1.3 → 1.2.0

data/.gitignore

@@ -0,0 +1,22 @@
+pkg
+*.gem
+*.tgz
+derby-testdb*
+derby.log
+test.*
+doc
+build.xml
+nbproject
+TAGS
+*~
+*.log
+patches*
+*#
+.stgit-edit.txt
+/.classpath
+/.project
+/bin
+/jndi_test/jdbc/.bindings
+target
+/test/fscontext.jar
+/test/providerutil.jar

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+
+# This may wreak havoc on the lockfile, but we need a way to test
+# different AR versions
+gem 'activerecord', ENV['AR_VERSION']
+
+gem 'rake'
+
+gem 'jruby-openssl', :group => :development
+
+group :test do
+  gem 'ruby-debug'
+  gem 'mocha'
+end

data/Gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0-java)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
+    columnize (0.3.1)
+    i18n (0.6.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    mocha (0.9.8)
+      rake
+    multi_json (1.0.3)
+    rake (0.9.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4-java)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord
+  jruby-openssl
+  mocha
+  rake
+  ruby-debug

data/History.txt

@@ -1,4 +1,11 @@
-== 1.1.3
+== 1.2.0 (09/13/11)
+
+- Support for Rails 3.1
+- Improvements to index usage on PostgreSQL (albertosaurus and
+  pazustep)
+- Compatibility: tested with Rails 2.3, 3.0 and 3.1
+
+== 1.1.3 (07/26/11)
 
 - Remove AR version < 3 guard around some caching methods (sugg. invadersmustdie)
 - Small bug in arjdbc/discover logic, thanks autotelik.
@@ -7,7 +14,7 @@
 - #71: fix yield called out of block error
 - Silence Rake::DSL warnings for Rake > 0.9
 
-== 1.1.2
+== 1.1.2 (06/20/11)
 
 - Update version of H2 driver from 1.1.107 to 1.3.153 (Ketan
   Padegaonkar, Jeremy Stephens)
@@ -46,7 +53,7 @@
 - GH#31: mssql: Remove extra code breaking mssql w/o limit
 - ACTIVERECORD_JDBC-156: mssql: Logic fix for detecting select_count?
 
-== 1.1.1
+== 1.1.1 (01/14/11)
 
 - Arel 2.0.7 compatibility: fix bugs arising from use of Arel 2.0.7 +
   ArJdbc 1.1.0.

data/{README.txt → README.rdoc}

@@ -1,3 +1,5 @@
+= Activerecord-jdbc-adapter
+
 activerecord-jdbc-adapter is a database adapter for Rails' ActiveRecord
 component that can be used with JRuby[http://www.jruby.org/]. It allows use of
 virtually any JDBC-compliant database with your JRuby on Rails application.
@@ -9,8 +11,7 @@ MySQL, PostgreSQL, SQLite3, Oracle, Microsoft SQL Server, DB2,
 FireBird, Derby, HSQLDB, H2, and Informix.
 
 Other databases will require testing and likely a custom configuration module.
-Please join the activerecord-jdbc
-mailing-lists[http://kenai.com/projects/activerecord-jdbc/lists] to help us discover
+Please join the JRuby mailing-list[http://jruby.org/community] to help us discover
 support for more databases.
 
 == Using ActiveRecord JDBC
@@ -34,7 +35,7 @@ adapters are available:
 2a. For Rails 3, if you're generating a new application, use the
 following command to generate your application:
 
-   jruby -S rails new sweetapp -m http://jruby.org/rails3.rb
+   jruby -S rails new sweetapp
 
 2b. Otherwise, you'll need to perform some extra configuration steps
 to prepare your Rails application for JDBC.
@@ -43,11 +44,13 @@ If you're using Rails 3, you'll need to modify your Gemfile to use the
 activerecord-jdbc-adapter gem under JRuby. Change your Gemfile to look
 like the following (using sqlite3 as an example):
 
-    if defined?(JRUBY_VERSION)
-      gem 'activerecord-jdbc-adapter'
-      gem 'jdbc-sqlite3'
-    else
-      gem 'sqlite3-ruby', :require => 'sqlite3'
+    platforms :ruby do
+      gem 'sqlite3'
+    end
+
+    platforms :jruby do
+      gem 'jruby-openssl'
+      gem 'activerecord-jdbcsqlite3-adapter'
     end
 
 If you're using Rails 2:
@@ -84,6 +87,21 @@ URL. Example:
       adapter: jdbc
       jndi: jdbc/mysqldb
 
+   If you're really old school you might want to use ARJDBC with a DB2 on z/OS.
+
+    development:
+      adapter: jdbc
+      encoding: unicode
+      url: jdbc:db2j:net://mightyzoshost:446/RAILS_DBT1
+      driver: com.ibm.db2.jcc.DB2Driver
+      schema: DB2XB12
+      database: RAILS_DB1
+      tablespace: TSDE911
+      lob_tablespaces:
+        first_table: TSDE912
+      username: scott
+      password: lion
+
 === Standalone, with ActiveRecord
 
 1. Install the gem with JRuby:
@@ -123,7 +141,7 @@ template. See the project for more information at the following URL:
 
 The source for activerecord-jdbc-adapter is available using git.
 
-  git clone git://github.com/nicksieger/activerecord-jdbc-adapter.git
+  git clone git://github.com/jruby/activerecord-jdbc-adapter.git
 
 == Feedback
 
@@ -133,11 +151,9 @@ something's a bug, feel free to pre-report it on the mailing lists.
 
 == Project Info
 
-* Mailing Lists: http://kenai.com/projects/activerecord-jdbc/lists
-* Issues: http://kenai.com/jira/browse/ACTIVERECORD_JDBC
-* Source:
- git://github.com/nicksieger/activerecord-jdbc-adapter.git
- git://kenai.com/activerecord-jdbc~main 
+* Mailing Lists: http://jruby.org/community
+* Issues: https://github.com/jruby/activerecord-jdbc-adapter/issues
+* Source: git://github.com/jruby/activerecord-jdbc-adapter.git
 
 == Running AR-JDBC's Tests
 

data/Rakefile

@@ -2,8 +2,57 @@ require 'rake/testtask'
 require 'rake/clean'
 CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log'
 
+require 'bundler'
+Bundler::GemHelper.install_tasks
+require 'bundler/setup'
+
 task :default => [:java_compile, :test]
 
+#ugh, bundler doesn't use tasks, so gotta hook up to both tasks.
+task :build => :java_compile
+task :install => :java_compile
+
+ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map {|a| "activerecord-jdbc#{a}-adapter" }
+DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map {|a| "jdbc-#{a}" }
+
+def rake(args)
+  ruby "-S", "rake", *args
+end
+
+(ADAPTERS + DRIVERS).each do |adapter|
+  namespace adapter do
+
+    task :build do
+      Dir.chdir(adapter) do
+        rake "build"
+      end
+      cp FileList["#{adapter}/pkg/#{adapter}-*.gem"], "pkg"
+    end
+
+    # bundler handles install => build itself
+    task :install do
+      Dir.chdir(adapter) do
+        rake "install"
+      end
+    end
+
+    task :release do
+      Dir.chdir(adapter) do
+        rake "release"
+      end
+    end
+  end
+end
+
+desc "Build all adapters"
+task "all:release" => ["release", *ADAPTERS.map { |f| "#{f}:release" }]
+
+desc "Install all adapters"
+task "all:install" => ["install", *ADAPTERS.map { |f| "#{f}:install" }]
+
+desc "Release all adapters"
+task "all:build"   => ["build", *ADAPTERS.map { |f| "#{f}:build" }]
+
 task :filelist do
   puts FileList['pkg/**/*'].inspect
 end

data/activerecord-jdbc-adapter.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'arjdbc/version'
+version = ArJdbc::Version::VERSION
+Gem::Specification.new do |s|
+  s.name        = "activerecord-jdbc-adapter"
+  s.version     = version
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nick Sieger, Ola Bini and JRuby contributors"]
+  s.email       = %q{nick@nicksieger.com, ola.bini@gmail.com}
+  s.homepage = %q{https://github.com/jruby/activerecord-jdbc-adapter}
+  s.summary = %q{JDBC adapter for ActiveRecord, for use within JRuby on Rails.}
+  s.description = %q{activerecord-jdbc-adapter is a database adapter for Rails\' ActiveRecord
+component that can be used with JRuby[http://www.jruby.org/]. It allows use of
+virtually any JDBC-compliant database with your JRuby on Rails application.}
+  s.files         = `git ls-files`.split("\n").reject {|v| v =~ /^(activerecord-jdbc[^-]|jdbc-)/}
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rdoc_options = ["--main", "README.txt", "-SHN", "-f", "darkfish"]
+  s.rubyforge_project = %q{jruby-extras}
+end
+

data/bench/bench_attributes.rb

@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/bench_model'
+
+puts "Widget.find(:first).attributes"
+Benchmark.bm do |make|
+  TIMES.times do
+    w = Widget.find(:first)
+    make.report do
+      10_000.times do
+        w.attributes # rails makes copy for every call
+      end
+    end
+  end
+end

data/bench/bench_attributes_new.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/bench_model'
+
+puts "w = Widget.find(:first); Widget.new(w.attributes)"
+Benchmark.bm do |make|
+  TIMES.times do
+    w = Widget.find(:first)
+    params = w.attributes
+    make.report do
+      10_000.times do
+        Widget.new(params)
+      end
+    end
+  end
+end

data/bench/bench_create.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/bench_model'
+
+puts "Widget.create"
+Benchmark.bm do |make|
+  TIMES.times do
+    make.report do
+      10_000.times do
+        Widget.create!(:name => "bench", :description => "Bench record")
+      end
+    end
+  end
+end

data/bench/bench_find_all.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/bench_model'
+
+puts "Widget.find(:all)"
+Benchmark.bm do |make|
+  TIMES.times do
+    make.report do
+      10_000.times do
+        Widget.find(:all)
+      end
+    end
+  end
+end

data/bench/bench_find_all_mt.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/bench_model'
+
+Benchmark.bm do |make|
+  TIMES.times do
+    make.report do
+      thrs = []
+      errs = 0
+      10.times do
+        thrs << Thread.new do
+          1000.times do
+            begin
+              Widget.find(:all)
+            rescue Exception => e
+              errs += 1
+              Widget.logger.warn e.to_s
+            end
+          end
+          Widget.clear_active_connections!
+        end
+      end
+      thrs.each {|t| t.join}
+      puts "errors: #{errs}" if errs > 0
+    end
+  end
+end

data/bench/bench_model.rb

@@ -0,0 +1,85 @@
+=begin
+
+* This scripts looks for an optional argv0 which is number of times to
+  execute the particular benchmark this file is getting required into. argv1
+  is an optional parameter which represents the number of rows to create.
+* Use ENV['LOGGER'] (=severe|warn|info|debug) to turn on the logger
+* Add ActiveRecord to load path to use a specific (non-gem version) for testing (e.g., edge).
+
++----------+------+-----+---------+-----------------+----------------+
+| Field       | Type         | Null | Key | Default | Extra          |
++-------------+--------------+------+-----+---------+----------------+
+| id          | int(11)      | NO   | PRI | NULL    | auto_increment |
+| name        | varchar(255) | YES  |     | NULL    |                |
+| description | text         | YES  |     | NULL    |                |
+| created_at  | datetime     | YES  |     | NULL    |                |
+| updated_at  | datetime     | YES  |     | NULL    |                |
++-------------+--------------+------+-----+---------+----------------+
+=end
+
+TIMES = (ARGV[0] || 5).to_i
+ROW_COUNT = (ARGV[1] || 10).to_i
+
+ENV["RAILS_ENV"] = "production"
+begin
+  print "Loading ActiveRecord w/o gems..."
+  require 'active_record'
+  require 'active_record/version'
+  puts "version #{ActiveRecord::VERSION::STRING}"
+rescue LoadError
+  puts "FAILED."
+  print "Loading ActiveRecord with gems..."
+  require 'rubygems'
+  gem 'activerecord'
+  puts "version #{Gem.loaded_specs['activerecord'].version.version}"
+  require 'active_record'
+end
+require 'benchmark'
+
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../drivers/mysql/lib'
+  $LOAD_PATH.unshift File.dirname(__FILE__) + '/../adapters/mysql/lib'
+  require 'active_record/connection_adapters/jdbcmysql_adapter'
+end
+
+if ENV['LOGGER']
+  require 'logger'
+  ActiveRecord::Base.logger = Logger.new(File.expand_path(File.dirname(__FILE__) + "/debug.log"))
+  lvl = %(DEBUG INFO WARN ERROR FATAL).detect {|s| s =~ /#{ENV['LOGGER'].upcase}/}
+  ActiveRecord::Base.logger.level = lvl && Logger.const_get(lvl) || Logger::INFO
+else
+  ActiveRecord::Base.logger = Logger.new($stdout)
+  ActiveRecord::Base.logger.level = Logger::UNKNOWN
+end
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "mysql",
+  :host => "localhost",
+  :username => "root",
+  :database => "ar_bench",
+  :pool => 10,
+  :wait_timeout => 0.5
+)
+
+class CreateWidgets < ActiveRecord::Migration
+  def self.up
+    create_table :widgets do |t|
+      t.string :name
+      t.text :description
+      t.timestamps
+    end
+  end
+end
+
+CreateWidgets.up unless ActiveRecord::Base.connection.tables.include?("widgets")
+
+class Widget < ActiveRecord::Base; end
+Widget.destroy_all if Widget.count > ROW_COUNT
+count = Widget.count
+while (count < ROW_COUNT)
+  Widget.create!(:name => "bench#{count}", :description => "Bench record#{count}")
+  count = Widget.count
+end
+
+ActiveRecord::Base.clear_active_connections!