activerecord-jdbc-adapter 0.9.7-java → 1.0.0.beta1-java

data/lib/active_record/connection_adapters/jndi_adapter.rb

@@ -1 +1 @@
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc/jdbc'

data/lib/active_record/connection_adapters/mssql_adapter.rb

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

data/lib/active_record/connection_adapters/mysql_adapter.rb

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

data/lib/active_record/connection_adapters/oracle_adapter.rb

@@ -1 +1 @@
-require 'active_record/connection_adapters/jdbc_adapter'
+require 'arjdbc/oracle'

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.rb

@@ -0,0 +1,29 @@
+if defined?(JRUBY_VERSION)
+  begin
+    tried_gem ||= false
+    require 'active_record/version'
+  rescue LoadError
+    raise if tried_gem
+    require 'rubygems'
+    gem 'activerecord'
+    tried_gem = true
+    retry
+  end
+  if ActiveRecord::VERSION::MAJOR < 2
+    if defined?(RAILS_CONNECTION_ADAPTERS)
+      RAILS_CONNECTION_ADAPTERS << %q(jdbc)
+    else
+      RAILS_CONNECTION_ADAPTERS = %w(jdbc)
+    end
+    if ActiveRecord::VERSION::MAJOR == 1 && ActiveRecord::VERSION::MINOR == 14
+      require 'arjdbc/jdbc'
+    end
+  else
+    require 'active_record'
+    require 'arjdbc/jdbc'
+  end
+else
+  warn "ActiveRecord-JDBC is for use with JRuby only"
+end
+
+require 'arjdbc/version'

data/lib/arjdbc/cachedb.rb

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

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/db2.rb

@@ -0,0 +1,2 @@
+require 'arjdbc/jdbc'
+require 'arjdbc/db2/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}

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/{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/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/arjdbc/firebird.rb

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

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)