activerecord-jdbc-adapter 1.0.0.beta1-java → 1.0.0.beta2-java

data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java

@@ -0,0 +1,85 @@
+/*
+ **** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
+ * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ***** END LICENSE BLOCK *****/
+package arjdbc.oracle;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import arjdbc.jdbc.RubyJdbcConnection;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author nicksieger
+ */
+public class OracleRubyJdbcConnection extends RubyJdbcConnection {
+    protected OracleRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    public static RubyClass createOracleJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
+        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("OracleJdbcConnection",
+                jdbcConnection, ORACLE_JDBCCONNECTION_ALLOCATOR);
+        clazz.defineAnnotatedMethods(OracleRubyJdbcConnection.class);
+
+        return clazz;
+    }
+
+    private static ObjectAllocator ORACLE_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
+        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+            return new OracleRubyJdbcConnection(runtime, klass);
+        }
+    };
+
+    /**
+     * Oracle needs this override to reconstruct NUMBER which is different
+     * from NUMBER(x) or NUMBER(x,y).
+     */
+    @Override
+    protected String typeFromResultSet(ResultSet resultSet) throws SQLException {
+        int precision = intFromResultSet(resultSet, COLUMN_SIZE);
+        int scale = intFromResultSet(resultSet, DECIMAL_DIGITS);
+
+        // According to http://forums.oracle.com/forums/thread.jspa?threadID=658646
+        // Unadorned NUMBER reports scale == null, so we look for that here.
+        if (scale < 0 && resultSet.getInt(DATA_TYPE) == java.sql.Types.DECIMAL) {
+            precision = -1;
+        }
+
+        String type = resultSet.getString(TYPE_NAME);
+        if (precision > 0) {
+            type += "(" + precision;
+            if(scale > 0) type += "," + scale;
+            type += ")";
+        }
+
+        return type;
+    }
+}

data/test/abstract_db_create.rb

@@ -28,8 +28,11 @@ module AbstractDbCreate
     load File.dirname(__FILE__) + '/../lib/arjdbc/jdbc/jdbc.rake' if jruby?
     task :environment do
       ActiveRecord::Base.configurations = configurations
+      @full_env_loaded = true
+    end
+    task :rails_env do
+      @rails_env_set = true
     end
-    task :rails_env
   end
 
   def teardown
@@ -38,6 +41,8 @@ module AbstractDbCreate
     restore_rails
     ActiveRecord::Base.configurations = @prevconfigs
     ActiveRecord::Base.establish_connection(db_config)
+    @rails_env_set = nil
+    @full_env_loaded = nil
   end
 
   def setup_rails

data/test/db/jndi_config.rb

@@ -1,6 +1,18 @@
 require 'fileutils'
 require 'arjdbc'
 
+JNDI_CONFIG = {
+  :adapter => "jdbc",
+  :jndi => 'jdbc/derbydb'
+}
+
+# To test JNDI, grab fscontext-1_2-beta3.zip from
+# http://java.sun.com/products/jndi/downloads/index.html
+# and put fscontext.jar and providerutil.jar in test/
+require 'test/fscontext.jar'
+require 'test/providerutil.jar'
+require 'jdbc/derby'
+
 System = java.lang.System
 Context = javax.naming.Context
 InitialContext = javax.naming.InitialContext
@@ -15,16 +27,14 @@ jdbc_dir = jndi_dir + '/jdbc'
 FileUtils.mkdir_p jdbc_dir unless File.exist?(jdbc_dir)
 
 System.set_property(Context::PROVIDER_URL, "file://#{jndi_dir}")
-derby_ref = Reference.new('javax.sql.DataSource',
-                          'org.apache.commons.dbcp.BasicDataSourceFactory',
-                          nil)
-derby_ref.add StringRefAddr.new('driverClassName',
-                                'org.apache.derby.jdbc.EmbeddedDriver')
-derby_ref.add StringRefAddr.new('url',
-                                'jdbc:derby:derby-testdb;create=true')
-derby_ref.add StringRefAddr.new('username', 'sa')
-derby_ref.add StringRefAddr.new('password', '')
 
 ic = InitialContext.new
-ic.rebind("jdbc/derbydb", derby_ref)
+ic.rebind(JNDI_CONFIG[:jndi],
+          org.apache.derby.jdbc.EmbeddedDataSource.new.tap {|ds|
+            ds.database_name = "derby-testdb"
+            ds.create_database = "create"
+            ds.user = "sa"
+            ds.password = ""})
+
 
+ActiveRecord::Base.establish_connection(JNDI_CONFIG)

data/test/db2_simple_test.rb

@@ -3,6 +3,40 @@ require 'db/db2'
 
 class DB2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+
