activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/lib/arjdbc/hsqldb/connection_methods.rb

@@ -2,13 +2,13 @@ module ActiveRecord
   class Base
     class << self
       def hsqldb_connection(config)
-        require "arjdbc/hsqldb"
+        require 'active_record/connection_adapters/jdbchsqldb_adapter'
+
         config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
-        config[:driver] ||= "org.hsqldb.jdbcDriver"
+        config[:driver] ||= defined?(::Jdbc::HSQLDB.driver_name) ? ::Jdbc::HSQLDB.driver_name : 'org.hsqldb.jdbcDriver'
         config[:adapter_spec] = ::ArJdbc::HSQLDB
         embedded_driver(config)
       end
-
       alias_method :jdbchsqldb_connection, :hsqldb_connection
     end
   end

data/lib/arjdbc/informix/adapter.rb

@@ -8,7 +8,11 @@ module ::ActiveRecord
         self.class.columns.each do |c|
           if [:text, :binary].include? c.type
             value = self[c.name]
-            value = value.to_yaml if unserializable_attribute?(c.name, c)
+            if respond_to?(:unserializable_attribute?)
+              value = value.to_yaml if unserializable_attribute?(c.name, c)
+            else
+              value = value.to_yaml if value.is_a?(Hash)
+            end
 
             unless value.nil? || (value == '')
               connection.write_large_object(c.type == :binary,

data/lib/arjdbc/jdbc/adapter.rb

@@ -1,19 +1,17 @@
 require 'active_record/version'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'arjdbc/version'
-require 'arjdbc/jdbc/require_driver'
+require 'arjdbc/jdbc/base_ext'
 require 'arjdbc/jdbc/connection_methods'
 require 'arjdbc/jdbc/compatibility'
 require 'arjdbc/jdbc/core_ext'
 require 'arjdbc/jdbc/java'
-require 'arjdbc/jdbc/type_converter'
 require 'arjdbc/jdbc/driver'
 require 'arjdbc/jdbc/column'
 require 'arjdbc/jdbc/connection'
 require 'arjdbc/jdbc/callbacks'
 require 'arjdbc/jdbc/extension'
-require 'arjdbc/jdbc/base_ext'
-require 'bigdecimal'
+require 'arjdbc/jdbc/type_converter'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -58,30 +56,30 @@ module ActiveRecord
 
       # Locate specialized adapter specification if one exists based on config data
       def adapter_spec(config)
-        2.times do
-          dialect = (config[:dialect] || config[:driver]).to_s
-          ::ArJdbc.constants.map { |name| ::ArJdbc.const_get name }.each do |constant|
-            if constant.respond_to? :adapter_matcher
-              spec = constant.adapter_matcher(dialect, config)
-              return spec if spec
-            end
+        dialect = (config[:dialect] || config[:driver]).to_s
+        ::ArJdbc.constants.sort.each do |constant|
+          constant = ::ArJdbc.const_get(constant) # e.g. ArJdbc::MySQL
+
+          if constant.respond_to?(:adapter_matcher)
+            spec = constant.adapter_matcher(dialect, config)
+            return spec if spec
           end
+        end
 
-          # If nothing matches and we're using jndi, try to automatically detect the database.
-          break unless config[:jndi] and !config[:dialect]
+        if config[:jndi] && ! config[:dialect]
           begin
-            conn = Java::javax.naming.InitialContext.new.lookup(config[:jndi]).getConnection
-            config[:dialect] = conn.getMetaData.getDatabaseProductName
-
-            # Derby-specific hack
-            if ::ArJdbc::Derby.adapter_matcher(config[:dialect], config)
-              # Needed to set the correct database schema name
-              config[:username] ||= conn.getMetaData.getUserName
-            end
-          rescue
-            conn.close if conn
+            data_source = Java::JavaxNaming::InitialContext.new.lookup(config[:jndi])
+            connection = data_source.getConnection
+            config[:dialect] = connection.getMetaData.getDatabaseProductName
+          rescue Java::JavaSql::SQLException => e
+            warn "failed to set database :dialect from connection meda-data (#{e})"
+          else
+            return adapter_spec(config) # re-try matching a spec with set config[:dialect]
+          ensure
+            connection.close if connection  # return to the pool
           end
         end
+
         nil
       end
 
@@ -112,7 +110,7 @@ module ActiveRecord
         if defined?(::Arel::Visitors::VISITORS)
           visitors = ::Arel::Visitors::VISITORS
           visitor = nil
-          adapter_spec = config[:adapter_spec] || self.class
+          adapter_spec = [config[:adapter_spec], self.class].detect {|a| a && a.respond_to?(:arel2_visitors) }
           adapter_spec.arel2_visitors(config).each do |k,v|
             visitor = v
             visitors[k] = v

data/lib/arjdbc/jdbc/base_ext.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   class Base  # reopen
-    class <<self
+    class << self
       # Allow adapters to provide their own reset_column_information methods
       #
       # NOTE: This only affects the current thread's connection.

data/lib/arjdbc/jdbc/connection.rb

@@ -26,25 +26,36 @@ module ActiveRecord
         end
 
         def configure_jndi
-          jndi = config[:jndi].to_s
-          ctx = javax.naming.InitialContext.new
-          ds = ctx.lookup(jndi)
+          data_source = javax.naming.InitialContext.new.lookup config[:jndi].to_s
+          @jndi_connection = true
           @connection_factory = JdbcConnectionFactory.impl do
-            ds.connection
+            data_source.connection
           end
-          unless config[:driver]
-            config[:driver] = connection.meta_data.connection.java_class.name
+        end
+
+        def configure_jdbc
+          if ! config[:url] || ( ! config[:driver] && ! config[:driver_instance] )
+            raise ::ActiveRecord::ConnectionNotEstablished, "jdbc adapter requires :driver class and :url"
+          end
+
+          url = configure_url
+          username = config[:username].to_s
+          password = config[:password].to_s
+          jdbc_driver = ( config[:driver_instance] ||= JdbcDriver.new(config[:driver].to_s) )
+
+          @connection_factory = JdbcConnectionFactory.impl do
+            jdbc_driver.connection(url, username, password)
           end
-          @jndi_connection = true
         end
 
+        private
         def configure_url
           url = config[:url].to_s
           if Hash === config[:options]
             options = ''
-            config[:options].each do |k,v|
+            config[:options].each do |key, val|
               options << '&' unless options.empty?
-              options << "#{k}=#{v}"
+              options << "#{key}=#{val}"
             end
             url = url['?'] ? "#{url}&#{options}" : "#{url}?#{options}" unless options.empty?
             config[:url] = url
@@ -53,20 +64,6 @@ module ActiveRecord
           url
         end
 
-        def configure_jdbc
-          unless config[:driver] && config[:url]
-            raise ::ActiveRecord::ConnectionNotEstablished, "jdbc adapter requires driver class and url"
-          end
-
-          driver = config[:driver].to_s
-          user   = config[:username].to_s
-          pass   = config[:password].to_s
-          url    = configure_url
-          jdbc_driver = (config[:driver_instance] ||= JdbcDriver.new(driver))
-          @connection_factory = JdbcConnectionFactory.impl do
-            jdbc_driver.connection(url, user, pass)
-          end
-        end
       end
 
       attr_reader :adapter, :connection_factory
@@ -107,11 +104,8 @@ module ActiveRecord
         types = {}
         @native_types.each_pair do |k, v|
           types[k] = v.inject({}) do |memo, kv|
-            memo[kv.first] = if kv.last.is_a? Numeric
-                               kv.last
-                             else
-                               begin kv.last.dup rescue kv.last end
-                             end
+            last = kv.last
+            memo[kv.first] = last.is_a?(Numeric) ? last : (last.dup rescue last)
             memo
           end
         end
@@ -120,7 +114,7 @@ module ActiveRecord
       private :dup_native_types
 
       def jndi_connection?
-        @jndi_connection
+        @jndi_connection == true
       end
 
       def active?

data/lib/arjdbc/jdbc/core_ext.rb

@@ -8,7 +8,7 @@ module ActiveRecord # :nodoc:
     attr_accessor :sql_exception
   end
 
-  module ConnectionAdapters     # :nodoc:
+  module ConnectionAdapters # :nodoc:
     # Allows properly re-wrapping/re-defining methods that may already
     # be alias_method_chain'd.
     module ShadowCoreMethods

data/lib/arjdbc/jdbc/discover.rb

@@ -4,7 +4,7 @@ module ArJdbc
       files = ::Gem.find_files('arjdbc/discover')
     else
       files = $LOAD_PATH.map do |p|
-        discover = File.join(p, 'arjdbc','discover.rb')
+        discover = File.join(p, 'arjdbc', 'discover.rb')
         File.exist?(discover) ? discover : nil
       end.compact
     end

data/lib/arjdbc/jdbc/driver.rb

@@ -16,7 +16,7 @@ module ActiveRecord
                 java_import(driver_class_name) { driver_class_const }
               end
             end
-          end
+          end unless Jdbc.const_defined?(driver_class_const)
           driver_class = Jdbc.const_get(driver_class_const)
           raise "You must specify a driver for your JDBC connection" unless driver_class
           driver_class

data/lib/arjdbc/jdbc/extension.rb

@@ -34,11 +34,11 @@ module ArJdbc
     end
     (class << mod; self; end).instance_eval do
       unless respond_to?(:adapter_matcher)
-        define_method :adapter_matcher do |name, config|
+        define_method :adapter_matcher do |_name, config|
           if block.arity == 1
-            block.call(name) ? mod : false
+            block.call(_name) ? mod : false
           else
-            block.call(name, config) ? mod : false
+            block.call(_name, config) ? mod : false
           end
         end
       end

data/lib/arjdbc/jdbc/jdbc.rake

@@ -12,7 +12,7 @@ def redefine_task(*args, &block)
     existing_task.instance_variable_set "@actions", []
   end
   redefined_task = task(*args, &block)
-  enhancements.each {|enhancement| redefined_task.actions << enhancement}
+  enhancements.each {|enhancement| redefined_task.actions << enhancement} unless enhancements.nil?
 end
 
 def rails_env
@@ -83,7 +83,7 @@ namespace :db do
         end
 
         ActiveRecord::Base.establish_connection(config.merge({'database' => nil, 'url' => url}))
-        ActiveRecord::Base.connection.create_database(config['database'])
+        ActiveRecord::Base.connection.create_database(config['database'], config)
         ActiveRecord::Base.establish_connection(config)
       rescue => e
         raise e unless config['adapter'] =~ /mysql|postgresql|sqlite/
@@ -100,9 +100,19 @@ namespace :db do
     redefine_task :dump => :environment do
       abcs = ActiveRecord::Base.configurations
       ActiveRecord::Base.establish_connection(abcs[rails_env])
-      File.open("db/#{rails_env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+      filename = ENV['DB_STRUCTURE'] || "db/#{rails_env}_structure.sql"
+      File.open(filename, "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
       if ActiveRecord::Base.connection.supports_migrations?
-        File.open("db/#{rails_env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        File.open(filename, "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+      end
+    end
+
+    redefine_task :load => :environment do
+      abcs = ActiveRecord::Base.configurations
+      ActiveRecord::Base.establish_connection(abcs[rails_env])
+      filename = ENV['DB_STRUCTURE'] || "db/#{rails_env}_structure.sql"
+      IO.read(filename).split(/;\n*/m).each do |ddl|
+        ActiveRecord::Base.connection.execute(ddl)
       end
     end
   end
@@ -125,7 +135,7 @@ namespace :db do
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
       db = find_database_name(abcs['test'])
-      ActiveRecord::Base.connection.recreate_database(db)
+      ActiveRecord::Base.connection.recreate_database(db, abcs['test'])
     end
   end
 end

data/lib/arjdbc/mssql.rb

@@ -1,4 +1,3 @@
 require 'arjdbc/jdbc'
-jdbc_require_driver 'jdbc/jtds', 'jdbc-mssql'
 require 'arjdbc/mssql/connection_methods'
 require 'arjdbc/mssql/adapter'

data/lib/arjdbc/mssql/adapter.rb

@@ -1,7 +1,7 @@
+require 'strscan'
 require 'arjdbc/mssql/tsql_helper'
 require 'arjdbc/mssql/limit_helpers'
 require 'arjdbc/mssql/lock_helpers'
-require 'strscan'
 
 module ::ArJdbc
   module MsSQL
@@ -64,11 +64,17 @@ module ::ArJdbc
     def modify_types(tp) #:nodoc:
       super(tp)
       tp[:string] = {:name => "NVARCHAR", :limit => 255}
+
       if sqlserver_version == "2000"
         tp[:text] = {:name => "NTEXT"}
       else
         tp[:text] = {:name => "NVARCHAR(MAX)"}
       end
+
+      tp[:primary_key] = "int NOT NULL IDENTITY(1, 1) PRIMARY KEY"
+      tp[:integer][:limit] = nil
+      tp[:boolean] = {:name => "bit"}
+      tp[:binary] = {:name => "image"}
       tp
     end
 
@@ -255,9 +261,9 @@ module ::ArJdbc
       true
     end
 
-    def recreate_database(name)
+    def recreate_database(name, options = {})
       drop_database(name)
-      create_database(name)
+      create_database(name, options)
     end
 
     def drop_database(name)
@@ -265,7 +271,7 @@ module ::ArJdbc
       execute "DROP DATABASE #{name}"
     end
 
-    def create_database(name)
+    def create_database(name, options={})
       execute "CREATE DATABASE #{name}"
       execute "USE #{name}"
     end

data/lib/arjdbc/mssql/connection_methods.rb

@@ -1,26 +1,26 @@
 class ActiveRecord::Base
   class << self
     def mssql_connection(config)
-      require "arjdbc/mssql"
+      require 'active_record/connection_adapters/jdbcmssql_adapter'
+
       config[:host] ||= "localhost"
       config[:port] ||= 1433
-      config[:driver] ||= "net.sourceforge.jtds.jdbc.Driver"
+      config[:driver] ||= defined?(::Jdbc::JTDS.driver_name) ? ::Jdbc::JTDS.driver_name : 'net.sourceforge.jtds.jdbc.Driver'
       config[:adapter_spec] = ::ArJdbc::MsSQL
 
-      url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
-
-      # Instance is often a preferrable alternative to port when dynamic ports are used.
-      # If instance is specified then port is essentially ignored.
-      url << ";instance=#{config[:instance]}" if config[:instance]
-
-      # This will enable windows domain-based authentication and will require the JTDS native libraries be available.
-      url << ";domain=#{config[:domain]}" if config[:domain]
-
-      # AppName is shown in sql server as additional information against the connection.
-      url << ";appname=#{config[:appname]}" if config[:appname]
-      config[:url] ||= url
+      config[:url] ||= begin
+        url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+        # Instance is often a preferrable alternative to port when dynamic ports are used.
+        # If instance is specified then port is essentially ignored.
+        url << ";instance=#{config[:instance]}" if config[:instance]
+        # This will enable windows domain-based authentication and will require the JTDS native libraries be available.
+        url << ";domain=#{config[:domain]}" if config[:domain]
+        # AppName is shown in sql server as additional information against the connection.
+        url << ";appname=#{config[:appname]}" if config[:appname]
+        url
+      end
 
-      if !config[:domain]
+      unless config[:domain]
         config[:username] ||= "sa"
         config[:password] ||= ""
       end

data/lib/arjdbc/mssql/limit_helpers.rb

@@ -12,6 +12,28 @@ module ::ArJdbc
         end
       end
 
+      def get_primary_key(order, table_name)
+        if order =~ /(\w*id\w*)/i
+          $1
+        else
+          table_name[/\[+(.*)\]+/i]
+
+          # rails 2 vs rails 3
+          if ActiveRecord::VERSION::MAJOR >= 3
+            models = ActiveRecord::Base.descendants
+          else
+            models = ActiveRecord::Base.send(:subclasses)
+          end
+
+          model = models.select{|model| model.table_name == $1}.first
+          if model then
+            model.primary_key
+          else
+           'id'
+          end
+        end
+      end
+
       module SqlServer2000ReplaceLimitOffset
         module_function
         def replace_limit_offset!(sql, limit, offset, order)
@@ -31,7 +53,7 @@ module ::ArJdbc
               rest = rest_of_query[/FROM/i=~ rest_of_query.. -1]
               #need the table name for avoiding amiguity
               table_name = LimitHelpers.get_table_name(sql)
-              primary_key = order[/(\w*id\w*)/i] || "id"
+              primary_key = LimitHelpers.get_primary_key(order, table_name)
               #I am not sure this will cover all bases.  but all the tests pass
               if order[/ORDER/].nil?
                 new_order = "ORDER BY #{order}, #{table_name}.#{primary_key}" if order.index("#{table_name}.#{primary_key}").nil?
@@ -57,7 +79,7 @@ module ::ArJdbc
           if options[:limit]
             order = "ORDER BY #{options[:order] || determine_order_clause(sql)}"
             sql.sub!(/ ORDER BY.*$/i, '')
-            SqlServerReplaceLimitOffset.replace_limit_offset!(sql, options[:limit], options[:offset], order)
+            SqlServer2000ReplaceLimitOffset.replace_limit_offset!(sql, options[:limit], options[:offset], order)
           end
         end
       end