activerecord-jdbc-adapter 0.9.0.1 → 0.9.1

data/src/java/jdbc_adapter/SQLBlock.java

@@ -6,13 +6,22 @@
 package jdbc_adapter;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
-import org.jruby.runtime.builtin.IRubyObject;
+import java.sql.Statement;
 
 /**
  *
  * @author nicksieger
  */
-public interface SQLBlock {
-    IRubyObject call(Connection c) throws SQLException;
+public abstract class SQLBlock {
+    abstract Object call(Connection c) throws SQLException;
+
+    public void close(Statement statement) {
+        RubyJdbcConnection.close(statement);
+    }
+
+    public void close(ResultSet resultSet) {
+        RubyJdbcConnection.close(resultSet);
+    }
 }

data/src/java/jdbc_adapter/Sqlite3RubyJdbcConnection.java

@@ -0,0 +1,41 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package jdbc_adapter;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author enebo
+ */
+public class Sqlite3RubyJdbcConnection extends RubyJdbcConnection {
+    protected Sqlite3RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createSqlite3JdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("Sqlite3JdbcConnection",
+                jdbcConnection, SQLITE3_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(Sqlite3RubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator SQLITE3_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new Sqlite3RubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    @Override
+    protected IRubyObject tables(ThreadContext context, String catalog, String schemaPattern, String tablePattern, String[] types) {
+        return (IRubyObject) withConnectionAndRetry(context, tableLookupBlock(context.getRuntime(), catalog, schemaPattern, tablePattern, types, true));
+    }
+}

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -7,7 +7,7 @@ require 'test/unit'
 JInteger = java.lang.Integer
 
 class TypeConversionTest < Test::Unit::TestCase
-  TEST_TIME = Time.at(1169964202)
+  TEST_TIME = Time.at(1169964202).gmtime
   def setup
     DbTypeMigration.up  
     DbType.create(

data/test/db/derby.rb

@@ -6,9 +6,6 @@ config = {
 }
 
 ActiveRecord::Base.establish_connection(config)
-logger = Logger.new 'derby-testdb.log'
-logger.level = Logger::DEBUG
-ActiveRecord::Base.logger = logger
 
 at_exit {  
   # Clean up derby files

data/test/db/h2.rb

@@ -4,9 +4,6 @@ config = {
 }
 
 ActiveRecord::Base.establish_connection(config)
-logger = Logger.new 'h2-testdb.log'
-logger.level = Logger::DEBUG
-ActiveRecord::Base.logger = logger
 
 at_exit {
   # Clean up hsqldb when done

data/test/db/hsqldb.rb

@@ -4,12 +4,9 @@ config = {
 }
 
 ActiveRecord::Base.establish_connection(config)
-logger = Logger.new 'hsqldb-testdb.log'
-logger.level = Logger::DEBUG
-ActiveRecord::Base.logger = logger
 
 at_exit {
   # Clean up hsqldb when done
   Dir['test.db*'].each {|f| File.delete(f)}
-  File.delete('hsqldb-testdb.log')
+  File.delete('hsqldb-testdb.log') rescue nil #can't delete on windows
 }

data/test/db/mysql.rb

@@ -7,3 +7,4 @@ config = {
 }
 
 ActiveRecord::Base.establish_connection(config)
+

data/test/db/oracle.rb

@@ -11,8 +11,13 @@ ActiveRecord::Base.establish_connection(config)
 # Here are some notes of things I had to do to get running on Oracle
 # XE.
 #
+#   ON Linux:
 #   create tablespace weblog_development
 #     datafile '/usr/lib/oracle/xe/oradata/XE/weblog_development.dbf';
+#   ON Windows XP:
+#   create tablespace weblog_development 
+#     datafile 'C:\ORACLEXE\ORADATA\XE\WEBLOGD.DBF' size 16m;
+#
 #   create user blog identified by blog
 #     default tablespace weblog_development;
 #   grant all privileges to blog;

data/test/db/sqlite3.rb

@@ -1,11 +1,15 @@
+require 'jdbc/sqlite3' if jruby?
+
 config = {
-  :adapter => 'sqlite3',
-  :database => 'test.sqlite3'
+  :adapter => jruby? ? 'jdbcsqlite3' : 'sqlite3', 
+  :dbfile  => 'test.sqlite3.db'
+#  :url => 'jdbc:sqlite:test.sqlite3.db',
+#  :driver => 'org.sqlite.JDBC'
 }
 
 ActiveRecord::Base.establish_connection(config)
 
 at_exit {
-  # Clean up hsqldb when done
+  # Clean up sqlite3 db when done
   Dir['test.sqlite3*'].each {|f| File.delete(f)}
 }

data/test/derby_migration_test.rb

@@ -0,0 +1,21 @@
+require 'jdbc_common'
+require 'db/derby'
+
+class CreateDummies < ActiveRecord::Migration
+  def self.up
+    create_table :dummies, :force => true do |t|
+      t.string :year, :default => "", :null => false
+    end
+    add_index :dummies, :year, :unique => true
+  end
+  
+end
+
+class DerbyQuotingTest < Test::Unit::TestCase
+  include FixtureSetup
+
+  def test_create_table_column_quoting_vs_keywords
+    CreateDummies.up
+  end
+  
+end

data/test/has_many_through.rb

@@ -19,6 +19,7 @@ class CreateRbac < ActiveRecord::Migration
       t.column :name, :string
       t.column :controller_name, :string
       t.column :actions, :string
+      t.column :hours, :float, :null => false
     end
   end
 
@@ -61,12 +62,18 @@ module HasManyThroughMethods
   end
 
   def test_has_many_through
-    role_rights   = Right.create( {:name => "Administrator - Full Access To Roles", :actions => "*", :controller_name => "Admin::RolesController"} )
-    right_rights  = Right.create( {:name => "Administrator - Full Access To Rights", :actions => "*", :controller_name => "Admin::RightsController"} )
-
     admin_role    = Role.create( {:name => "Administrator", :description => "System defined super user - access to right and role management."} )
+    admin_role.save
+
+    assert_equal(0, admin_role.rights.sum(:hours))
+
+    role_rights   = Right.create( {:name => "Administrator - Full Access To Roles", :actions => "*", :controller_name => "Admin::RolesController", :hours => 0} )
+    right_rights  = Right.create( {:name => "Administrator - Full Access To Rights", :actions => "*", :controller_name => "Admin::RightsController", :hours => 1.5} )
+
     admin_role.rights << role_rights
     admin_role.rights << right_rights
     admin_role.save
+
+    assert_equal(1.5, admin_role.rights.sum(:hours))
   end
-end
+end

data/test/jdbc_common.rb

@@ -1,12 +1,24 @@
+# Simple method to reduce the boilerplate
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+end
+
 require 'rubygems'
 # Specify version of activerecord with ENV['AR_VERSION'] if desired
 gem 'activerecord', ENV['AR_VERSION'] if ENV['AR_VERSION']
-require 'jdbc_adapter'
+require 'active_record/version'
+require 'jdbc_adapter' if jruby?
 puts "Using activerecord version #{ActiveRecord::VERSION::STRING}"
 puts "Specify version with AR_VERSION=={version} or RUBYLIB={path}"
 require 'models/auto_id'
 require 'models/entry'
+require 'models/data_types'
 require 'models/add_not_null_column_to_table'
 require 'simple'
 require 'has_many_through'
 require 'test/unit'
+
+# Comment/uncomment to enable logging to be loaded for any of the database adapters
+# require 'db/logger'
+
+

data/test/models/data_types.rb

@@ -5,7 +5,17 @@ class DbTypeMigration < ActiveRecord::Migration
   def self.up
     create_table "db_types", :force => true do |t|
       t.column :sample_timestamp, :timestamp
-      t.column :sample_decimal, :decimal, :precision=> 15, :scale => 0
+      t.column :sample_datetime, :datetime
+      t.column :sample_date, :date
+      t.column :sample_time, :time
+      t.column :sample_decimal, :decimal, :precision => 15, :scale => 0
+      t.column :sample_small_decimal, :decimal, :precision => 3, :scale => 2
+      t.column :sample_float, :float
+      t.column :sample_binary, :binary
+      t.column :sample_boolean, :boolean
+      t.column :sample_string, :string, :default => ''
+      t.column :sample_integer, :integer, :limit => 5
+      t.column :sample_text, :text
     end
   end
 

data/test/models/mixed_case.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'active_record'
+
+module Migration
+  class MixedCase < ActiveRecord::Migration
+    
+    def self.up
+      create_table "mixed_cases" do |t|
+        t.column :SOME_value, :string
+      end
+    end
+    
+    def self.down
+      drop_table "mixed_cases"
+    end
+  end
+end
+
+class MixedCase < ActiveRecord::Base
+end

data/test/mysql_multibyte_test.rb

@@ -4,3 +4,7 @@ require 'db/mysql'
 class MySQLMultibyteTest < Test::Unit::TestCase
   include MultibyteTestMethods
 end
+
+class MySQLNonUTF8EncodingTest < Test::Unit::TestCase
+  include NonUTF8EncodingMethods
+end

data/test/oracle_simple_test.rb

@@ -26,4 +26,4 @@ class OracleSpecificTest < Test::Unit::TestCase
     obj = klass.find(:first)
     assert_equal 0.076, obj.value
   end
-end
+end if defined?(JRUBY_VERSION)

data/test/postgres_mixed_case_test.rb

@@ -0,0 +1,19 @@
+require 'jdbc_common'
+require 'models/mixed_case'
+
+class MixedCaseTest < Test::Unit::TestCase
+  
+  def setup
+    Migration::MixedCase.up
+  end
+
+  def teardown
+    Migration::MixedCase.down
+  end
+
+  def test_create
+    mixed_case = MixedCase.create :SOME_value => 'some value'
+    assert_equal 'some value', mixed_case.SOME_value
+  end
+
+end

data/test/simple.rb

@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 ActiveRecord::Schema.verbose = false
+ActiveRecord::Base.time_zone_aware_attributes = true if ActiveRecord::Base.respond_to?(:time_zone_aware_attributes)
+ActiveRecord::Base.default_timezone = :utc
+#just a random zone, unlikely to be local, and not utc
+Time.zone = 'Moscow' if Time.respond_to?(:zone)
 
 module MigrationSetup
   def setup
+    DbTypeMigration.up
     CreateEntries.up
     CreateAutoIds.up
 
@@ -10,6 +15,7 @@ module MigrationSetup
   end
 
   def teardown
+    DbTypeMigration.down
     CreateEntries.down
     CreateAutoIds.down
     ActiveRecord::Base.clear_active_connections!
@@ -25,6 +31,7 @@ module FixtureSetup
     @new_title = "First post updated title"
     @rating = 205.76
     Entry.create :title => @title, :content => @content, :rating => @rating
+    DbType.create
   end
 end
 
@@ -40,6 +47,15 @@ module SimpleTestMethods
     assert_equal 0, Entry.count
   end
 
+  def test_insert_returns_id
+    unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
+      value = ActiveRecord::Base.connection.insert("INSERT INTO entries (title, content, rating) VALUES('insert_title', 'some content', 1)")
+      assert !value.nil?
+      entry = Entry.find_by_title('insert_title')
+      assert_equal value, entry.id
+    end
+  end
+
   def test_create_new_entry
     Entry.delete_all
 
@@ -78,15 +94,132 @@ module SimpleTestMethods
     assert_equal prev_count - 1, Entry.count
   end
 
+  if Time.respond_to?(:zone)
+    def test_save_time
+      t = Time.now
+      #precision will only be expected to the second.
+      time = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec)
+      e = DbType.find(:first)
+      e.sample_datetime = time
+      e.save!
+      e = DbType.find(:first)
+      assert_equal time.in_time_zone, e.sample_datetime
+    end
+
+    def test_save_date_time
+      t = Time.now
+      #precision will only be expected to the second.
+      time = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec)
+      datetime = time.to_datetime
+      e = DbType.find(:first)
+      e.sample_datetime = datetime
+      e.save!
+      e = DbType.find(:first)
+      assert_equal time, e.sample_datetime.localtime
+    end
+
+    def test_save_time_with_zone
+      t = Time.now
+      #precision will only be expected to the second.
+      original_time = Time.local(t.year, t.month, t.day, t.hour, t.min, t.sec)
+      time = original_time.in_time_zone
+      e = DbType.find(:first)
+      e.sample_datetime = time
+      e.save!
+      e = DbType.find(:first)
+      assert_equal time, e.sample_datetime
+    end
+  end
+
+  def test_save_float
+    e = DbType.find(:first)
+    e.sample_float = 12.0
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal(12.0, e.sample_float)
+  end
+
+  def test_save_date
+    date = Date.new(2007)
+    e = DbType.find(:first)
+    e.sample_date = date
+    e.save!
+    e = DbType.find(:first)
+    assert_equal date, e.sample_date
+  end
+
+  def test_boolean
+    # An unset boolean should default to nil
+    e = DbType.find(:first)
+    assert_equal(nil, e.sample_boolean)
+
+    e.sample_boolean = true
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal(true, e.sample_boolean)
+  end
+  
+  def test_integer
+    # An unset boolean should default to nil
+    e = DbType.find(:first)
+    assert_equal(nil, e.sample_integer)
+
+    e.sample_integer = 10
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal(10, e.sample_integer)
+  end
+
+  def test_text
+    # An unset boolean should default to nil
+    e = DbType.find(:first)
+
+    # Oracle adapter initializes all CLOB fields with empty_clob() function,
+    # so they all have a initial value of an empty string ''
+    assert_equal(nil, e.sample_text) unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
+
+    e.sample_text = "ooop"
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal("ooop", e.sample_text)
+  end
+
+  def test_string
+    e = DbType.find(:first)
+
+    # An empty string is treated as a null value in Oracle: http://www.techonthenet.com/oracle/questions/empty_null.php
+    assert_equal('', e.sample_string) unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
+    e.sample_string = "ooop"
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal("ooop", e.sample_string)
+  end
+
+  def test_save_binary
+    #string is 60_000 bytes
+    binary_string = "\000ABCDEFGHIJKLMNOPQRSTUVWXYZ'\001\003"*1#2_000
+    e = DbType.find(:first)
+    e.sample_binary = binary_string
+    e.send(:write_attribute, :binary, binary_string)
+    e.save!
+    e = DbType.find(:first)
+    assert_equal binary_string, e.sample_binary
+  end
+
   def test_indexes
     # Only test indexes if we have implemented it for the particular adapter
     if @connection.respond_to?(:indexes)
       indexes = @connection.indexes(:entries)
       assert_equal(0, indexes.size)
-        
+
       index_name = "entries_index"
       @connection.add_index(:entries, :updated_on, :name => index_name)
-        
+
       indexes = @connection.indexes(:entries)
       assert_equal(1, indexes.size)
       assert_equal "entries", indexes.first.table.to_s
@@ -123,17 +256,28 @@ module SimpleTestMethods
     assert_equal 1, Entry.count
   end
 
-  def test_connection_valid
-    assert_raises(ActiveRecord::ActiveRecordError) do
-      @connection.raw_connection.with_connection_retry_guard do |c|
-        begin
-          stmt = c.createStatement
-          stmt.execute "bogus sql"
-        ensure
-          stmt.close rescue nil
+  if jruby?
+    def test_connection_valid
+      assert_raises(ActiveRecord::ActiveRecordError) do
+        @connection.raw_connection.with_connection_retry_guard do |c|
+          begin
+            stmt = c.createStatement
+            stmt.execute "bogus sql"
+          ensure
+            stmt.close rescue nil
+          end
         end
       end
     end
+
+    class Animal < ActiveRecord::Base; end
+
+    # ENEBO: Is this really ar-jdbc-specific or a bug in our adapter?
+    def test_fetching_columns_for_nonexistent_table_should_raise
+      assert_raises(ActiveRecord::ActiveRecordError) do
+        Animal.columns
+      end
+    end
   end
 
   def test_disconnect
@@ -150,29 +294,57 @@ module SimpleTestMethods
     AddNotNullColumnToTable.down
   end
 
-  class Animal < ActiveRecord::Base; end
-  def test_fetching_columns_for_nonexistent_table_should_raise
-    assert_raises(ActiveRecord::ActiveRecordError) do
-      Animal.columns
+  class ChangeEntriesTable < ActiveRecord::Migration
+    def self.up
+      change_table :entries do |t|
+        t.string :author
+      end if respond_to?(:change_table)
     end
+    def self.down
+      change_table :entries do |t|
+        t.remove :author
+      end if respond_to?(:change_table)
+    end
+  end
+  def test_change_table
+    ChangeEntriesTable.up
+    ChangeEntriesTable.down
   end
 end
 
 module MultibyteTestMethods
   include MigrationSetup
 
-  def setup
-    super
-    config = ActiveRecord::Base.connection.config
-    jdbc_driver = ActiveRecord::ConnectionAdapters::JdbcDriver.new(config[:driver])
-    jdbc_driver.load
-    @java_con = jdbc_driver.connection(config[:url], config[:username], config[:password])
-    @java_con.setAutoCommit(true)
-  end
+  if defined?(JRUBY_VERSION)
+    def setup
+      super
+      config = ActiveRecord::Base.connection.config
+      jdbc_driver = ActiveRecord::ConnectionAdapters::JdbcDriver.new(config[:driver])
+      jdbc_driver.load
+      @java_con = jdbc_driver.connection(config[:url], config[:username], config[:password])
+      @java_con.setAutoCommit(true)
+    end
 
-  def teardown
-    @java_con.close
-    super
+    def teardown
+      @java_con.close
+      super
+    end
+
+    def test_select_multibyte_string
+      @java_con.createStatement().execute("insert into entries (id, title, content) values (1, 'テスト', '本文')")
+      entry = Entry.find(:first)
+      assert_equal "テスト", entry.title
+      assert_equal "本文", entry.content
+      assert_equal entry, Entry.find_by_title("テスト")
+    end
+
+    def test_update_multibyte_string
+      Entry.create!(:title => "テスト", :content => "本文")
+      rs = @java_con.createStatement().executeQuery("select title, content from entries")
+      assert rs.next
+      assert_equal "テスト", rs.getString(1)
+      assert_equal "本文", rs.getString(2)
+    end
   end
 
   def test_multibyte_aliasing
@@ -186,23 +358,7 @@ module MultibyteTestMethods
       end
     end
   end
-  
-  def test_select_multibyte_string
-    @java_con.createStatement().execute("insert into entries (id, title, content) values (1, 'テスト', '本文')")
-    entry = Entry.find(:first)
-    assert_equal "テスト", entry.title
-    assert_equal "本文", entry.content
-    assert_equal entry, Entry.find_by_title("テスト")
-  end
 
-  def test_update_multibyte_string
-    Entry.create!(:title => "テスト", :content => "本文")
-    rs = @java_con.createStatement().executeQuery("select title, content from entries")
-    assert rs.next
-    assert_equal "テスト", rs.getString(1)
-    assert_equal "本文", rs.getString(2)
-  end
-  
   def test_chinese_word
     chinese_word = '中文'
     new_entry = Entry.create(:title => chinese_word)
@@ -210,3 +366,26 @@ module MultibyteTestMethods
     assert_equal chinese_word, new_entry.title
   end
 end
+
+module NonUTF8EncodingMethods
+  def setup
+    @connection = ActiveRecord::Base.remove_connection
+    latin2_connection = @connection.dup
+    latin2_connection[:encoding] = 'latin2'
+    latin2_connection.delete(:url) # pre-gen url gets stashed; remove to re-gen
+    ActiveRecord::Base.establish_connection latin2_connection
+    CreateEntries.up
+  end
+
+  def teardown
+    CreateEntries.down
+    ActiveRecord::Base.establish_connection @connection
+  end
+
+  def test_nonutf8_encoding_in_entry
+    prague_district = 'hradčany'
+    new_entry = Entry.create :title => prague_district
+    new_entry.reload
+    assert_equal prague_district, new_entry.title
+  end
+end