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

data/History.txt

@@ -2,8 +2,9 @@
 
 - Thanks to David Kellum, Dmitry Denisov, Dwayne Litzenberger, Gregor
   Schmidt, James Walker, John Duff, Joshua Suggs, Nicholas J Kreucher,
-  Peter Donald, Geoff Longman, and Ryan Bell for their contributions
-  to this release.
+  Peter Donald, Geoff Longman, Uwe Kubosch, Youhei Kondou, Michael
+  Pitman, Alex B, and Ryan Bell for their contributions to this
+  release.
 - BIG set of DB2 updates (Thanks Nick Kreucher)
 - Deprecate jdbc_adapter/rake_tasks
 - (1.0.0.beta1)
@@ -21,19 +22,19 @@
 - JRUBY-1642: Don't use H2 INFORMATION_SCHEMA in table or column
   searches
 - JRUBY-4972: Attempt to deal with type(0)/:limit => 0 by not setting
-  it808e213 JRUBY-5040: Fix issue with limits on timestamps in MySQL
-- JRUBY-3555: Allow setting Derby schema with 'schema:' option917ebd9
-  ACTIVERECORD_JDBC-98: Make sure we actuall raise an error when
+  it808e213
+- JRUBY-5040: Fix issue with limits on timestamps in MySQL
+- JRUBY-3555: Allow setting Derby schema with 'schema:' option
+- ACTIVERECORD_JDBC-98: Make sure we actuall raise an error when
   inappropriately configured
 - ACTIVERECORD_JDBC-112: Add schema dumper tests for already-fixed
   MySQL type limits
-- ACTIVERECORD_JDBC-113: Fix PG float precision issue2c6b1aa No longer
-  need M[ys]SQL escape hatch on case-sensitive test
+- ACTIVERECORD_JDBC-113: Fix PG float precision issue
 - ACTIVERECORD_JDBC-103: Fix decimal options for PG add/change column
   (Michael Pitman)
 - ACTIVERECORD_JDBC-127: Fix quoting of Date vs. Time(stamp) for
   Oracle (Lenny Marks)
-- Oracle: Sort out theNUMBER vs NUMBER(x) vs NUMBER(x,y) situation.
+- Oracle: Sort out the NUMBER vs NUMBER(x) vs NUMBER(x,y) situation.
 - JRUBY-3051: Think we finally got the PG mixed-case patches applied.
 - JRUBY-5081: Consolidate code for dropping DB via postgres
 - ACTIVERECORD_JDBC-101: Add override of LONGVARCHAR => CLOB for
@@ -45,6 +46,10 @@
   queries (alex b)
 - ACTIVERECORD_JDBC-129: Don't have limits for text, binary or bit
   fields
+- (1.0.0 final)
+- Fix a few more SQLite3 AR tests
+- SQLite3: handle ":memory:" database
+- Release new SQLite3 driver 3.6.14.2 and new Derby driver 10.6.2.1
 
 == 0.9.7
 

data/Manifest.txt

@@ -7,7 +7,6 @@ lib/activerecord-jdbc-adapter.rb
 lib/arjdbc.rb
 lib/jdbc_adapter.rb
 lib/pg.rb
-lib/active_record/connection_adapters/cachedb_adapter.rb
 lib/active_record/connection_adapters/derby_adapter.rb
 lib/active_record/connection_adapters/h2_adapter.rb
 lib/active_record/connection_adapters/hsqldb_adapter.rb
@@ -26,7 +25,6 @@ lib/arel/engines/sql/compilers/h2_compiler.rb
 lib/arel/engines/sql/compilers/hsqldb_compiler.rb
 lib/arel/engines/sql/compilers/jdbc_compiler.rb
 lib/arel/engines/sql/compilers/mssql_compiler.rb
-lib/arjdbc/cachedb.rb
 lib/arjdbc/db2.rb
 lib/arjdbc/derby.rb
 lib/arjdbc/discover.rb
@@ -43,8 +41,6 @@ lib/arjdbc/postgresql.rb
 lib/arjdbc/sqlite3.rb
 lib/arjdbc/sybase.rb
 lib/arjdbc/version.rb
-lib/arjdbc/cachedb/adapter.rb
-lib/arjdbc/cachedb/connection_methods.rb
 lib/arjdbc/db2/adapter.rb
 lib/arjdbc/derby/adapter.rb
 lib/arjdbc/derby/connection_methods.rb
