ActiveRecord-JDBC 0.2.1 → 0.2.2

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -0,0 +1,173 @@
+module JdbcSpec
+  module PostgreSQL
+    module Column
+      def type_cast(value)
+        return nil if value.nil? || value =~ /^\s*null\s*$/i
+        case type
+        when :string    then value
+        when :integer   then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
+        when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0) 
+        when :float     then value.to_f
+        when :datetime  then cast_to_date_or_time(value)
+        when :timestamp then cast_to_time(value)
+        when :time      then cast_to_time(value)
+        else value
+        end
+      end
+      def cast_to_date_or_time(value)
+        return value if value.is_a? Date
+        return nil if value.blank?
+        guess_date_or_time (value.is_a? Time) ? value : cast_to_time(value)
+      end
+
+      def cast_to_time(value)
+        return value if value.is_a? Time
+        time_array = ParseDate.parsedate value
+        time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
+        Time.send(Base.default_timezone, *time_array) rescue nil
+      end
+
+      def guess_date_or_time(value)
+        (value.hour == 0 and value.min == 0 and value.sec == 0) ?
+        Date.new(value.year, value.month, value.day) : value
+      end
+      def default_value(value)
+        # Boolean types
+        return "t" if value =~ /true/i
+        return "f" if value =~ /false/i
+        
+        # Char/String/Bytea type values
+        return $1 if value =~ /^'(.*)'::(bpchar|text|character varying|bytea)$/
+          
+        # Numeric values
+        return value if value =~ /^-?[0-9]+(\.[0-9]*)?/
+        
+        # Fixed dates / timestamp
+        return $1 if value =~ /^'(.+)'::(date|timestamp)/
+        
+        # Anything else is blank, some user type, or some function
+        # and we can't know the value of that, so return nil.
+        return nil
+      end
+    end
+    
+    def modify_types(tp)
+      tp[:primary_key] = "serial primary key"
+      tp[:string][:limit] = 255
+      tp[:integer][:limit] = nil
+      tp[:boolean][:limit] = nil
+      tp
+    end
+    
+    def default_sequence_name(table_name, pk = nil)
+      default_pk, default_seq = pk_and_sequence_for(table_name)
+      default_seq || "#{table_name}_#{pk || default_pk || 'id'}_seq"
+    end
+
+    # Find a table's primary key and sequence.
+    def pk_and_sequence_for(table)
+      # First try looking for a sequence with a dependency on the
+      # given table's primary key.
+        result = select(<<-end_sql, 'PK and serial sequence')[0]
+          SELECT attr.attname AS nm, name.nspname AS nsp, seq.relname AS rel
+          FROM pg_class      seq,
+               pg_attribute  attr,
+               pg_depend     dep,
+               pg_namespace  name,
+               pg_constraint cons
+          WHERE seq.oid           = dep.objid
+            AND seq.relnamespace  = name.oid
+            AND seq.relkind       = 'S'
+            AND attr.attrelid     = dep.refobjid
+            AND attr.attnum       = dep.refobjsubid
+            AND attr.attrelid     = cons.conrelid
+            AND attr.attnum       = cons.conkey[1]
+            AND cons.contype      = 'p'
+            AND dep.refobjid      = '#{table}'::regclass
+        end_sql
+
+        if result.nil? or result.empty?
+          # If that fails, try parsing the primary key's default value.
+          # Support the 7.x and 8.0 nextval('foo'::text) as well as
+          # the 8.1+ nextval('foo'::regclass).
+          # TODO: assumes sequence is in same schema as table.
+          result = select(<<-end_sql, 'PK and custom sequence')[0]
+            SELECT attr.attname AS nm, name.nspname AS nsp, split_part(def.adsrc, '\\\'', 2) AS rel
+            FROM pg_class       t
+            JOIN pg_namespace   name ON (t.relnamespace = name.oid)
+            JOIN pg_attribute   attr ON (t.oid = attrelid)
+            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
+            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
+            WHERE t.oid = '#{table}'::regclass
+              AND cons.contype = 'p'
+              AND def.adsrc ~* 'nextval'
+          end_sql
+        end
+        # check for existence of . in sequence name as in public.foo_sequence.  if it does not exist, join the current namespace
+        result['rel']['.'] ? [result['nm'], result['rel']] : [result['nm'], "#{result['nsp']}.#{result['rel']}"]
+      rescue
+        nil
+      end
+
+    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
+      execute(sql, name)
+      table = sql.split(" ", 4)[2]
+      id_value || last_insert_id(table, sequence_name || default_sequence_name(table, pk))
+    end
+
+    def last_insert_id(table, sequence_name)
+      Integer(select_value("SELECT currval('#{sequence_name}')"))
+    end
+
+    def quote(value, column = nil)
+      if value.kind_of?(String) && column && column.type == :binary
+        "'#{escape_bytea(value)}'"
+      elsif column && column.type == :primary_key
+        return value.to_s
+      else
+        super
+      end
+    end
+
+    def quote_column_name(name)
+      %("#{name}")
+    end
+
+    def rename_table(name, new_name)
+      execute "ALTER TABLE #{name} RENAME TO #{new_name}"
+    end
+    
+    def add_column(table_name, column_name, type, options = {})
+      execute("ALTER TABLE #{table_name} ADD #{column_name} #{type_to_sql(type, options[:limit])}")
+      execute("ALTER TABLE #{table_name} ALTER #{column_name} SET NOT NULL") if options[:null] == false
+      change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
+    end
+
+    def change_column(table_name, column_name, type, options = {}) #:nodoc:
+      begin
+        execute "ALTER TABLE #{table_name} ALTER  #{column_name} TYPE #{type_to_sql(type, options[:limit])}"
+      rescue ActiveRecord::StatementInvalid
+        # This is PG7, so we use a more arcane way of doing it.
+        begin_db_transaction
+        add_column(table_name, "#{column_name}_ar_tmp", type, options)
+        execute "UPDATE #{table_name} SET #{column_name}_ar_tmp = CAST(#{column_name} AS #{type_to_sql(type, options[:limit])})"
+        remove_column(table_name, column_name)
+        rename_column(table_name, "#{column_name}_ar_tmp", column_name)
+        commit_db_transaction
+      end
+      change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
+    end      
+    
+    def change_column_default(table_name, column_name, default) #:nodoc:
+      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT '#{default}'"
+    end
+      
+    def rename_column(table_name, column_name, new_column_name) #:nodoc:
+      execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"
+    end
+    
+    def remove_index(table_name, options) #:nodoc:
+      execute "DROP INDEX #{index_name(table_name, options)}"
+    end
+  end  
+end

