kb-activerecord-jdbc-adapter 0.9.7.1-java → 1.0.0.beta1-java

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,13 +1 @@
-tried_gem = false
-begin
-  require "jdbc/postgres"
-rescue LoadError
-  unless tried_gem
-    require 'rubygems'
-    gem "jdbc-postgres"
-    tried_gem = true
-    retry
-  end
-  # trust that the postgres jar is already present
-end
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc/postgresql'

data/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,13 +1 @@
-tried_gem = false
-begin
-  require "jdbc/sqlite3"
-rescue LoadError
-  unless tried_gem
-    require 'rubygems'
-    gem "jdbc-sqlite3"
-    tried_gem = true
-    retry
-  end
-  # trust that the sqlite jar is already present
-end
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc/sqlite3'

data/lib/activerecord-jdbc-adapter.rb

@@ -1,6 +1,6 @@
-require 'jdbc_adapter'
+require 'arjdbc'
 begin
-  require 'jdbc_adapter/railtie'
+  require 'arjdbc/jdbc/railtie'
 rescue LoadError
   # Assume we don't have railties in this version of AR
 end

data/lib/arjdbc/cachedb/adapter.rb

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,10 @@
+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/lib/arjdbc/cachedb.rb

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

data/lib/{jdbc_adapter/jdbc_db2.rb → arjdbc/db2/adapter.rb}

@@ -1,21 +1,5 @@
-module JdbcSpec
+module ArJdbc
   module DB2
-    def self.adapter_matcher(name, config)
-      if name =~ /db2/i
-         return config[:url] =~ /^jdbc:derby:net:/ ? ::JdbcSpec::Derby : self
-      end
-      false
-    end
-
-    def self.adapter_selector
-      [/db2/i, lambda {|cfg,adapt|
-         if cfg[:url] =~ /^jdbc:derby:net:/
-           adapt.extend(::JdbcSpec::Derby)
-         else
-           adapt.extend(::JdbcSpec::DB2)
-         end }]
-    end
-
     def self.extended(obj)
       # Ignore these 4 system tables
       ActiveRecord::SchemaDumper.ignore_tables |= %w{hmon_atm_info hmon_collection policy stmg_dbsize_info}
@@ -69,6 +53,7 @@ module JdbcSpec
     def modify_types(tp)
       tp[:primary_key] = 'int not null generated by default as identity (start with 1) primary key'
       tp[:string][:limit] = 255
+      tp[:integer] ||= {}
       tp[:integer][:limit] = nil
       tp[:boolean][:limit] = nil
       tp

data/lib/arjdbc/db2.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/db2/adapter'

data/lib/{jdbc_adapter/jdbc_derby.rb → arjdbc/derby/adapter.rb}

@@ -1,30 +1,9 @@
-require 'jdbc_adapter/missing_functionality_helper'
-
-module ::JdbcSpec
-  module ActiveRecordExtensions
-    def derby_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/derby_adapter"
-      config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
-      config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
-      check_version(embedded_driver(config))
-    end
-
-    def check_version(conn)
-      md = conn.raw_connection.connection.meta_data
-      if md.database_major_version < 10 || md.database_minor_version < 5
-        raise ::ActiveRecord::ConnectionFailed, "Derby adapter requires Derby 10.5 or later"
-      end
-      conn
-    end
-  end
+require 'arjdbc/jdbc/missing_functionality_helper'
 
+module ::ArJdbc
   module Derby
-    def self.adapter_matcher(name, *)
-      name =~ /derby/i ? self : false
-    end
-
     def self.column_selector
-      [/derby/i, lambda {|cfg,col| col.extend(::JdbcSpec::Derby::Column)}]
+      [/derby/i, lambda {|cfg,col| col.extend(::ArJdbc::Derby::Column)}]
     end
 
     def self.monkey_rails
@@ -76,7 +55,11 @@ module ::JdbcSpec
       'Derby'
     end
 
-    include JdbcSpec::MissingFunctionalityHelper
+    include ArJdbc::MissingFunctionalityHelper
+
+    def index_name_length
+      128
+    end
 
     # Convert the speficied column type to a SQL string.  In Derby, :integers cannot specify
     # a limit.
@@ -232,7 +215,6 @@ module ::JdbcSpec
       super
     end
 
-
     # I don't think this method is ever called ??? (stepheneb)
     def create_column(name, refid, colno)
       stmt = COLUMN_TYPE_STMT % [refid, strip_quotes(name)]

data/lib/arjdbc/derby/connection_methods.rb