@@ -90,7 +86,6 @@ lib/jdbc_adapter/rake_tasks.rb
 lib/jdbc_adapter/version.rb
 lib/arjdbc/jdbc/adapter_java.jar
 test/abstract_db_create.rb
-test/cachedb_simple_test.rb
 test/db2_simple_test.rb
 test/derby_migration_test.rb
 test/derby_multibyte_test.rb
@@ -132,7 +127,6 @@ test/sqlite3_simple_test.rb
 test/sybase_jtds_simple_test.rb
 test/activerecord/connection_adapters/type_conversion_test.rb
 test/activerecord/connections/native_jdbc_mysql/connection.rb
-test/db/cachedb.rb
 test/db/db2.rb
 test/db/derby.rb
 test/db/h2.rb

data/README.txt

@@ -110,6 +110,15 @@ or like this (but requires that you manually put the driver jar on the classpath
       :url => 'jdbc:derby:test_ar;create=true'
     )
 
+== Extending AR-JDBC
+
+You can create your own extension to AR-JDBC for a JDBC-based database
+that core AR-JDBC does not support. We've created an example project
+for the Intersystems Cache database that you can examine as a
+template. See the project for more information at the following URL:
+
+  http://github.com/nicksieger/activerecord-cachedb-adapter
+
 == Getting the source
 
 The source for activerecord-jdbc-adapter is available using git.

data/lib/arel/engines/sql/compilers/mssql_compiler.rb

@@ -2,15 +2,27 @@ module Arel
   module SqlCompiler
     class MsSQLCompiler < GenericCompiler
       def select_sql
-        query = super
-        
+        projections = @relation.projections
         offset = relation.skipped
         limit = relation.taken
-        @engine.connection.add_limit_offset!(query, :limit => limit, :offset => offset) if offset || limit
-    
+        if Count === projections.first && projections.size == 1 &&
+          (relation.taken.present? || relation.wheres.present?) && relation.joins(self).blank?
+          subquery = [
+            "SELECT * FROM #{relation.from_clauses}", build_clauses
+          ].join ' '
+          @engine.connection.add_limit_offset!(subquery, :limit => limit, :offset => offset) if offset || limit
+          query = "SELECT COUNT(*) AS count_id FROM (#{subquery}) AS subquery"
+        else
+          query = [
+            "SELECT     #{relation.select_clauses.join(', ')}",
+            "FROM       #{relation.from_clauses}",
+            build_clauses
+          ].compact.join ' '
+          @engine.connection.add_limit_offset!(query, :limit => limit, :offset => offset) if offset || limit
+        end
         query
       end
-      
+
       def build_clauses
         joins   = relation.joins(self)
         wheres  = relation.where_clauses

data/lib/arjdbc/db2/adapter.rb

@@ -98,14 +98,24 @@ module ArJdbc
 
     # holy moly batman! all this to tell AS400 "yes i am sure"
     def execute_and_auto_confirm(sql)
-      @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
       begin
+        @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
         @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
-        execute sql
-      ensure
+      rescue Exception => e
+        raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
+          "Do you have authority to do this?\n\n" + e.to_s
+      end
+
+      r = execute sql
+
+      begin
         @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)',0000000027.00000)"
-        @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000) "
+        @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000)"
+      rescue Exception => e
+        raise "Could not call CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876).\n" +
+          "Do you have authority to do this?\n\n" + e.to_s
       end
+      r
     end
 
     def last_insert_id(sql)
@@ -214,18 +224,18 @@ um <= #{sanitize_limit(limit) + offset}"
 
     def change_column_null(table_name, column_name, null)
       if null
-        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
+        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
       else
-        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
+        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET NOT NULL"
       end
       reorg_table(table_name)
     end
 
     def change_column_default(table_name, column_name, default)
       if default.nil?
-        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
+        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
       else
-        execute "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
+        execute_and_auto_confirm "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
       end
       reorg_table(table_name)
     end
@@ -263,7 +273,7 @@ um <= #{sanitize_limit(limit) + offset}"
     # http://publib.boulder.ibm.com/infocenter/db2luw/v9r7/topic/com.ibm.db2.luw.sql.ref.doc/doc/r0000980.html
     def rename_table(name, new_name) #:nodoc:
       execute "RENAME TABLE #{name} TO #{new_name}"