+  # For backwards compatibility with how the DB2 code in
+  # jdbc_adapter 0.9.x handled booleans.
+  #
+  # The old DB2 jdbc_db2.rb driver was broken enough that
+  # applications were exposed to the underlying type (was DECIMAL)
+  # and used 0 and 1 as false and true, respectively.
+  #
+  # This driver now uses SMALLINT as a boolean, and properly
+  # type cast's it to a Ruby boolean. Need to make sure we don't
+  # break existing apps!
+  def test_boolean_as_integer
+    e = DbType.find(:first)
+
+    # true
+    e.sample_boolean = 1
+    assert_equal true, e.sample_boolean
+    assert_equal true, e.sample_boolean?
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal true, e.sample_boolean
+    assert_equal true, e.sample_boolean?
+
+    # false
+    e.sample_boolean = 0
+    assert_equal false, e.sample_boolean
+    assert_equal false, e.sample_boolean?
+    e.save!
+
+    e = DbType.find(:first)
+    assert_equal false, e.sample_boolean
+    assert_equal false, e.sample_boolean?
+  end
 end
 
 class DB2HasManyThroughTest < Test::Unit::TestCase
@@ -29,5 +63,4 @@ class DB2Test < Test::Unit::TestCase
     @column.type = :primary_key
     assert_equal 'int not null generated by default as identity (start with 1) primary key', @inst.modify_types({:string => {}, :integer => {}, :boolean => {}})[:primary_key]
   end
-
 end

data/test/derby_simple_test.rb

@@ -18,4 +18,82 @@ class DerbySimpleTest < Test::Unit::TestCase
     end
     assert_equal [['ur', 'doin', 'it', 'right']], value
   end
+
+  def test_find_with_include_and_order
+    users = User.find(:all, :include=>[:entries], :order=>"entries.rating DESC", :limit=>2)
+
+    assert users.include?(@user)
+  end
+
+  def test_text_and_string_conversions
+    e = DbType.find(:first)
+
+    # Derby will normally reject any non text value.
+    # The adapter has been patched to convert non text values to strings
+    ['string', 45, 4.3, 18488425889503641645].each do |value|
+      assert_nothing_raised do
+        e.sample_string = value
+        e.sample_text = value
+        e.save!
+        e.reload
+        assert_equal [value.to_s]*2, [e.sample_string, e.sample_text]
+      end
+    end
+    [true, false].each do |value|
+      assert_nothing_raised do
+        e.sample_string = value
+        e.sample_text = value
+        e.save!
+        e.reload
+        assert_equal [value ? "1" : "0"]*2, [e.sample_string, e.sample_text]
+      end
+    end
+    assert_nothing_raised do
+      value = Time.now
+      if ActiveRecord::VERSION::MAJOR >= 3
+        str = value.utc.to_s(:db)
+      else                      # AR 2 #quoted_date did not do TZ conversions
+        str = value.to_s(:db)
+      end
+      e.sample_string = value
+      e.sample_text = value
+      e.save!
+      e.reload
+      assert_equal [str]*2, [e.sample_string, e.sample_text]
+    end
+    assert_nothing_raised do
+      value = Date.today
+      e.sample_string = value
+      e.sample_text = value
+      e.save!
+      e.reload
+      assert_equal [value.to_s(:db)]*2, [e.sample_string, e.sample_text]
+    end
+    value = {'a' => 7}
+    assert_nothing_raised do
+      e.sample_string = value
+      e.sample_text = value
+      e.save!
+      e.reload
+      assert_equal [value.to_yaml]*2, [e.sample_string, e.sample_text]
+    end
+    value = BigDecimal.new("0")
+    assert_nothing_raised do
+      e.sample_string = value
+      e.sample_text = value
+      e.save!
+      e.reload
+      assert_equal ['0.0']*2, [e.sample_string, e.sample_text]
+    end
+    # An empty string is treated as a null value in Oracle: http://www.techonthenet.com/oracle/questions/empty_null.php
+    unless ActiveRecord::Base.connection.adapter_name =~ /oracle/i
+      assert_nothing_raised do
+        e.sample_string = nil
+        e.sample_text = nil
+        e.save!
+        e.reload
+        assert_equal [nil]*2, [e.sample_string, e.sample_text]
+      end
+    end
+  end
 end

data/test/generic_jdbc_connection_test.rb

@@ -6,4 +6,24 @@ class GenericJdbcConnectionTest < Test::Unit::TestCase
     ActiveRecord::Base.connection.execute("show databases");
     assert ActiveRecord::Base.connected?
   end
-end
+
+  def test_configure_connection_url
+    connection = Object.new
+    connection.extend ActiveRecord::ConnectionAdapters::JdbcConnection::ConfigHelper
+    connection.config = { :url => "jdbc://somehost", :options => { :hoge => "true", :fuya => "false"} }
+    assert_equal "jdbc://somehost?hoge=true&fuya=false", connection.configure_url
+
+    connection.config = { :url => "jdbc://somehost?param=0", :options => { :hoge => "true", :fuya => "false"} }
+    assert_equal "jdbc://somehost?param=0&hoge=true&fuya=false", connection.configure_url
+  end
+
+  def test_connection_fails_without_driver_and_url
+    conn = ActiveRecord::Base.remove_connection
+    assert_raises(ActiveRecord::ConnectionNotEstablished) do
+      ActiveRecord::Base.establish_connection :adapter => 'jdbc'
+      ActiveRecord::Base.connection
+    end
+  ensure
+    ActiveRecord::Base.establish_connection conn
+  end
+end