@@ -0,0 +1,18 @@
+module ActiveRecord
+  class Base
+    class << self
+      def derby_connection(config)
+        config[:url] ||= "jdbc:derby:#{config[:database]};create=true"
+        config[:driver] ||= "org.apache.derby.jdbc.EmbeddedDriver"
+        conn = embedded_driver(config)
+        md = conn.raw_connection.connection.meta_data
+        if md.database_major_version < 10 || md.database_minor_version < 5
+          raise ::ActiveRecord::ConnectionFailed, "Derby adapter requires Derby 10.5 or later"
+        end
+        conn
+      end
+
+      alias_method :jdbcderby_connection, :derby_connection
+    end
+  end
+end

data/lib/arjdbc/derby.rb

@@ -0,0 +1,7 @@
+require 'arjdbc/jdbc'
+jdbc_require_driver 'jdbc/derby'
+require 'arjdbc/derby/connection_methods'
+require 'arjdbc/derby/adapter'
+
+
+

data/lib/arjdbc/discover.rb

@@ -0,0 +1,99 @@
+# arjdbc/discover.rb: Declare ArJdbc.extension modules in this file
+# that loads a custom module and adapter.
+
+module ::ArJdbc
+  # Adapters built-in to AR are required up-front so we can override
+  # the native ones
+  require 'arjdbc/mysql'
+  extension :MySQL do |name|
+    name =~ /mysql/i
+  end
+
+  require 'arjdbc/postgresql'
+  extension :PostgreSQL do |name|
+    name =~ /postgre/i
+  end
+
+  require 'arjdbc/sqlite3'
+  extension :SQLite3 do |name|
+    name =~ /sqlite/i
+  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/i && config[:url] !~ /^jdbc:derby:net:/
+      require 'arjdbc/db2'
+      true
+    end
+  end
+
+  extension :Derby do |name|
+    if name =~ /derby/i
+      require 'arjdbc/derby'
+      true
+    end
+  end
+
+  extension :FireBird do |name|
+    if name =~ /firebird/i
+      require 'arjdbc/firebird'
+      true
+    end
+  end
+
+  extension :H2 do |name|
+    if name =~ /\.h2\./i
+      require 'arjdbc/h2'
+      true
+    end
+  end
+
+  extension :HSQLDB do |name|
+    if name =~ /hsqldb/i
+      require 'arjdbc/hsqldb'
+      true
+    end
+  end
+
+  extension :Informix do |name|
+    if name =~ /informix/i
+      require 'arjdbc/informix'
+      true
+    end
+  end
+
+  extension :Mimer do |name|
+    if name =~ /mimer/i
+      require 'arjdbc/mimer'
+      true
+    end
+  end
+
+  extension :MsSQL do |name|
+    if name =~ /sqlserver|tds/i
+      require 'arjdbc/mssql'
+      true
+    end
+  end
+
+  extension :Oracle do |name|
+    if name =~ /oracle/i
+      require 'arjdbc/oracle'
+      true
+    end
+  end
+
+  extension :Sybase do |name|
+    if name =~ /sybase|tds/i
+      require 'arjdbc/sybase'
+      true
+    end
+  end
+end

data/lib/{jdbc_adapter/jdbc_firebird.rb → arjdbc/firebird/adapter.rb}

@@ -1,16 +1,12 @@
-module ::JdbcSpec
+module ::ArJdbc
   module FireBird
-    def self.adapter_matcher(name, *)
-      name =~ /firebird/i ? self : false
-    end
-
     def modify_types(tp)
       tp[:primary_key] = 'INTEGER NOT NULL PRIMARY KEY'
       tp[:string][:limit] = 252
       tp[:integer][:limit] = nil
       tp
     end
-    
+
     def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) # :nodoc:
       execute(sql, name)
       id_value
@@ -31,11 +27,11 @@ module ::JdbcSpec
     def default_sequence_name(table_name, primary_key) # :nodoc:
       "#{table_name}_seq"
     end
-    
+
     def next_sequence_value(sequence_name)
       select_one("SELECT GEN_ID(#{sequence_name}, 1 ) FROM RDB$DATABASE;")["gen_id"]
     end
-    
+
     def create_table(name, options = {}) #:nodoc:
       super(name, options)
       execute "CREATE GENERATOR #{name}_seq"
@@ -44,7 +40,7 @@ module ::JdbcSpec
     def rename_table(name, new_name) #:nodoc:
       execute "RENAME #{name} TO #{new_name}"
       execute "UPDATE RDB$GENERATORS SET RDB$GENERATOR_NAME='#{new_name}_seq' WHERE RDB$GENERATOR_NAME='#{name}_seq'" rescue nil
