ActiveRecord-JDBC 0.2.2 → 0.2.3

data/lib/active_record/connection_adapters/jndi_adapter.rb

@@ -0,0 +1,51 @@
+require 'active_record/connection_adapters/jdbc_adapter'
+
+module ActiveRecord #:nodoc:
+  class Base #:nodoc:
+    def self.jdbc_connection(config)
+      config.symbolize_keys
+      if config[:jndi]
+        connection = ConnectionAdapters::JndiConnection.new(config)
+      else
+        connection = ConnectionAdapters::JdbcConnection.new(config)
+      end
+      ConnectionAdapters::JdbcAdapter.new(connection, logger, config)
+    end
+  end
+
+  module ConnectionAdapters #:nodoc:
+    
+    # This adapter allows ActiveRecord to use JNDI to retrieve
+    # a JDBC connection from a previously configured DataSource.
+    # The ActiveRecord configuration looks like this:
+    #
+    #       ActiveRecord::Base.establish_connection(
+    #         :adapter => 'jdbc',
+    #         :jndi => 'java:comp/env/jdbc/test',
+	  #					:driver => 'sqlserver'		
+    #       )
+    #
+    # Right now, enough driver information needs to be supplied so that AR-JDBC
+    # can genrate the right flavor of SQL. However, it's not necessary to know
+    # exactly which driver is being used, just enough so the right SQL is generated.
+    #
+    class JndiConnection < JdbcConnection
+
+      def initialize(config)
+        @config = config
+        jndi = @config[:jndi].to_s
+
+        ctx = javax.naming.InitialContext.new
+        ds = ctx.lookup(jndi)
+        @connection = ds.connection
+        set_native_database_types
+
+        @stmts = {}
+      rescue Exception => e
+        raise "The driver encountered an error: #{e}"
+      end
+
+    end
+  end
+end
+

data/lib/jdbc_adapter.rb

@@ -1 +1,9 @@
-require 'active_record/connection_adapters/jdbc_adapter'
+if RUBY_PLATFORM =~ /java/
+  if defined?(RAILS_CONNECTION_ADAPTERS)
+    RAILS_CONNECTION_ADAPTERS << %q(jdbc)
+  else
+    RAILS_CONNECTION_ADAPTERS = %w(jdbc)
+  end
+else
+  raise "ActiveRecord-JDBC is for use with JRuby only"
+end

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -82,14 +82,69 @@ module JdbcSpec
       execute "RENAME TABLE #{name} TO #{new_name}"
     end
 
+    # Support for removing columns added via derby bug issue:
+    # https://issues.apache.org/jira/browse/DERBY-1489
+    #
+    # This feature has not made it into a formal release and is not in Java 6.  We will
+    # need to conditionally support this somehow (supposed to arrive for 10.3.0.0)
+    #
+    # def remove_column(table_name, column_name)
+    #  execute "ALTER TABLE #{table_name} DROP COLUMN #{column_name} RESTRICT"
+    # end
+    
+    # Notes about changing in Derby:
+    #    http://db.apache.org/derby/docs/10.2/ref/rrefsqlj81859.html#rrefsqlj81859__rrefsqlj37860)
+    # Derby cannot: Change the column type or decrease the precision of an existing type, but
+    #   can increase the types precision only if it is a VARCHAR.
+    #
+    def change_column(table_name, column_name, type, options = {}) #:nodoc:
+      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DATA TYPE #{type_to_sql(type, options[:limit])}"
+    end
+
+    def change_column_default(table_name, column_name, default) #:nodoc:
+      execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DEFAULT #{quote(default)}"
+    end
+
+    # Support for renaming columns:
+    # https://issues.apache.org/jira/browse/DERBY-1490
+    #
+    # This feature is expect to arrive in version 10.3.0.0:
+    # http://wiki.apache.org/db-derby/DerbyTenThreeRelease)
+    #
+    #def rename_column(table_name, column_name, new_column_name) #:nodoc:
+    #  execute "ALTER TABLE #{table_name} ALTER RENAME COLUMN #{column_name} TO #{new_column_name}"
+    #end
+    
+    def primary_keys(table_name)
+      @connection.primary_keys table_name.to_s.upcase
+    end
+    
+    # For migrations, exclude the primary key index as recommended
+    # by the HSQLDB docs.  This is not a great test for primary key
+    # index.
+    def indexes(table_name)
+      @connection.indexes(table_name)
+    end
+    
     def quote(value, column = nil) # :nodoc:
-      if column && column.type == :primary_key
-        return value.to_s
-      end
+      return value.to_s if column && column.type == :primary_key
+
       case value
-      when String                
-        if column && column.type == :binary
-          "CAST(x'#{quote_string(value).unpack("C*").collect {|v| v.to_s(16)}.join}' AS BLOB)"
+      when String
+        if column 
+          case column.type
+          when :binary
+            "CAST(x'#{quote_string(value).unpack("C*").collect {|v| v.to_s(16)}.join}' AS BLOB)"
+          when :string
+            "'#{quote_string(value)}'"
+          else
+            vi = value.to_i
+            if vi.to_s == value
+              value
+            else
+              "'#{quote_string(value)}'"
+            end
+          end
         else
           vi = value.to_i
           if vi.to_s == value
@@ -101,6 +156,11 @@ module JdbcSpec
       else super
       end
     end
+
+# For DDL it appears you can quote "" column names, but in queries (like insert it errors out?)
+#    def quote_column_name(name) #:nodoc:
+#        %Q{"#{name}"}
+#    end
     
     def quoted_true
       '1'

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -6,7 +6,7 @@ module JdbcSpec
         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 :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)
@@ -32,12 +32,36 @@ module JdbcSpec
         (value.hour == 0 and value.min == 0 and value.sec == 0) ?
         Date.new(value.year, value.month, value.day) : value
       end
+
+
+      private
+      def simplified_type(field_type)
+        case field_type
+        when /longvarchar/i
+          :text
+        else
+          super(field_type)
+        end
+      end
+
+      # Override of ActiveRecord::ConnectionAdapters::Column
+      def extract_limit(sql_type)
+        # HSQLDB appears to return "LONGVARCHAR(0)" for :text columns, which
+        # for AR purposes should be interpreted as "no limit"
+        return nil if sql_type =~ /\(0\)/
+        super
+      end
     end
 
     def modify_types(tp)
       tp[:primary_key] = "INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY"
       tp[:integer][:limit] = nil
       tp[:boolean][:limit] = nil
+      # set text and float limits so we don't see odd scales tacked on
+      # in migrations
+      tp[:text][:limit] = nil
+      tp[:float][:limit] = 17
+      tp[:string][:limit] = 255
       tp[:datetime] = { :name => "DATETIME" }
       tp[:timestamp] = { :name => "DATETIME" }
       tp[:time] = { :name => "DATETIME" }
@@ -47,7 +71,7 @@ module JdbcSpec
 
     def quote(value, column = nil) # :nodoc:
       case value
-      when String                
+      when String
         if column && column.type == :binary
           "'#{quote_string(value).unpack("C*").collect {|v| v.to_s(16)}.join}'"
         else
@@ -57,6 +81,10 @@ module JdbcSpec
       end
     end
 
+    def quote_string(str)
+      str.gsub(/'/, "''")
+    end
+
     def quoted_true
       '1'
     end
@@ -100,5 +128,25 @@ module JdbcSpec
         sql.replace "select limit #{offset} 0 #{bef}"
       end
     end
+
+    # override to filter out system tables that otherwise end
+    # up in db/schema.rb during migrations.  JdbcConnection#tables
+    # now takes an optional block filter so we can screen out
+    # rows corresponding to system tables.  HSQLDB names its
+    # system tables SYSTEM.*, but H2 seems to name them without
+    # any kind of convention
+    def tables
+      @connection.tables do |result_row|
+        result_row.get_string(ActiveRecord::ConnectionAdapters::Jdbc::TableMetaData::TABLE_TYPE) !~ /^SYSTEM TABLE$/i
+      end
+    end
+
+    # For migrations, exclude the primary key index as recommended
+    # by the HSQLDB docs.  This is not a great test for primary key
+    # index.
+    def indexes(table_name, name = nil)
+      @connection.indexes(table_name.to_s)
+    end
+
   end
 end

data/lib/jdbc_adapter/jdbc_mysql.rb

@@ -1,3 +1,5 @@
+require 'active_record/connection_adapters/abstract/schema_definitions'
+
 module JdbcSpec
   module MySQL
     def modify_types(tp)
@@ -73,18 +75,7 @@ module JdbcSpec
     end
     
     def indexes(table_name, name = nil)#:nodoc:
-      indexes = []
-      current_index = nil
-      execute("SHOW KEYS FROM #{table_name}", name).each do |row|
-        if current_index != row[2]
-          next if row[2] == "PRIMARY" # skip the primary key
-          current_index = row[2]
-          indexes << IndexDefinition.new(row[0], row[2], row[1] == "0", [])
-        end
-        
-        indexes.last.columns << row[4]
-      end
-      indexes
+      @connection.indexes(table_name)      
     end
     
     def create_table(name, options = {}) #:nodoc:

data/test/activerecord/connection_adapters/type_conversion_test.rb

@@ -0,0 +1,30 @@
+require 'java'
+require 'models/data_types'
+require 'db/derby'
+require 'test/unit'
+
+JInteger = java.lang.Integer
+
+class TypeConversionTest < Test::Unit::TestCase
+
+  def setup
+    DbTypeMigration.up  
+    DbType.create(
+      :sample_timestamp => Time.at(1169964202),
+      :sample_decimal => JInteger::MAX_VALUE + 1)
+  end
+  
+  def teardown
+    DbTypeMigration.down
+  end
+  
+  def test_timestamp
+    types = DbType.find(:first)
+    assert_equal 'Sun Jan 28 06:03:22 UTC 2007', types.sample_timestamp.getutc.to_s
+  end
+  
+  def test_decimal
+    types = DbType.find(:first)
+    assert_equal((JInteger::MAX_VALUE + 1), types.sample_decimal)
+  end
+end

data/test/db/derby.rb

@@ -0,0 +1,21 @@
+require 'logger'
+
+config = {
+  :adapter => 'jdbc',
+  :username => 'sa',
+  :password => '',
+  :driver => 'org.apache.derby.jdbc.EmbeddedDriver',
+  :url => 'jdbc:derby:derby-testdb;create=true'
+}
+
+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
+  require 'fileutils'
+  Dir.glob('derby-testdb/**/*') {|f| File.delete(f)}
+  FileUtils.rm_r('derby-testdb')
+}

data/test/db/h2.rb

@@ -0,0 +1,14 @@
+config = {
+  :adapter => 'jdbc',
+  :username => 'sa',
+  :password => '',
+  :driver => 'org.h2.Driver',
+  :url => 'jdbc:h2: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/hsqldb.rb

@@ -4,11 +4,16 @@ config = {
   :password => '',
   :driver => 'org.hsqldb.jdbcDriver',
   :url => 'jdbc:hsqldb:test.db'
+  #:url => 'jdbc:hsqldb:mem:test'
 }
 
 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')
 }

data/test/derby_simple_test.rb

@@ -0,0 +1,16 @@
+# 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/auto_id'
+require 'models/entry'
+require 'db/derby'
+require 'simple'
+require 'test/unit'
+
+class DerbySimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/h2_simple_test.rb

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

data/test/hsqldb_simple_test.rb

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

data/test/minirunit/testH2.rb

@@ -0,0 +1,73 @@
+
+require 'minirunit'
+
+config = {
+  :adapter => 'jdbc',
+  :username => 'sa',
+  :password => '',
+  :driver => 'org.h2.Driver',
+  :url => 'jdbc:h2: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
+    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
+
+CreateEntries.up
+
+test_ok ActiveRecord::Base.connection.tables.include?('entries')
+
+class Entry < ActiveRecord::Base
+end
+
+Entry.delete_all
+
+test_equal 0, Entry.count
+
+TITLE = "First post!"
+CONTENT = "Hello from JRuby on Rails!"
+NEW_TITLE = "First post updated title"
+
+post = Entry.new
+post.title = TITLE
+post.content = CONTENT
+post.save
+
+test_equal 1, Entry.count
+
+post = Entry.find(:first)
+test_equal TITLE, post.title
+test_equal CONTENT, post.content
+
+post.title = NEW_TITLE
+post.save
+
+post = Entry.find(:first)
+test_equal NEW_TITLE, post.title
+
+post.destroy
+
+test_equal 0, Entry.count
+
+CreateEntries.down
+
+# Clean up hsqldb when done
+Dir['test.db*'].each {|f| File.delete(f)}