data/test/db/hsqldb.rb

@@ -0,0 +1,14 @@
+config = {
+  :adapter => 'jdbc',
+  :username => 'sa',
+  :password => '',
+  :driver => 'org.hsqldb.jdbcDriver',
+  :url => 'jdbc:hsqldb:test.db'
+}
+
+ActiveRecord::Base.establish_connection(config)
+
+at_exit {
+  # Clean up hsqldb when done
+  Dir['test.db*'].each {|f| File.delete(f)}
+}

data/test/db/logger.rb

@@ -0,0 +1,3 @@
+require 'logger'
+ActiveRecord::Base.logger = Logger.new($stdout)
+ActiveRecord::Base.logger.level = Logger::DEBUG

data/test/db/mysql.rb

@@ -0,0 +1,20 @@
+config = {
+  :username => 'blog',
+  :password => ''
+}
+
+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/hsqldb_simple_test.rb

@@ -0,0 +1,9 @@
+require 'models/entry'
+require 'db/hsqldb'
+require 'simple'
+require 'test/unit'
+require 'db/logger'
+
+class HsqldbSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/manualTestDatabase.rb

@@ -41,7 +41,7 @@ ActiveRecord::Schema.define do
   change_column :author, :descr, :string, :limit => 100 if /db2|derby/ !~ ARGV[1]
   change_column_default :author, :female, false if /db2|derby|mssql|firebird/ !~ ARGV[1]
   remove_column :author, :died if /db2|derby/ !~ ARGV[1]
-  rename_column :author, :wakeup_time, :waking_time if /db2|derby/ !~ ARGV[1]
+  rename_column :author, :wakeup_time, :waking_time if /db2|derby|mimer/ !~ ARGV[1]
  
   add_index :author, :name, :unique if /db2/ !~ ARGV[1]
   add_index :author, [:age,:female], :name => :is_age_female if /db2/ !~ ARGV[1]
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define do
   remove_index :author, :name if /db2/ !~ ARGV[1]
   remove_index :author, :name => :is_age_female if /db2/ !~ ARGV[1]
   
-  rename_table :author, :authors if /db2|firebird/ !~ ARGV[1]
+  rename_table :author, :authors if /db2|firebird|mimer/ !~ ARGV[1]
 
 
     create_table :products, :force => true do |t|
@@ -73,7 +73,7 @@ ActiveRecord::Schema.define do
 end
 
 class Author < ActiveRecord::Base;
-  set_table_name "author" if /db2|firebird/ =~ ARGV[1]
+  set_table_name "author" if /db2|firebird|mimer/ =~ ARGV[1]
 end
 
 class Order < ActiveRecord::Base
@@ -152,7 +152,7 @@ end
   $stderr.print '.'
   Author.destroy_all
   Author.create(:name => "Arne Svensson", :age => 30)
-  if /db2|derby/ !~ ARGV[1]
+  if /db2|derby|mimer/ !~ ARGV[1]
     Author.create(:name => "Pelle Gogolsson", :age => 15, :waking_time => Time.now, :private_key => "afbafddsfgsdfg")
   else
     Author.create(:name => "Pelle Gogolsson", :age => 15, :wakeup_time => Time.now, :private_key => "afbafddsfgsdfg")
@@ -191,5 +191,5 @@ ActiveRecord::Schema.define do
     drop_table :products
 
   