-      reorg_table(table_name)
+      reorg_table(new_name)
     end
 
     def tables

data/lib/arjdbc/discover.rb

@@ -20,13 +20,6 @@ module ::ArJdbc
   end
 
   # Other adapters are lazy-loaded
-  extension :CacheDB do |name|
-    if name =~ /cache/i
-      require 'arjdbc/cachedb'
-      true
-    end
-  end
-
   extension :DB2 do |name, config|
     if name =~ /(db2|as400)/i && config[:url] !~ /^jdbc:derby:net:/
       require 'arjdbc/db2'

data/lib/arjdbc/jdbc/adapter.rb

@@ -32,6 +32,7 @@ module ActiveRecord
         end
         super(connection, logger)
         extend spec if spec
+        configure_arel2_visitors
         connection.adapter = self
         JndiConnectionPoolCallbacks.prepare(self, connection)
       end
@@ -88,6 +89,19 @@ module ActiveRecord
         'JDBC'
       end
 
+      def arel2_visitors
+        {}
+      end
+
+      def configure_arel2_visitors
+        if defined?(::Arel::Visitors::VISITORS)
+          visitors = ::Arel::Visitors::VISITORS
+          arel2_visitors.each do |k,v|
+            visitors[k] = v unless visitors.has_key?(k)
+          end
+        end
+      end
+
       def is_a?(klass)          # :nodoc:
         # This is to fake out current_adapter? conditional logic in AR tests
         if Class === klass && klass.name =~ /#{adapter_name}Adapter$/i

data/lib/arjdbc/mysql/adapter.rb

@@ -90,6 +90,10 @@ module ::ArJdbc
       'MySQL'
     end
 
+    def arel2_visitors
+      {'jdbcmysql' => ::Arel::Visitors::MySQL}
+    end
+
     def case_sensitive_equality_operator
       "= BINARY"
     end

data/lib/arjdbc/sqlite3/adapter.rb

@@ -23,26 +23,11 @@ module ::ArJdbc
         return nil if value.nil?
         case type
         when :string   then value
-        when :integer  then ArJdbc::SQLite3::Column.cast_to_integer(value)
         when :primary_key then defined?(value.to_i) ? value.to_i : (value ? 1 : 0)
         when :float    then value.to_f
-        when :datetime then ArJdbc::SQLite3::Column.cast_to_date_or_time(value)
-        when :date then ArJdbc::SQLite3::Column.cast_to_date_or_time(value)
-        when :time     then ArJdbc::SQLite3::Column.cast_to_time(value)
         when :decimal  then self.class.value_to_decimal(value)
         when :boolean  then self.class.value_to_boolean(value)
-        else value
-        end
-      end
-
-      def type_cast_code(var_name)
-        case type
-          when :integer  then "ArJdbc::SQLite3::Column.cast_to_integer(#{var_name})"
-          when :datetime then "ArJdbc::SQLite3::Column.cast_to_date_or_time(#{var_name})"
-          when :date     then "ArJdbc::SQLite3::Column.cast_to_date_or_time(#{var_name})"
-          when :time     then "ArJdbc::SQLite3::Column.cast_to_time(#{var_name})"
-        else
-          super
+        else super
         end
       end
 
@@ -84,35 +69,16 @@ module ::ArJdbc
 
         value
       end
-
-      def self.cast_to_integer(value)
-        return nil if value =~ /NULL/ or value.to_s.empty? or value.nil?
-        return (value.to_i) ? value.to_i : (value ? 1 : 0)
-      end
-
-      def self.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 self.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(ActiveRecord::Base.default_timezone, *time_array) rescue nil
-      end
-
-      def self.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
     end
 
     def adapter_name #:nodoc:
       'SQLite'
     end
 
+    def supports_add_column?
+      sqlite_version >= '3.1.6'
+    end
+
     def supports_count_distinct? #:nodoc:
       sqlite_version >= '3.2.6'
     end
@@ -135,26 +101,10 @@ module ::ArJdbc
       tp[:time] = { :name => "TIME" }
       tp[:date] = { :name => "DATE" }
       tp[:boolean] = { :name => "BOOLEAN" }
+      tp[:binary] = { :name => "BLOB" }
       tp
     end
 
