ActiveRecord-JDBC 0.2.2 → 0.2.3

data/test/models/auto_id.rb

@@ -0,0 +1,19 @@
+require 'jdbc_adapter'
+require 'rubygems'
+require 'active_record'
+
+class CreateAutoIds < ActiveRecord::Migration
+  def self.up
+    create_table "auto_ids", :force => true do |t|
+      t.column :value, :integer
+    end
+  end
+
+  def self.down
+    drop_table "auto_ids"
+  end
+end
+
+class AutoId < ActiveRecord::Base
+  def self.table_name () "auto_ids" end
+end

data/test/models/data_types.rb

@@ -0,0 +1,19 @@
+require 'jdbc_adapter'
+require 'rubygems'
+require 'active_record'
+
+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
+    end
+  end
+
+  def self.down
+    drop_table "db_types"
+  end
+end
+
+class DbType < ActiveRecord::Base
+end

data/test/models/entry.rb

@@ -1,7 +1,5 @@
-if RUBY_PLATFORM =~ /java/
-  RAILS_CONNECTION_ADAPTERS = ['abstract', 'jdbc']
-end
-
+require 'jdbc_adapter'
+require 'rubygems'
 require 'active_record'
 
 class CreateEntries < ActiveRecord::Migration
@@ -10,6 +8,7 @@ class CreateEntries < ActiveRecord::Migration
       t.column :title, :string, :limit => 100
       t.column :updated_on, :datetime
       t.column :content, :text
+      t.column :rating, :decimal, :precision => 10
     end
   end
 

data/test/mysql_simple_test.rb

@@ -5,6 +5,7 @@
 #   grant all on weblog_development.* to blog@localhost;
 
 
+require 'models/auto_id'
 require 'models/entry'
 require 'db/mysql'
 require 'simple'

data/test/simple.rb

@@ -1,10 +1,14 @@
 module MigrationSetup
   def setup
     CreateEntries.up
+    CreateAutoIds.up
+
+    @connection = ActiveRecord::Base.connection
   end
 
   def teardown
     CreateEntries.down
+    CreateAutoIds.down
   end
 end
 
@@ -15,7 +19,8 @@ module FixtureSetup
     @title = "First post!"
     @content = "Hello from JRuby on Rails!"
     @new_title = "First post updated title"
-    Entry.create :title => @title, :content => @content
+    @rating = 205
+    Entry.create :title => @title, :content => @content, :rating => @rating
   end
 end
 
@@ -23,36 +28,43 @@ module SimpleTestMethods
   include FixtureSetup
 
   def test_entries_created
-    assert ActiveRecord::Base.connection.tables.include?('entries'), "entries not created"
-   end
+    assert ActiveRecord::Base.connection.tables.find{|t| t =~ /^entries$/i}, "entries not created"
+  end
 
-   def test_entries_empty
-     Entry.delete_all
-     assert_equal 0, Entry.count
-   end
+  def test_entries_empty
+    Entry.delete_all
+    assert_equal 0, Entry.count
+  end
 
-   def test_create_new_entry
-     Entry.delete_all
+  def test_create_new_entry
+    Entry.delete_all
 
-     post = Entry.new
-     post.title = @title
-     post.content = @content
-     post.save
+    post = Entry.new
+    post.title = @title
+    post.content = @content
+    post.rating = @rating
+    post.save
 
-     assert_equal 1, Entry.count
-   end
+    assert_equal 1, Entry.count
+  end
 
-   def test_find_and_update_entry
-     post = Entry.find(:first)
-     assert_equal @title, post.title
-     assert_equal @content, post.content
+  def test_create_partial_new_entry
+    new_entry = Entry.create(:title => "Blah")
+    new_entry2 = Entry.create(:title => "Bloh")
+  end
 
-     post.title = @new_title
-     post.save
+  def test_find_and_update_entry
+    post = Entry.find(:first)
+    assert_equal @title, post.title
+    assert_equal @content, post.content
+    assert_equal @rating, post.rating
+
+    post.title = @new_title
+    post.save
 
-     post = Entry.find(:first)
-     assert_equal @new_title, post.title
-   end
+    post = Entry.find(:first)
+    assert_equal @new_title, post.title
+  end
 
   def test_destroy_entry
     prev_count = Entry.count
@@ -62,4 +74,43 @@ module SimpleTestMethods
     assert_equal prev_count - 1, Entry.count
   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
+      assert_equal index_name, indexes.first.name
+      assert !indexes.first.unique
+      assert_equal ["updated_on"], indexes.first.columns
+    end
+  end
+
+  def test_dumping_schema
+    require 'active_record/schema_dumper'
+    @connection.add_index :entries, :title
+    stio = StringIO.open('', 'w') do |io|
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
+    end
+    assert_match(/add_index "entries",/, stio.string)
+    @connection.remove_index :entries, :title
+
+  end
+
+  def test_nil_values
+    test = AutoId.create('value' => '')
+    assert_nil AutoId.find(test.id).value
+  end
+
+  def test_invalid
+    e = Entry.new(:title => @title, :content => @content, :rating => ' ')
+    p e.valid?
+  end
+
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2006-10-03 00:00:00 +02:00
-summary: JDBC support for ActiveRecord. Only usable within JRuby
+  version: 0.2.3
+date: 2007-03-05 00:00:00 -06:00
+summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: 
 - lib