-  drop_table((/db2|firebird/=~ARGV[1]? :author : :authors ))
+  drop_table((/db2|firebird|mimer/=~ARGV[1]? :author : :authors ))
 end

data/test/minirunit/testHsqldb.rb

@@ -1,10 +1,5 @@
-# To run this script, run the following in a mysql instance:
-#
-#   drop database if exists weblog_development;
-#   create database weblog_development;
-#   grant all on weblog_development.* to blog@localhost;
 
-require 'test/minirunit'
+require 'minirunit'
 
 config = {
   :adapter => 'jdbc',
@@ -13,10 +8,14 @@ config = {
   :driver => 'org.hsqldb.jdbcDriver',
   :url => 'jdbc:hsqldb:test.db'
 }
+RAILS_CONNECTION_ADAPTERS = ['abstract', 'jdbc']
 
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(config)
+require 'logger'
+ActiveRecord::Base.logger = Logger.new($stdout)
+ActiveRecord::Base.logger.level = Logger::DEBUG
 
 class CreateEntries < ActiveRecord::Migration
   def self.up
@@ -69,3 +68,6 @@ post.destroy
 test_equal 0, Entry.count
 
 CreateEntries.down
+
+# Clean up hsqldb when done
+Dir['test.db*'].each {|f| File.delete(f)}

data/test/minirunit/testMysql.rb

@@ -4,7 +4,7 @@
 #   create database weblog_development;
 #   grant all on weblog_development.* to blog@localhost;
 
-require 'test/minirunit'
+require 'minirunit'
 
 config = {
   :username => 'blog',

data/test/models/entry.rb

@@ -0,0 +1,22 @@
+if RUBY_PLATFORM =~ /java/
+  RAILS_CONNECTION_ADAPTERS = ['abstract', 'jdbc']
+end
+
+require 'active_record'
+
+class CreateEntries < ActiveRecord::Migration
+  def self.up
+    create_table "entries", :force => true do |t|
+      t.column :title, :string, :limit => 100
+      t.column :updated_on, :datetime
+      t.column :content, :text
+    end
+  end
+
+  def self.down
+    drop_table "entries"
+  end
+end
+
+class Entry < ActiveRecord::Base
+end

data/test/mysql_simple_test.rb

@@ -0,0 +1,15 @@
+# To run this script, run the following in a mysql instance:
+#
+#   drop database if exists weblog_development;
+#   create database weblog_development;
+#   grant all on weblog_development.* to blog@localhost;
+
+
+require 'models/entry'
+require 'db/mysql'
+require 'simple'
+require 'test/unit'
+
+class MysqlSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/simple.rb

@@ -0,0 +1,65 @@
+module MigrationSetup
+  def setup
+    CreateEntries.up
+  end
+
+  def teardown
+    CreateEntries.down
+  end
+end
+
+module FixtureSetup
+  include MigrationSetup
+  def setup
+    super
+    @title = "First post!"
+    @content = "Hello from JRuby on Rails!"
+    @new_title = "First post updated title"
+    Entry.create :title => @title, :content => @content
+  end
+end
+
+module SimpleTestMethods
+  include FixtureSetup
+
+  def test_entries_created
+    assert ActiveRecord::Base.connection.tables.include?('entries'), "entries not created"
+   end
+
+   def test_entries_empty
+     Entry.delete_all
+     assert_equal 0, Entry.count
+   end
+
+   def test_create_new_entry
+     Entry.delete_all
+
+     post = Entry.new
+     post.title = @title
+     post.content = @content
+     post.save
+
+     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
+
+     post.title = @new_title
+     post.save
+
+     post = Entry.find(:first)
+     assert_equal @new_title, post.title
+   end
+
+  def test_destroy_entry
+    prev_count = Entry.count
+    post = Entry.find(:first)
+    post.destroy
+
+    assert_equal prev_count - 1, Entry.count
+  end
+
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-09-06 00:00:00 +02:00
+  version: 0.2.2
+date: 2006-10-03 00:00:00 +02:00
 summary: JDBC support for ActiveRecord. Only usable within JRuby
 require_paths: 
 - lib
@@ -30,14 +30,29 @@ authors:
 - JRuby-extras
 files: 
 - lib/active_record
+- lib/jdbc_adapter
 - 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/jdbc_adapter/jdbc_db2.rb
+- lib/jdbc_adapter/jdbc_mssql.rb
 - test/activerecord
 - test/minirunit
+- test/models
 - test/minirunit.rb
 - test/manualTestDatabase.rb
+- test/db
+- test/hsqldb_simple_test.rb
+- test/mysql_simple_test.rb
+- test/simple.rb
 - test/activerecord/connections
 - test/activerecord/jtest.sh
 - test/activerecord/jall.sh
@@ -48,6 +63,10 @@ files:
 - test/minirunit/testConnect.rb
 - test/minirunit/testRawSelect.rb
 - test/minirunit/testLoadActiveRecord.rb
+- test/models/entry.rb
+- test/db/hsqldb.rb
+- test/db/logger.rb
+- test/db/mysql.rb
 - LICENSE
 - init.rb
 - install.rb