-    def quote(value, column = nil) # :nodoc:
-      return value.quoted_id if value.respond_to?(:quoted_id)
-      case value
-      when String
-        if column && column.type == :binary
-          "'#{quote_string(column.class.string_to_binary(value))}'"
-        elsif column && [:integer, :float].include?(column.type)
-          (column.type == :integer ? value.to_i : value.to_f).to_s
-        elsif column && column.respond_to?(:primary) && column.primary && column.klass != String
-          value.to_i.to_s
-        else
-          "'#{quote_string(value)}'"
-        end
-      else super
-      end
-    end
-
     def quote_column_name(name) #:nodoc:
       %Q("#{name}")
     end
@@ -171,56 +121,6 @@ module ::ArJdbc
       %Q{'f'}
     end
 
-    def add_column(table_name, column_name, type, options = {})
-      if option_not_null = options[:null] == false
-        option_not_null = options.delete(:null)
-      end
-      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-      add_column_options!(add_column_sql, options)
-      execute(add_column_sql)
-      if option_not_null
-        alter_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} NOT NULL"
-      end
-    end
-
-    def remove_column(table_name, *column_names) #:nodoc:
-      column_names.flatten.each do |column_name|
-        alter_table(table_name) do |definition|
-          definition.columns.delete(definition[column_name])
-        end
-      end
-    end
-    alias :remove_columns :remove_column
-
-    def change_column(table_name, column_name, type, options = {}) #:nodoc:
-      alter_table(table_name) do |definition|
-        include_default = options_include_default?(options)
-        definition[column_name].instance_eval do
-          self.type    = type
-          self.limit   = options[:limit] if options.include?(:limit)
-          self.default = options[:default] if include_default
-          self.null    = options[:null] if options.include?(:null)
-        end
-      end
-    end
-
-    def change_column_default(table_name, column_name, default) #:nodoc:
-      alter_table(table_name) do |definition|
-        definition[column_name].default = default
-      end
-    end
-
-    def rename_column(table_name, column_name, new_column_name) #:nodoc:
-      unless columns(table_name).detect{|c| c.name == column_name.to_s }
-        raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
-      end
-      alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
-    end
-
-    def rename_table(name, new_name)
-      execute "ALTER TABLE #{name} RENAME TO #{new_name}"
-    end
-
     def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
       @connection.execute_update(sql)
       id_value || last_insert_id
@@ -294,15 +194,94 @@ module ::ArJdbc
 
     def columns(table_name, name = nil) #:nodoc:
       table_structure(table_name).map do |field|
-        ::ActiveRecord::ConnectionAdapters::JdbcColumn.new(@config, field['name'], field['dflt_value'], field['type'], field['notnull'] == 0)
+        ::ActiveRecord::ConnectionAdapters::SQLite3Column.new(@config, field['name'], field['dflt_value'], field['type'], field['notnull'] == 0)
+      end
+    end
+
+    def primary_key(table_name) #:nodoc:
+      column = table_structure(table_name).find { |field|
+        field['pk'].to_i == 1
+      }
+      column && column['name']
+    end
+
+    def remove_index!(table_name, index_name) #:nodoc:
+      execute "DROP INDEX #{quote_column_name(index_name)}"
+    end
+
+    def rename_table(name, new_name)
+      execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
+    end
+
+    # See: http://www.sqlite.org/lang_altertable.html
+    # SQLite has an additional restriction on the ALTER TABLE statement
+    def valid_alter_table_options( type, options)
+      type.to_sym != :primary_key
+    end
+
+    def add_column(table_name, column_name, type, options = {}) #:nodoc:
+      if supports_add_column? && valid_alter_table_options( type, options )
+        super(table_name, column_name, type, options)
+      else
+        alter_table(table_name) do |definition|
+          definition.column(column_name, type, options)
+        end
+      end
+    end
+
+    def remove_column(table_name, *column_names) #:nodoc:
+      raise ArgumentError.new("You must specify at least one column name.  Example: remove_column(:people, :first_name)") if column_names.empty?
+      column_names.flatten.each do |column_name|
+        alter_table(table_name) do |definition|
+          definition.columns.delete(definition[column_name])
+        end
+      end
+    end
+    alias :remove_columns :remove_column
+
+    def change_column_default(table_name, column_name, default) #:nodoc:
+      alter_table(table_name) do |definition|
+        definition[column_name].default = default
       end
     end
 
+    def change_column_null(table_name, column_name, null, default = nil)
+      unless null || default.nil?
+        execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+      end
+      alter_table(table_name) do |definition|
+        definition[column_name].null = null
+      end
+    end
+
+    def change_column(table_name, column_name, type, options = {}) #:nodoc:
+      alter_table(table_name) do |definition|
+        include_default = options_include_default?(options)
+        definition[column_name].instance_eval do
+          self.type    = type
+          self.limit   = options[:limit] if options.include?(:limit)
+          self.default = options[:default] if include_default
+          self.null    = options[:null] if options.include?(:null)
+        end
+      end
+    end
+
+    def rename_column(table_name, column_name, new_column_name) #:nodoc:
+      unless columns(table_name).detect{|c| c.name == column_name.to_s }
+        raise ActiveRecord::ActiveRecordError, "Missing column #{table_name}.#{column_name}"
+      end
+      alter_table(table_name, :rename => {column_name.to_s => new_column_name.to_s})
+    end
+
      # SELECT ... FOR UPDATE is redundant since the table is locked.
     def add_lock!(sql, options) #:nodoc:
       sql
     end
 
+    def empty_insert_statement_value
+      "VALUES(NULL)"
+    end
+
     protected
     include ArJdbc::MissingFunctionalityHelper
 
@@ -318,7 +297,7 @@ module ::ArJdbc
 end
 
 module ActiveRecord::ConnectionAdapters
-  class SQLiteColumn < JdbcColumn
+  class SQLite3Column < JdbcColumn
     include ArJdbc::SQLite3::Column
 
     def initialize(name, *args)
@@ -333,44 +312,19 @@ module ActiveRecord::ConnectionAdapters
     end
 
     def self.string_to_binary(value)
-      value.gsub(/\0|%/n) do |b|
-        case b
-        when "\0" then "%00"
-        when "\%"  then "%25"
-        end
-      end
+      "\000b64" + [value].pack('m*').split("\n").join('')
     end
 
     def self.binary_to_string(value)
-      value.gsub(/%00|%25/n) do |b|
-        case b
-        when "%00" then "\0"
-        when "%25" then "%"
-        end
+      if value.respond_to?(:force_encoding) && value.encoding != Encoding::ASCII_8BIT
+        value = value.force_encoding(Encoding::ASCII_8BIT)
       end
-    end
-
-    def self.cast_to_integer(value)
-      return nil if value =~ /NULL/ or value.to_s.empty? or value.nil?
-      return (value.to_i) ? value.to_i : (value ? 1 : 0)
-    end
-
-    def self.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 self.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(ActiveRecord::Base.default_timezone, *time_array) rescue nil
-    end
 
-    def self.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
+      if value[0..3] == "\000b64"
+        value[4..-1].unpack('m*').first
+      else
+        value
+      end
     end
   end
 
@@ -381,8 +335,20 @@ module ActiveRecord::ConnectionAdapters
       # return nil to avoid extending ArJdbc::SQLite3, which we've already done
     end
 
+    def jdbc_connection_class(spec)
+      ArJdbc::SQLite3.jdbc_connection_class
+    end
+
     def jdbc_column_class
-      ActiveRecord::ConnectionAdapters::SQLiteColumn
+      ActiveRecord::ConnectionAdapters::SQLite3Column
     end
   end
 end
+
+# Fake out sqlite3/version driver for AR tests
+$LOADED_FEATURES << 'sqlite3/version.rb'
+module SQLite3
+  module Version
+    VERSION = '1.2.6' # query_cache_test.rb requires SQLite3::Version::VERSION > '1.2.5'
+  end
+end

data/lib/arjdbc/sqlite3/connection_methods.rb

@@ -8,8 +8,9 @@ class ActiveRecord::Base
       require "arjdbc/sqlite3"
 
       parse_sqlite3_config!(config)
-
-      config[:url] ||= "jdbc:sqlite:#{config[:database]}"
+      database = config[:database]
+      database = '' if database == ':memory:'
+      config[:url] ||= "jdbc:sqlite:#{database}"
       config[:driver] ||= "org.sqlite.JDBC"
       config[:adapter_class] = ActiveRecord::ConnectionAdapters::SQLite3Adapter
       jdbc_connection(config)

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.0.0.beta2"
+    VERSION = "1.0.0"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/rakelib/compile.rake