data/test/jndi_callbacks_test.rb

@@ -1,4 +1,5 @@
 require 'jdbc_common'
+require 'db/jndi_config'
 
 begin
   require 'mocha'
@@ -9,7 +10,7 @@ class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
     @connection.stubs(:jndi_connection?).returns(true)
     @connection.stubs(:adapter=)
     @logger = mock "logger"
-    @config = { :jndi => "jdbc/some_pool", :adapter => "mysql" }
+    @config = JNDI_CONFIG
     Entry.connection_pool.disconnect!
     assert !Entry.connection_pool.connected?
     class << Entry.connection_pool; public :instance_variable_set; end

data/test/jndi_test.rb

@@ -17,19 +17,9 @@ require 'db/jndi_config'
 
 class DerbyJndiTest < Test::Unit::TestCase
   include SimpleTestMethods
-  alias_method :setup_simple, :setup
-  def setup
-    ActiveRecord::Base.establish_connection({
-        :jndi => 'jdbc/derbydb',
-        :adapter => 'jdbc'})
-    logger = Logger.new('jndi_test.log')
-    logger.level = Logger::DEBUG
-    ActiveRecord::Base.logger = logger
-    setup_simple
-  end
 end
 
-at_exit { 
+at_exit {
   require 'fileutils'
   FileUtils.rm_rf 'derby-testdb'
 }

data/test/models/entry.rb

@@ -8,6 +8,7 @@ class CreateEntries < ActiveRecord::Migration
       t.column :updated_on, :datetime
       t.column :content, :text
       t.column :rating, :decimal, :precision => 10, :scale => 2
+      t.column :user_id, :integer
     end
   end
 
@@ -17,7 +18,26 @@ class CreateEntries < ActiveRecord::Migration
 end
 
 class Entry < ActiveRecord::Base
+  belongs_to :user
+
   def to_param
     "#{id}-#{title.gsub(/[^a-zA-Z0-9]/, '-')}"
   end
 end
+
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table "users", :force => true do |t|
+      t.column :login, :string, :limit => 100
+    end
+  end
+
+  def self.down
+    drop_table "users"
+  end
+end
+
+class User < ActiveRecord::Base
+  has_many :entries
+end
+

data/test/mssql_limit_offset_test.rb

@@ -42,20 +42,48 @@ class Viking < ActiveRecord::Base
   belongs_to :long_ship
 end
 
+
+class CreateNoIdVikings < ActiveRecord::Migration
+  def self.up
+    create_table "no_id_vikings", :force => true do |t|
+      t.string "name", :limit => 50, :default => "Sven"
+    end
+    remove_column "no_id_vikings", "id"
+  end
+
+  def self.down
+    drop_table "no_id_vikings"
+  end
+end
+
+class NoIdViking < ActiveRecord::Base
+end
+
+
+
 class MsSQLLimitOffsetTest < Test::Unit::TestCase
 
   def setup
     CreateLongShips.up
     CreateVikings.up
+    CreateNoIdVikings.up
     @connection = ActiveRecord::Base.connection
   end
 
   def teardown
     CreateVikings.down
     CreateLongShips.down
+    CreateNoIdVikings.down
     ActiveRecord::Base.clear_active_connections!
   end
 
+  def test_limit_with_no_id_column_available
+    NoIdViking.create!(:name => 'Erik')
+    assert_nothing_raised(ActiveRecord::StatementInvalid) do 
+      NoIdViking.find(:first)
+    end
+  end
+
   def test_limit_and_offset
     %w(one two three four five six seven eight).each do |name|
       LongShip.create!(:name => name)

data/test/mssql_simple_test.rb

@@ -12,7 +12,7 @@ class MsSQLSimpleTest < Test::Unit::TestCase
   undef_method :test_validates_uniqueness_of_strings_case_sensitive
 
   def test_does_not_munge_quoted_strings
-    example_quoted_values = [%{'quoted'}, %{D'oh!}]
+    example_quoted_values = [%{'quoted'}, %{D\'oh!}]
     example_quoted_values.each do |value|
       entry = Entry.create!(:title => value)
       entry.reload
@@ -46,4 +46,10 @@ class MsSQLSimpleTest < Test::Unit::TestCase
 
   end
 
+  # ACTIVERECORD_JDBC-124
+  def test_model_does_not_have_row_num_column
+    entry = Entry.first
+    assert !entry.attributes.keys.include?("_row_num")
+    assert !entry.respond_to?(:_row_num)
+  end
 end