-    end  
+    end
 
     def drop_table(name, options = {}) #:nodoc:
       super(name)
@@ -62,10 +58,10 @@ module ::JdbcSpec
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end
-    
+
     def quote(value, column = nil) # :nodoc:
       return value.quoted_id if value.respond_to?(:quoted_id)
-      
+
       if [Time, DateTime].include?(value.class)
         "CAST('#{value.strftime("%Y-%m-%d %H:%M:%S")}' AS TIMESTAMP)"
       else
@@ -79,27 +75,27 @@ module ::JdbcSpec
     def quote_string(string) # :nodoc:
       string.gsub(/'/, "''")
     end
-    
+
     def quote_column_name(column_name) # :nodoc:
       %Q("#{ar_to_fb_case(column_name)}")
     end
-    
+
     def quoted_true # :nodoc:
       quote(1)
     end
-    
+
     def quoted_false # :nodoc:
       quote(0)
     end
 
     private
-    
+
     # Maps uppercase Firebird column names to lowercase for ActiveRecord;
     # mixed-case columns retain their original case.
     def fb_to_ar_case(column_name)
       column_name =~ /[[:lower:]]/ ? column_name : column_name.to_s.downcase
     end
-    
+
     # Maps lowercase ActiveRecord column names to uppercase for Fierbird;
     # mixed-case columns retain their original case.
     def ar_to_fb_case(column_name)

data/lib/arjdbc/firebird.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/firebird/adapter'

data/lib/arjdbc/h2/adapter.rb

@@ -0,0 +1,15 @@
+require 'arjdbc/hsqldb/adapter'
+
+module ArJdbc
+  module H2
+    include HSQLDB
+
+    def adapter_name #:nodoc:
+      'H2'
+    end
+
+    def h2_adapter
+      true
+    end
+  end
+end

data/lib/arjdbc/h2/connection_methods.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  class Base
+    class << self
+      def h2_connection(config)
+        config[:url] ||= "jdbc:h2:#{config[:database]}"
+        config[:driver] ||= "org.h2.Driver"
+        embedded_driver(config)
+      end
+      alias_method :jdbch2_connection, :h2_connection
+    end
+  end
+end

data/lib/arjdbc/h2.rb

@@ -0,0 +1,4 @@
+require 'arjdbc/jdbc'
+jdbc_require_driver 'jdbc/h2'
+require 'arjdbc/h2/connection_methods'
+require 'arjdbc/h2/adapter'

data/lib/{jdbc_adapter/jdbc_hsqldb.rb → arjdbc/hsqldb/adapter.rb}

@@ -1,33 +1,7 @@
-module ::JdbcSpec
-  module ActiveRecordExtensions
-    def hsqldb_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/hsqldb_adapter"
-      config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
-      config[:driver] ||= "org.hsqldb.jdbcDriver"
-      embedded_driver(config)
-    end
-
-    def h2_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/h2_adapter"
-      config[:url] ||= "jdbc:h2:#{config[:database]}"
-      config[:driver] ||= "org.h2.Driver"
-      embedded_driver(config)
-    end
-  end
-
+module ::ArJdbc
   module HSQLDB
-    def self.extended(mod)
-      mod.class.class_eval do
-        alias_chained_method :insert, :query_dirty, :insert
-      end
-    end
-
-    def self.adapter_matcher(name, *)
-      name =~ /hsqldb/i ? self : false
-    end
-
     def self.column_selector
-      [/hsqldb|\.h2\./i, lambda {|cfg,col| col.extend(::JdbcSpec::HSQLDB::Column)}]
+      [/hsqldb|\.h2\./i, lambda {|cfg,col| col.extend(::ArJdbc::HSQLDB::Column)}]
     end
 
     module Column
@@ -63,7 +37,7 @@ module ::JdbcSpec
     end
 
     def adapter_name #:nodoc:
-      defined?(::Jdbc::H2) ? 'H2' : 'Hsqldb'
+      'Hsqldb'
     end
 
     def modify_types(tp)
@@ -159,27 +133,13 @@ module ::JdbcSpec
       execute "ALTER TABLE #{name} RENAME TO #{new_name}"
     end
 
-    def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
-      log(sql,name) do
-        @connection.execute_update(sql)
-      end
-      table = sql.split(" ", 4)[2]
-      id_value || last_insert_id(table, nil)
-    end
-
-    def last_insert_id(table, sequence_name)
+    def last_insert_id
       Integer(select_value("CALL IDENTITY()"))
     end
 
-    # Override normal #_execute: See Rubyforge #11567
     def _execute(sql, name = nil)
-      if ::ActiveRecord::ConnectionAdapters::JdbcConnection::select?(sql)
-        @connection.execute_query(sql)
-      elsif ::ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql)
-        insert(sql, name)
-      else
-        @connection.execute_update(sql)
-      end
+      result = super
+      ActiveRecord::ConnectionAdapters::JdbcConnection::insert?(sql) ? last_insert_id : result
     end
 
     def add_limit_offset!(sql, options) #:nodoc:
