ActiveRecord-JDBC 0.4 → 0.5

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -1,5 +1,6 @@
 require 'java'
 require 'models/data_types'
+require 'active_record/connection_adapters/jdbc_adapter'
 require 'db/derby'
 require 'test/unit'
 

data/test/db/derby.rb

@@ -1,11 +1,8 @@
 require 'logger'
 
 config = {
-  :adapter => 'jdbc',
-  :username => 'sa',
-  :password => '',
-  :driver => 'org.apache.derby.jdbc.EmbeddedDriver',
-  :url => 'jdbc:derby:derby-testdb;create=true'
+  :adapter => 'derby',
+  :database => "derby-testdb"
 }
 
 ActiveRecord::Base.establish_connection(config)

data/test/db/h2.rb

@@ -1,9 +1,6 @@
 config = {
-  :adapter => 'jdbc',
-  :username => 'sa',
-  :password => '',
-  :driver => 'org.h2.Driver',
-  :url => 'jdbc:h2:test.db'
+  :adapter => 'h2',
+  :database => 'test.db'
 }
 
 ActiveRecord::Base.establish_connection(config)

data/test/db/hsqldb.rb

@@ -1,10 +1,6 @@
 config = {
-  :adapter => 'jdbc',
-  :username => 'sa',
-  :password => '',
-  :driver => 'org.hsqldb.jdbcDriver',
-  :url => 'jdbc:hsqldb:test.db'
-  #:url => 'jdbc:hsqldb:mem:test'
+  :adapter => 'hsqldb',
+  :database => 'test.db'
 }
 
 ActiveRecord::Base.establish_connection(config)

data/test/db/jdbc.rb

@@ -0,0 +1,9 @@
+config = {
+  :username => 'blog',
+  :password => '',
+  :adapter  => 'jdbc',
+  :driver   => 'com.mysql.jdbc.Driver',
+  :url      => 'jdbc:mysql://localhost:3306/weblog_development'
+}
+
+ActiveRecord::Base.establish_connection(config)

data/test/db/mysql.rb

@@ -1,20 +1,9 @@
 config = {
   :username => 'blog',
-  :password => ''
+  :password => '',
+  :adapter  => 'mysql',
+  :database => 'weblog_development',
+  :host     => 'localhost'
 }
 
-if RUBY_PLATFORM =~ /java/
-  config.update({
-    :adapter  => 'jdbc',
-    :driver   => 'com.mysql.jdbc.Driver',
-    :url      => 'jdbc:mysql://localhost:3306/weblog_development',
-  })
-else
-  config.update({
-    :adapter  => 'mysql',
-    :database => 'weblog_development',
-    :host     => 'localhost'
-  })
-end
-
 ActiveRecord::Base.establish_connection(config)

data/test/db/postgres.rb

@@ -1,8 +1,7 @@
 config = { 
-  :adapter => 'jdbc',
+  :adapter => 'postgresql',
   :database => 'weblog_development',
-  :url => 'jdbc:postgresql://localhost/weblog_development',
-  :driver => 'org.postgresql.Driver',
+  :host => 'localhost',
   :username => 'blog',
   :password => ''
 }

data/test/generic_jdbc_connection_test.rb

@@ -0,0 +1,9 @@
+require 'jdbc_common'
+require 'db/jdbc'
+
+class GenericJdbcConnectionTest < Test::Unit::TestCase
+  def test_connection_available_through_jdbc_adapter
+    ActiveRecord::Base.connection.execute("show databases");
+    assert ActiveRecord::Base.connected?
+  end
+end

data/test/jdbc_adapter/jdbc_db2_test.rb

@@ -0,0 +1,21 @@
+require 'java'
+require 'lib/jdbc_adapter/jdbc_db2'
+require 'test/unit'
+
+class JdbcSpec::DB2Test < Test::Unit::TestCase
+  def setup
+    @inst = Object.new
+    @inst.extend JdbcSpec::DB2
+    @column = Object.new
+    class <<@column
+      attr_accessor :type
+    end
+  end
+  
+  def test_quote_decimal
+    assert_equal %q{'123.45'}, @inst.quote("123.45")
+    @column.type = :decimal
+    assert_equal %q{123.45}, @inst.quote("123.45", @column), "decimal columns should not have quotes"
+  end
+  
+end

data/test/simple.rb

@@ -115,16 +115,12 @@ module SimpleTestMethods
 
 end
 
-class ActiveRecord::Base
-  cattr_accessor :defined_connections
-end
-
 module MultibyteTestMethods
   include MigrationSetup
 
   def setup
     super
-    config = ActiveRecord::Base.defined_connections["ActiveRecord::Base"].config
+    config = ActiveRecord::Base.connection.config
     props = java.util.Properties.new
     props.setProperty("user", config[:username])
     props.setProperty("password", config[:password])
@@ -138,16 +134,18 @@ module MultibyteTestMethods
   end
 
   def test_select_multibyte_string
-    @java_con.createStatement().execute("insert into entries (title) values ('テスト')")
+    @java_con.createStatement().execute("insert into entries (title, content) values ('テスト', '本文')")
     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 => "テスト")
-    rs = @java_con.createStatement().executeQuery("select title from entries")
+    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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: "0.4"
-date: 2007-06-07 00:00:00 -07:00
+  version: "0.5"
+date: 2007-08-24 00:00:00 -07:00
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: 
 - lib
@@ -34,8 +34,15 @@ files:
 - README.txt
 - Rakefile
 - LICENSE
+- lib/active_record/connection_adapters/derby_adapter.rb
+- lib/active_record/connection_adapters/h2_adapter.rb
+- lib/active_record/connection_adapters/hsqldb_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter_spec.rb
+- lib/active_record/connection_adapters/jndi_adapter.rb
+- lib/active_record/connection_adapters/mysql_adapter.rb
+- lib/active_record/connection_adapters/oracle_adapter.rb
+- lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/jdbc_adapter/jdbc_db2.rb
 - lib/jdbc_adapter/jdbc_derby.rb
 - lib/jdbc_adapter/jdbc_firebird.rb
@@ -53,14 +60,17 @@ files:
 - test/db/derby.rb
 - test/db/h2.rb
 - test/db/hsqldb.rb
+- test/db/jdbc.rb
 - test/db/jndi_config.rb
 - test/db/logger.rb
 - test/db/mysql.rb
 - test/db/postgres.rb
 - test/derby_multibyte_test.rb
 - test/derby_simple_test.rb
+- test/generic_jdbc_connection_test.rb
 - test/h2_simple_test.rb
 - test/hsqldb_simple_test.rb
+- test/jdbc_adapter/jdbc_db2_test.rb
 - test/jdbc_common.rb
 - test/jndi_test.rb
 - test/manualTestDatabase.rb
@@ -78,6 +88,9 @@ files:
 - test/postgres_simple_test.rb
 - test/simple.rb
 - lib/tasks/jdbc_databases.rake
+- src/java/JdbcAdapterInternalService.java
+- src/java/JDBCDerbySpec.java
+- src/java/JDBCMySQLSpec.java
 test_files: []
 
 rdoc_options: