activerecord-jdbc-adapter 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,14 @@
+== 0.8.2
+
+- Added an optional config key called :dialect. Using :dialect allows you to
+  override the default SQL dialect for the driver class being used. There are
+  a few cases for this:
+  - Using using Sybase w/ the jTDS driver.
+  - Using rebranded drivers.
+  - It makes more sense to use :dialect, rather then :driver when using JNDI.
+- JRUBY-2619: Typo with :test config causing problems with dev database (Igor Minar)
+- 20524, JRUBY-2612: Since when did I think that there was a #true? method on Object?
+
 == 0.8.1
 
 - Now sporting a JDBC sqlite3 adapter! Thanks Joseph Athman.

data/Manifest.txt

@@ -56,6 +56,7 @@ test/h2_simple_test.rb
 test/has_many_through.rb
 test/hsqldb_simple_test.rb
 test/jdbc_adapter/jdbc_db2_test.rb
+test/jdbc_adapter/jdbc_sybase_test.rb
 test/jdbc_common.rb
 test/jndi_test.rb
 test/manualTestDatabase.rb

data/Rakefile

@@ -89,6 +89,12 @@ Rake::TestTask.new(:test_mssql) do | t |
   t.libs << 'test'
 end
 
+# Tests for JDBC adapters that don't require a database.
+Rake::TestTask.new(:test_jdbc_adapters) do | t |
+  t.test_files = FileList[ 'test/jdbc_adapter/jdbc_sybase_test.rb' ]
+  t.libs << 'test'
+end
+
 MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", 
   "Rakefile", "LICENSE.txt", "lib/**/*.rb", "lib/jdbc_adapter/jdbc_adapter_internal.jar", "test/**/*.rb",
    "lib/**/*.rake", "src/**/*.java"]

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -269,9 +269,9 @@ module ActiveRecord
         h[val[0]] = val[1]; h }
 
       def initialize(config, name, default, *args)
-        ds = config[:driver].to_s
+        dialect = config[:dialect] || config[:driver]
         for reg, func in COLUMN_TYPES
-          if reg === ds
+          if reg === dialect.to_s
             func.call(config,self)
           end
         end
@@ -445,9 +445,9 @@ module ActiveRecord
       def initialize(connection, logger, config)
         super(connection, logger)
         @config = config
-        ds = config[:driver].to_s
+        dialect = config[:dialect] || config[:driver]
         for reg, func in ADAPTER_TYPES
-          if reg === ds
+          if reg === dialect.to_s
             func.call(@config,self)
           end
         end

data/lib/jdbc_adapter/jdbc.rake

@@ -64,7 +64,7 @@ namespace :db do
   namespace :test do
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(abcs[:test])
+      ActiveRecord::Base.establish_connection(abcs["test"])
       ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') if abcs["test"]["adapter"] =~ /mysql/i
       IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
         ActiveRecord::Base.connection.execute(ddl)
@@ -73,7 +73,7 @@ namespace :db do
 
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(abcs[:test])
+      ActiveRecord::Base.establish_connection(abcs["test"])
       db = ActiveRecord::Base.connection.database_name
       ActiveRecord::Base.connection.recreate_database(db)
     end

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -90,7 +90,7 @@ module ::JdbcSpec
     # Override default -- fix case where ActiveRecord passes :default => nil, :null => true
     def add_column_options!(sql, options)
       options.delete(:default) if options.has_key?(:default) && options[:default].nil?
-      options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null].true?)
+      options.delete(:null) if options.has_key?(:null) && (options[:null].nil? || options[:null] == true)
       super
     end
 

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/src/java/jdbc_adapter/JdbcAdapterInternalService.java

@@ -614,7 +614,7 @@ public class JdbcAdapterInternalService implements BasicLibraryService {
                 Statement stmt = null;
                 try {
                     stmt = c.createStatement();
-                    return recv.getRuntime().newFixnum(stmt.executeUpdate(rubyApi.convertToRubyString(sql).getUnicodeValue()));
+                    return recv.getRuntime().newFixnum((long)stmt.executeUpdate(rubyApi.convertToRubyString(sql).getUnicodeValue()));
                 } finally {
                     if (null != stmt) {
                         try {

data/test/jdbc_adapter/jdbc_sybase_test.rb

@@ -0,0 +1,33 @@
+require 'jdbc_common'
+require 'jdbc_adapter'
+
+class MockConnection 
+  
+  def adapter=( adapt )
+  end
+
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+
+    class SybaseAdapterSelectionTest < Test::Unit::TestCase
+      
+      def testJtdsSelectionUsingDialect()
+        config = {
+          :driver =>  'net.sourceforge.jtds.Driver',
+          :dialect => 'sybase'
+        }
+        adapt = JdbcAdapter.new(MockConnection.new, nil, config)
+        assert adapt.kind_of?(JdbcSpec::Sybase), "Should be a sybase adapter"
+      end
+      
+      def testJtdsSelectionNotUsingDialect
+        config = { :driver => 'net.sourceforge.jtds.Driver' }
+        adapt = JdbcAdapter.new(MockConnection.new, nil, config)
+        assert adapt.kind_of?(JdbcSpec::MsSQL), "Should be a MsSQL apdater"
+      end
+      
+    end
+  end
+end

data/test/jndi_test.rb

@@ -12,18 +12,16 @@
 #
 # Finally, you'll need the jdbc driver, which is derby, for this test.
 
-require 'models/auto_id'
-require 'models/entry'
+require 'jdbc_common'
 require 'db/jndi_config'
-require 'simple'
-require 'test/unit'
-require 'logger'
 
 class DerbyJndiTest < Test::Unit::TestCase
   include SimpleTestMethods
   alias_method :setup_simple, :setup
   def setup
-    ActiveRecord::Base.establish_connection({ :jndi => 'jdbc/derbydb', :adapter => 'jdbc'})
+    ActiveRecord::Base.establish_connection({
+        :jndi => 'jdbc/derbydb',
+        :adapter => 'jdbc'})
     logger = Logger.new('jndi_test.log')
     logger.level = Logger::DEBUG
     ActiveRecord::Base.logger = logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Nick Sieger, Ola Bini and JRuby contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-04 00:00:00 -05:00
+date: 2008-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -83,6 +83,7 @@ files:
 - test/has_many_through.rb
 - test/hsqldb_simple_test.rb
 - test/jdbc_adapter/jdbc_db2_test.rb
+- test/jdbc_adapter/jdbc_sybase_test.rb
 - test/jdbc_common.rb
 - test/jndi_test.rb
 - test/manualTestDatabase.rb