@@ -206,16 +166,4 @@ module ::JdbcSpec
       execute "DROP INDEX #{quote_column_name(index_name(table_name, options))}"
     end
   end
-
-  module H2
-    include HSQLDB
-
-    def self.adapter_matcher(name, *)
-      name =~ /\.h2\./i ? self : false
-    end
-
-    def h2_adapter
-      true
-    end
-  end
 end

data/lib/arjdbc/hsqldb/connection_methods.rb

@@ -0,0 +1,14 @@
+module ActiveRecord
+  class Base
+    class << self
+      def hsqldb_connection(config)
+        require "arjdbc/hsqldb"
+        config[:url] ||= "jdbc:hsqldb:#{config[:database]}"
+        config[:driver] ||= "org.hsqldb.jdbcDriver"
+        embedded_driver(config)
+      end
+
+      alias_method :jdbchsqldb_connection, :hsqldb_connection
+    end
+  end
+end

data/lib/arjdbc/hsqldb.rb

@@ -0,0 +1,4 @@
+require 'arjdbc/jdbc'
+jdbc_require_driver 'jdbc/hsqldb'
+require 'arjdbc/hsqldb/connection_methods'
+require 'arjdbc/hsqldb/adapter'

data/lib/{jdbc_adapter/jdbc_informix.rb → arjdbc/informix/adapter.rb}

@@ -4,7 +4,7 @@ module ::ActiveRecord
 
   private
     def write_lobs
-      if connection.is_a?(JdbcSpec::Informix)
+      if connection.is_a?(ArJdbc::Informix)
         self.class.columns.each do |c|
           if [:text, :binary].include? c.type
             value = self[c.name]
@@ -25,28 +25,15 @@ module ::ActiveRecord
   end
 end
 
-module ::JdbcSpec
-  module ActiveRecordExtensions
-    def informix_connection(config)
-      config[:port] ||= 9088
-      config[:url] ||= "jdbc:informix-sqli://#{config[:host]}:#{config[:port]}/#{config[:database]}:INFORMIXSERVER=#{config[:servername]}"
-      config[:driver] = 'com.informix.jdbc.IfxDriver'
-      jdbc_connection(config)
-    end
-  end
-
+module ::ArJdbc
   module Informix
     def self.extended(base)
       @@db_major_version = base.select_one("SELECT dbinfo('version', 'major') version FROM systables WHERE tabid = 1")['version'].to_i
     end
 
-    def self.adapter_matcher(name, *)
-      name =~ /informix/i ? self : false
-    end
-
     def self.column_selector
       [ /informix/i,
-        lambda { |cfg, column| column.extend(::JdbcSpec::Informix::Column) } ]
+        lambda { |cfg, column| column.extend(::ArJdbc::Informix::Column) } ]
     end
 
     module Column
@@ -123,12 +110,12 @@ module ::JdbcSpec
       super(name, options)
       execute("CREATE SEQUENCE #{name}_seq")
     end
- 
+
     def rename_table(name, new_name)
       execute("RENAME TABLE #{name} TO #{new_name}")
       execute("RENAME SEQUENCE #{name}_seq TO #{new_name}_seq")
     end
- 
+
     def drop_table(name)
       super(name)
       execute("DROP SEQUENCE #{name}_seq")
@@ -144,4 +131,4 @@ module ::JdbcSpec
       execute(sql.gsub(/(!=|<>)\s*null/i, "IS NOT NULL").gsub(/=\s*null/i, "IS NULL"), name)
     end
   end # module Informix
-end # module ::JdbcSpec
+end # module ::ArJdbc

data/lib/arjdbc/informix/connection_methods.rb

@@ -0,0 +1,10 @@
+class ActiveRecord::Base
+  class << self
+    def informix_connection(config)
+      config[:port] ||= 9088
+      config[:url] ||= "jdbc:informix-sqli://#{config[:host]}:#{config[:port]}/#{config[:database]}:INFORMIXSERVER=#{config[:servername]}"
+      config[:driver] = 'com.informix.jdbc.IfxDriver'
+      jdbc_connection(config)
+    end
+  end
+end

data/lib/arjdbc/informix.rb

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