@@ -16,9 +16,10 @@ jar_name = File.join(*%w(lib arjdbc jdbc adapter_java.jar))
 
 desc "Compile the native Java code."
 task :java_compile do
+  debug = ENV['DEBUG'] ? '-g' : ''
   pkg_classes = File.join(*%w(pkg classes))
   mkdir_p pkg_classes
-  sh "javac -target 1.5 -source 1.5 -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
+  sh "javac -target 1.5 -source 1.5 #{debug} -d pkg/classes #{java_classpath_arg} #{FileList['src/java/**/*.java'].join(' ')}"
   sh "jar cf #{jar_name} -C #{pkg_classes} ."
 end
 file jar_name => :java_compile

data/test/db/db2.rb

@@ -1,6 +1,8 @@
 config = {
-  :username => "blog",
-  :password => "",
+# DB2 uses $USER if running locally, just add
+# yourself to your db2 groups in /etc/group
+#  :username => "blog",
+#  :password => "",
   :adapter  => "jdbc",
   :driver => "com.ibm.db2.jcc.DB2Driver",
   :url => "jdbc:db2:weblog_development"

data/test/db/jndi_config.rb

@@ -31,7 +31,7 @@ System.set_property(Context::PROVIDER_URL, "file://#{jndi_dir}")
 ic = InitialContext.new
 ic.rebind(JNDI_CONFIG[:jndi],
           org.apache.derby.jdbc.EmbeddedDataSource.new.tap {|ds|
-            ds.database_name = "derby-testdb"
+            ds.database_name = "derby-testdb-jndi"
             ds.create_database = "create"
             ds.user = "sa"
             ds.password = ""})

data/test/models/mixed_case.rb

@@ -3,15 +3,20 @@ require 'active_record'
 
 module Migration
   class MixedCase < ActiveRecord::Migration
-    
+
     def self.up
       create_table "mixed_cases" do |t|
         t.column :SOME_value, :string
       end
+      create_table "tblUsers" do |t|
+        t.column :firstName, :string
+        t.column :lastName, :string
+      end
     end
-    
+
     def self.down
       drop_table "mixed_cases"
+      drop_table "tblUsers"
     end
   end
 end

data/test/postgres_mixed_case_test.rb

@@ -1,13 +1,18 @@
 require 'jdbc_common'
+require 'models/entry'
 require 'models/mixed_case'
 
 class MixedCaseTest < Test::Unit::TestCase
-  
   def setup
     Migration::MixedCase.up
+    @table_name = User.table_name
+    User.table_name = 'tblUsers'
+    User.reset_column_information
   end
 
   def teardown
+    User.table_name = @table_name
+    User.reset_column_information
     Migration::MixedCase.down
   end
 
@@ -16,4 +21,9 @@ class MixedCaseTest < Test::Unit::TestCase
     assert_equal 'some value', mixed_case.SOME_value
   end
 
+  def test_find_mixed_table_name
+    User.create :firstName => "Nick", :lastName => "Sieger"
+    u = User.find :first
+    assert_equal "Nick Sieger", "#{u.firstName} #{u.lastName}"
+  end
 end

data/test/simple.rb

@@ -111,6 +111,16 @@ module SimpleTestMethods
     assert_equal prev_count - 1, Entry.count
   end
 
+  if Entry.respond_to?(:limit)
+    def test_limit
+      Entry.limit(10).to_a
+    end
+
+    def test_count_with_limit
+      assert_equal Entry.count, Entry.limit(10).count
+    end
+  end
+
   if Time.respond_to?(:zone)
     def test_save_time_with_utc
       current_zone = Time.zone
@@ -241,7 +251,6 @@ module SimpleTestMethods
     binary_string = "\000ABCDEFGHIJKLMNOPQRSTUVWXYZ'\001\003"*1#2_000
     e = DbType.find(:first)
     e.sample_binary = binary_string
-    e.send(:write_attribute, :binary, binary_string)
     e.save!
     e = DbType.find(:first)
     assert_equal binary_string, e.sample_binary

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 1
     - 0
     - 0
-    - beta2
-  version: 1.0.0.beta2
+  version: 1.0.0
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -05:00
+date: 2010-10-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -72,7 +71,6 @@ files:
   - lib/arjdbc.rb
   - lib/jdbc_adapter.rb
   - lib/pg.rb
-  - lib/active_record/connection_adapters/cachedb_adapter.rb
   - lib/active_record/connection_adapters/derby_adapter.rb
   - lib/active_record/connection_adapters/h2_adapter.rb
   - lib/active_record/connection_adapters/hsqldb_adapter.rb
@@ -91,7 +89,6 @@ files:
   - lib/arel/engines/sql/compilers/hsqldb_compiler.rb
   - lib/arel/engines/sql/compilers/jdbc_compiler.rb
   - lib/arel/engines/sql/compilers/mssql_compiler.rb
-  - lib/arjdbc/cachedb.rb
   - lib/arjdbc/db2.rb
   - lib/arjdbc/derby.rb
   - lib/arjdbc/discover.rb
@@ -108,8 +105,6 @@ files:
   - lib/arjdbc/sqlite3.rb
   - lib/arjdbc/sybase.rb
   - lib/arjdbc/version.rb
-  - lib/arjdbc/cachedb/adapter.rb
-  - lib/arjdbc/cachedb/connection_methods.rb
   - lib/arjdbc/db2/adapter.rb
   - lib/arjdbc/derby/adapter.rb
   - lib/arjdbc/derby/connection_methods.rb
@@ -155,7 +150,6 @@ files:
   - lib/jdbc_adapter/version.rb
   - lib/arjdbc/jdbc/adapter_java.jar
   - test/abstract_db_create.rb
-  - test/cachedb_simple_test.rb
   - test/db2_simple_test.rb
   - test/derby_migration_test.rb
   - test/derby_multibyte_test.rb
@@ -197,7 +191,6 @@ files:
   - test/sybase_jtds_simple_test.rb
   - test/activerecord/connection_adapters/type_conversion_test.rb
   - test/activerecord/connections/native_jdbc_mysql/connection.rb
-  - test/db/cachedb.rb
   - test/db/db2.rb
   - test/db/derby.rb
   - test/db/h2.rb
@@ -262,13 +255,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: jruby-extras

data/lib/active_record/connection_adapters/cachedb_adapter.rb

@@ -1 +0,0 @@
-require 'arjdbc/cachedb'

data/lib/arjdbc/cachedb.rb

@@ -1,3 +0,0 @@
-require 'arjdbc/jdbc'
-require 'arjdbc/cachedb/connection_methods'
-require 'arjdbc/cachedb/adapter'

data/lib/arjdbc/cachedb/adapter.rb

@@ -1,20 +0,0 @@
-require 'arjdbc/mssql/tsql_helper'
-
-module ::ArJdbc
-  module CacheDB
-    include TSqlMethods
-
-    def self.column_selector
-      [ /cache/i, lambda {  | cfg, col | col.extend( ::ArJdbc::CacheDB::Column ) } ]
-    end
-
-    module Column
-    end
-
-    def create_table(name, options = { })
-      super(name, options)
-      primary_key = options[:primary_key] || "id"
-      execute "ALTER TABLE #{name} ADD CONSTRAINT #{name}_PK PRIMARY KEY(#{primary_key})" unless options[:id] == false
-    end
-  end
-end

data/lib/arjdbc/cachedb/connection_methods.rb

@@ -1,10 +0,0 @@
-class ActiveRecord::Base
-  class << self
-    def cachedb_connection( config )
-      config[:port] ||= 1972
-      config[:url] ||= "jdbc:Cache://#{config[:host]}:#{config[:port]}/#{ config[:database]}"
-      config[:driver] ||= "com.intersys.jdbc.CacheDriver"
-      jdbc_connection(config)
-    end
-  end
-end

data/test/cachedb_simple_test.rb

@@ -1,6 +0,0 @@
-require 'jdbc_common'
-require 'db/cachedb'
-
-class CacheDBSimpleTest < Test::Unit::TestCase
-  include SimpleTestMethods
-end

data/test/db/cachedb.rb

@@ -1,9 +0,0 @@
-config = { 
-  :username => '_SYSTEM',
-  :password => 'SYS',
-  :adapter  => 'cachedb',
-  :host     => ENV[ "CACHE_HOST" ] || 'localhost',
-  :database => ENV[ "CACHE_NAMESPACE" ] || 'weblog_development'
-}
-
-ActiveRecord::Base.establish_connection( config )