-email: ola@ologix.com
-homepage: http://jruby-extras.rubyforge.org/
-rubyforge_project: 
-description: 
-autorequire: active_record/connection_adapters/jdbc_adapter
+email: nick@nicksieger.com, ola.bini@ki.se
+homepage: http://jruby-extras.rubyforge.org/ActiveRecord-JDBC
+rubyforge_project: jruby-extras
+description: ActiveRecord-JDBC 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.
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
@@ -27,49 +27,49 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- JRuby-extras
+- Nick Sieger, Ola Bini and JRuby contributors
 files: 
-- lib/active_record
-- lib/jdbc_adapter
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- LICENSE
 - lib/jdbc_adapter.rb
-- lib/active_record/connection_adapters
-- lib/active_record/connection_adapters/jdbc_adapter_spec.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
-- lib/jdbc_adapter/jdbc_postgre.rb
-- lib/jdbc_adapter/jdbc_oracle.rb
-- lib/jdbc_adapter/jdbc_mimer.rb
-- lib/jdbc_adapter/jdbc_hsqldb.rb
-- lib/jdbc_adapter/jdbc_firebird.rb
-- lib/jdbc_adapter/jdbc_derby.rb
-- lib/jdbc_adapter/jdbc_mysql.rb
+- lib/active_record/connection_adapters/jdbc_adapter_spec.rb
+- lib/active_record/connection_adapters/jndi_adapter.rb
 - lib/jdbc_adapter/jdbc_db2.rb
+- lib/jdbc_adapter/jdbc_derby.rb
+- lib/jdbc_adapter/jdbc_firebird.rb
+- lib/jdbc_adapter/jdbc_hsqldb.rb
+- lib/jdbc_adapter/jdbc_mimer.rb
 - lib/jdbc_adapter/jdbc_mssql.rb
-- test/activerecord
-- test/minirunit
-- test/models
-- test/minirunit.rb
-- test/manualTestDatabase.rb
-- test/db
+- lib/jdbc_adapter/jdbc_mysql.rb
+- lib/jdbc_adapter/jdbc_oracle.rb
+- lib/jdbc_adapter/jdbc_postgre.rb
+- test/derby_simple_test.rb
+- test/h2_simple_test.rb
 - test/hsqldb_simple_test.rb
+- test/manualTestDatabase.rb
+- test/minirunit.rb
 - test/mysql_simple_test.rb
 - test/simple.rb
-- test/activerecord/connections
-- test/activerecord/jtest.sh
-- test/activerecord/jall.sh
-- test/activerecord/connections/native_jdbc_mysql
+- test/activerecord/connection_adapters/type_conversion_test.rb
 - test/activerecord/connections/native_jdbc_mysql/connection.rb
+- test/db/derby.rb
+- test/db/h2.rb
+- test/db/hsqldb.rb
+- test/db/logger.rb
+- test/db/mysql.rb
+- test/minirunit/testConnect.rb
+- test/minirunit/testH2.rb
 - test/minirunit/testHsqldb.rb
+- test/minirunit/testLoadActiveRecord.rb
 - test/minirunit/testMysql.rb
-- test/minirunit/testConnect.rb
 - test/minirunit/testRawSelect.rb
-- test/minirunit/testLoadActiveRecord.rb
+- test/models/auto_id.rb
+- test/models/data_types.rb
 - test/models/entry.rb
-- test/db/hsqldb.rb
-- test/db/logger.rb
-- test/db/mysql.rb
-- LICENSE
-- init.rb
-- install.rb
 test_files: []
 
 rdoc_options: []

data/init.rb

@@ -1,8 +0,0 @@
-RAILS_CONNECTION_ADAPTERS << 'jdbc'
-require 'active_record/connection_adapters/jdbc_adapter'
-
-[:initialize_database, :initialize_framework_logging, :initialize_framework_settings].each do |cmd|
-  Rails::Initializer.run(cmd) do |config|
-    config.frameworks = [:active_record]
-  end
-end

data/install.rb

@@ -1,25 +0,0 @@
-
-require 'fileutils'
-
-from_d=File.expand_path(File.join(File.dirname(__FILE__),'lib','active_record'))
-to_d=File.expand_path(File.join(RAILS_ROOT,'lib','active_record'))
-
-FileUtils.cp_r from_d, to_d
-
-env_file = File.expand_path(File.join(RAILS_ROOT,"config","environment.rb"))
-bck_file = File.expand_path(File.join(RAILS_ROOT,"config","~.environment.rb.before_jdbc"))
-
-FileUtils.mv env_file,bck_file
-
-File.open(bck_file,"r") {|inf|
-  File.open(env_file,"w") {|out|
-    inf.each_line do |ln|
-      if ln =~ /^Rails::Initializer\.run/
-        out.puts "# Added by ActiveRecord JDBC plugin"
-        out.puts "require 'jdbc_adapter'"
-        out.puts
-      end
-      out.puts ln
-    end
-  }
-}

data/test/activerecord/jall.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for test in *_test.rb; do
-    ./jtest.sh $test
-done
-
-#jruby.sh -I connections/native_jdbc_mysql -e 'Dir.foreach(".") { |file| require file if file =~ /_test.rb$/ }' | tee all.log

data/test/activerecord/jtest.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-jruby.sh -I connections/native_jdbc_mysql $1 | tee $1.log