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

data/test/jdbc_common.rb

@@ -5,7 +5,7 @@ end
 
 require 'rubygems'
 require 'pick_rails_version'
-require 'jdbc_adapter' if jruby?
+require 'arjdbc' if jruby?
 puts "Using activerecord version #{ActiveRecord::VERSION::STRING}"
 puts "Specify version with AR_VERSION=={version} or RUBYLIB={path}"
 require 'models/auto_id'

data/test/jndi_callbacks_test.rb

@@ -21,6 +21,7 @@ class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
   end
 
   def test_should_call_hooks_on_checkout_and_checkin
+    @connection.stubs(:active?).returns(true)
     @connection.expects(:disconnect!)
     @adapter = ActiveRecord::ConnectionAdapters::JdbcAdapter.new @connection, @logger, @config
     Entry.connection_pool.instance_variable_set "@connections", [@adapter]

data/test/postgres_nonseq_pkey_test.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'active_record'
 require 'jdbc_common'
 require 'db/postgres'
 

data/test/postgres_schema_search_path_test.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'active_record'
 require 'jdbc_common'
 require 'db/postgres'
 

data/test/simple.rb

@@ -62,7 +62,7 @@ module SimpleTestMethods
       value = ActiveRecord::Base.connection.insert("INSERT INTO entries (title, content, rating) VALUES('insert_title', 'some content', 1)")
       assert !value.nil?
       entry = Entry.find_by_title('insert_title')
-      assert_equal value, entry.id
+      assert_equal entry.id, value
     end
   end
 
@@ -287,7 +287,7 @@ module SimpleTestMethods
 
   if jruby?
     def test_connection_valid
-      assert_raises(ActiveRecord::ActiveRecordError) do
+      assert_raises(ActiveRecord::JDBCError) do
         @connection.raw_connection.with_connection_retry_guard do |c|
           begin
             stmt = c.createStatement
@@ -303,7 +303,7 @@ module SimpleTestMethods
 
     # ENEBO: Is this really ar-jdbc-specific or a bug in our adapter?
     def test_fetching_columns_for_nonexistent_table_should_raise
-      assert_raises(ActiveRecord::ActiveRecordError) do
+      assert_raises(ActiveRecord::JDBCError) do
         Animal.columns
       end
     end

data/test/sybase_jtds_simple_test.rb

@@ -4,3 +4,25 @@ require 'db/sybase_jtds'
 class SybaseJtdsSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
 end
+
+class SybaseAdapterSelectionTest < Test::Unit::TestCase
+  class MockConnection
+    def adapter=(adapt)
+    end
+  end
+
+  def test_jtds_selection_using_dialect
+    config = {
+      :driver =>  'net.sourceforge.jtds.Driver',
+      :dialect => 'sybase'
+    }
+    adapt = JdbcAdapter.new(MockConnection.new, nil, config)
+    assert adapt.kind_of?(ArJdbc::Sybase), "Should be a sybase adapter"
+  end
+
+  def test_jtds_selection_not_using_dialect
+    config = { :driver => 'net.sourceforge.jtds.Driver' }
+    adapt = JdbcAdapter.new(MockConnection.new, nil, config)
+    assert adapt.kind_of?(ArJdbc::MsSQL), "Should be a MsSQL apdater"
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+    - 1
     - 0
-    - 9
-    - 7
-  version: 0.9.7
+    - 0
+    - beta1
+  version: 1.0.0.beta1
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 -05:00
+date: 2010-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -53,6 +54,7 @@ files:
   - Rakefile
   - LICENSE.txt
   - lib/activerecord-jdbc-adapter.rb
+  - lib/arjdbc.rb
   - lib/jdbc_adapter.rb
   - lib/pg.rb
   - lib/active_record/connection_adapters/cachedb_adapter.rb
@@ -61,7 +63,6 @@ files:
   - lib/active_record/connection_adapters/hsqldb_adapter.rb
   - lib/active_record/connection_adapters/informix_adapter.rb
   - lib/active_record/connection_adapters/jdbc_adapter.rb
-  - lib/active_record/connection_adapters/jdbc_adapter_spec.rb
   - lib/active_record/connection_adapters/jndi_adapter.rb
   - lib/active_record/connection_adapters/mssql_adapter.rb
   - lib/active_record/connection_adapters/mysql_adapter.rb
@@ -73,26 +74,68 @@ files:
   - 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/arjdbc/cachedb.rb
+  - lib/arjdbc/db2.rb
+  - lib/arjdbc/derby.rb
+  - lib/arjdbc/discover.rb
+  - lib/arjdbc/firebird.rb
+  - lib/arjdbc/h2.rb
+  - lib/arjdbc/hsqldb.rb
+  - lib/arjdbc/informix.rb
+  - lib/arjdbc/jdbc.rb
+  - lib/arjdbc/mimer.rb
+  - lib/arjdbc/mssql.rb
+  - lib/arjdbc/mysql.rb
+  - lib/arjdbc/oracle.rb
+  - 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
+  - lib/arjdbc/firebird/adapter.rb
+  - lib/arjdbc/h2/adapter.rb
+  - lib/arjdbc/h2/connection_methods.rb
+  - lib/arjdbc/hsqldb/adapter.rb
+  - lib/arjdbc/hsqldb/connection_methods.rb
+  - lib/arjdbc/informix/adapter.rb
+  - lib/arjdbc/informix/connection_methods.rb
+  - lib/arjdbc/jdbc/adapter.rb
+  - lib/arjdbc/jdbc/callbacks.rb
+  - lib/arjdbc/jdbc/column.rb
+  - lib/arjdbc/jdbc/compatibility.rb
+  - lib/arjdbc/jdbc/connection.rb
+  - lib/arjdbc/jdbc/connection_methods.rb
+  - lib/arjdbc/jdbc/core_ext.rb
+  - lib/arjdbc/jdbc/discover.rb
+  - lib/arjdbc/jdbc/driver.rb
+  - lib/arjdbc/jdbc/extension.rb
+  - lib/arjdbc/jdbc/java.rb
+  - lib/arjdbc/jdbc/missing_functionality_helper.rb
+  - lib/arjdbc/jdbc/quoted_primary_key.rb
+  - lib/arjdbc/jdbc/railtie.rb
+  - lib/arjdbc/jdbc/rake_tasks.rb
+  - lib/arjdbc/jdbc/require_driver.rb
+  - lib/arjdbc/jdbc/type_converter.rb
+  - lib/arjdbc/mimer/adapter.rb
+  - lib/arjdbc/mssql/adapter.rb
+  - lib/arjdbc/mssql/connection_methods.rb
+  - lib/arjdbc/mssql/tsql_helper.rb
+  - lib/arjdbc/mysql/adapter.rb
+  - lib/arjdbc/mysql/connection_methods.rb
+  - lib/arjdbc/oracle/adapter.rb
+  - lib/arjdbc/oracle/connection_methods.rb
+  - lib/arjdbc/postgresql/adapter.rb
+  - lib/arjdbc/postgresql/connection_methods.rb
+  - lib/arjdbc/sqlite3/adapter.rb
+  - lib/arjdbc/sqlite3/connection_methods.rb
+  - lib/arjdbc/sybase/adapter.rb
   - lib/generators/jdbc/jdbc_generator.rb
-  - lib/jdbc_adapter/jdbc_cachedb.rb
-  - lib/jdbc_adapter/jdbc_db2.rb
-  - lib/jdbc_adapter/jdbc_derby.rb
-  - lib/jdbc_adapter/jdbc_firebird.rb
-  - lib/jdbc_adapter/jdbc_hsqldb.rb
-  - lib/jdbc_adapter/jdbc_informix.rb
-  - lib/jdbc_adapter/jdbc_mimer.rb
-  - lib/jdbc_adapter/jdbc_mssql.rb
-  - lib/jdbc_adapter/jdbc_mysql.rb
-  - lib/jdbc_adapter/jdbc_oracle.rb
-  - lib/jdbc_adapter/jdbc_postgre.rb
-  - lib/jdbc_adapter/jdbc_sqlite3.rb
-  - lib/jdbc_adapter/jdbc_sybase.rb
-  - lib/jdbc_adapter/missing_functionality_helper.rb
-  - lib/jdbc_adapter/railtie.rb
-  - lib/jdbc_adapter/rake_tasks.rb
-  - lib/jdbc_adapter/tsql_helper.rb
   - lib/jdbc_adapter/version.rb
-  - lib/jdbc_adapter/jdbc_adapter_internal.jar
+  - lib/arjdbc/jdbc/adapter_java.jar
   - test/abstract_db_create.rb
   - test/cachedb_simple_test.rb
   - test/db2_simple_test.rb
@@ -109,7 +152,6 @@ files:
   - test/jndi_callbacks_test.rb
   - test/jndi_test.rb
   - test/manualTestDatabase.rb
-  - test/minirunit.rb
   - test/mssql_db_create_test.rb
   - test/mssql_identity_insert_test.rb
   - test/mssql_legacy_types_test.rb
@@ -148,14 +190,6 @@ files:
   - test/db/oracle.rb
   - test/db/postgres.rb
   - test/db/sqlite3.rb
-  - test/jdbc_adapter/jdbc_db2_test.rb
-  - test/jdbc_adapter/jdbc_sybase_test.rb
-  - test/minirunit/testConnect.rb
-  - test/minirunit/testH2.rb
-  - test/minirunit/testHsqldb.rb
-  - test/minirunit/testLoadActiveRecord.rb
-  - test/minirunit/testMysql.rb
-  - test/minirunit/testRawSelect.rb
   - test/models/add_not_null_column_to_table.rb
   - test/models/auto_id.rb
   - test/models/data_types.rb
@@ -164,16 +198,16 @@ files:
   - test/models/reserved_word.rb
   - test/models/string_id.rb
   - test/models/validates_uniqueness_of_string.rb
-  - lib/jdbc_adapter/jdbc.rake
-  - src/java/jdbc_adapter/JdbcAdapterInternalService.java
-  - src/java/jdbc_adapter/JdbcConnectionFactory.java
-  - src/java/jdbc_adapter/JdbcDerbySpec.java
-  - src/java/jdbc_adapter/JdbcMySQLSpec.java
-  - src/java/jdbc_adapter/MssqlRubyJdbcConnection.java
-  - src/java/jdbc_adapter/PostgresRubyJdbcConnection.java
-  - src/java/jdbc_adapter/RubyJdbcConnection.java
-  - src/java/jdbc_adapter/SQLBlock.java
-  - src/java/jdbc_adapter/Sqlite3RubyJdbcConnection.java
+  - lib/arjdbc/jdbc/jdbc.rake
+  - src/java/arjdbc/derby/DerbyModule.java
+  - src/java/arjdbc/jdbc/AdapterJavaService.java
+  - src/java/arjdbc/jdbc/JdbcConnectionFactory.java
+  - src/java/arjdbc/jdbc/RubyJdbcConnection.java
+  - src/java/arjdbc/jdbc/SQLBlock.java
+  - src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java
+  - src/java/arjdbc/mysql/MySQLModule.java
+  - src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java
+  - src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
   - rakelib/compile.rake
   - rakelib/package.rake
   - rakelib/rails.rake
@@ -202,11 +236,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
         segments: 
-          - 0
-        version: "0"
+          - 1
+          - 3
+          - 1
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: jruby-extras

data/lib/active_record/connection_adapters/jdbc_adapter_spec.rb

@@ -1,26 +0,0 @@
-module JdbcSpec
-  module ActiveRecordExtensions
-    def self.add_method_to_remove_from_ar_base(meth)
-      @methods ||= []
-      @methods << meth
-    end
-
-    def self.extended(klass)
-      (@methods || []).each {|m| (class << klass; self; end).instance_eval { remove_method(m) rescue nil } }
-    end
-  end
-end
-
-require 'jdbc_adapter/jdbc_mimer'
-require 'jdbc_adapter/jdbc_hsqldb'
-require 'jdbc_adapter/jdbc_oracle'
-require 'jdbc_adapter/jdbc_postgre'
-require 'jdbc_adapter/jdbc_mysql'
-require 'jdbc_adapter/jdbc_derby'
-require 'jdbc_adapter/jdbc_firebird'
-require 'jdbc_adapter/jdbc_db2'
-require 'jdbc_adapter/jdbc_mssql'
-require 'jdbc_adapter/jdbc_cachedb'
-require 'jdbc_adapter/jdbc_sqlite3'
-require 'jdbc_adapter/jdbc_sybase'
-require 'jdbc_adapter/jdbc_informix'

data/lib/jdbc_adapter/jdbc_cachedb.rb

@@ -1,33 +0,0 @@
-require 'jdbc_adapter/tsql_helper'
-
-module ::JdbcSpec
-  module ActiveRecordExtensions
-    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
-
-  module CacheDB
-    include TSqlMethods
-
-    def self.adapter_matcher(name, *)
-     name =~ /cache/i ? self : false
-    end
-
-    def self.column_selector
-      [ /cache/i, lambda {  | cfg, col | col.extend( ::JdbcSpec::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/jdbc_adapter/jdbc_mysql.rb

@@ -1,260 +0,0 @@
-require 'active_record/connection_adapters/abstract/schema_definitions'
-
-module ::JdbcSpec
-  # Don't need to load native mysql adapter
-  $LOADED_FEATURES << "active_record/connection_adapters/mysql_adapter.rb"
-
-  module ActiveRecordExtensions
-    add_method_to_remove_from_ar_base(:mysql_connection)
-
-    def mysql_connection(config)
-      require File.dirname(__FILE__) + "/../active_record/connection_adapters/mysql_adapter"
-      config[:port] ||= 3306
-      url_options = "zeroDateTimeBehavior=convertToNull&jdbcCompliantTruncation=false&useUnicode=true&characterEncoding="
-      url_options << (config[:encoding] || 'utf8')
-      if config[:url]
-        config[:url] = config[:url]['?'] ? "#{config[:url]}&#{url_options}" : "#{config[:url]}?#{url_options}"
-      else
-        config[:url] = "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}?#{url_options}"
-      end
-      config[:driver] = "com.mysql.jdbc.Driver"
-      connection = jdbc_connection(config)
-      ::JdbcSpec::MySQL.kill_cancel_timer(connection.raw_connection)
-      connection
-    end
-  end
-
-  module MySQL
-    def self.adapter_matcher(name, *)
-      name =~ /mysql/i ? self : false
-    end
-
-    def self.column_selector
-      [/mysql/i, lambda {|cfg,col| col.extend(::JdbcSpec::MySQL::Column)}]
-    end
-
-    def self.extended(adapter)
-      adapter.execute("SET SQL_AUTO_IS_NULL=0")
-    end
-
-    module Column
-      TYPES_ALLOWING_EMPTY_STRING_DEFAULT = Set.new([:binary, :string, :text])
-
-      def simplified_type(field_type)
-        return :boolean if field_type =~ /tinyint\(1\)|bit/i
-        return :string  if field_type =~ /enum/i
-        super
-      end
-
-      def init_column(name, default, *args)
-        @original_default = default
-        @default = nil if missing_default_forged_as_empty_string?
-      end
-
-      # MySQL misreports NOT NULL column default when none is given.
-      # We can't detect this for columns which may have a legitimate ''
-      # default (string, text, binary) but we can for others (integer,
-      # datetime, boolean, and the rest).
-      #
-      # Test whether the column has default '', is not null, and is not
-      # a type allowing default ''.
-      def missing_default_forged_as_empty_string?
-        !null && @original_default == '' && !TYPES_ALLOWING_EMPTY_STRING_DEFAULT.include?(type)
-      end
-    end
-
-    def modify_types(tp)
-      tp[:primary_key] = "int(11) DEFAULT NULL auto_increment PRIMARY KEY"
-      tp[:decimal] = { :name => "decimal" }
-      tp[:timestamp] = { :name => "datetime" }
-      tp[:datetime][:limit] = nil
-      tp
-    end
-
-    def adapter_name #:nodoc:
-      'mysql'
-    end
-
-    # QUOTING ==================================================
-
-    def quote(value, column = nil)
-      return value.quoted_id if value.respond_to?(:quoted_id)
-
-      if column && column.type == :primary_key
-        value.to_s
-      elsif column && String === value && column.type == :binary && column.class.respond_to?(:string_to_binary)
-        s = column.class.string_to_binary(value).unpack("H*")[0]
-        "x'#{s}'"
-      elsif BigDecimal === value
-        "'#{value.to_s("F")}'"
-      else
-        super
-      end
-    end
-
-    def quoted_true
-        "1"
-    end
-
-    def quoted_false
-        "0"
-    end
-
-    def begin_db_transaction #:nodoc:
-      @connection.begin
-    rescue Exception
-      # Transactions aren't supported
-    end
-
-    def commit_db_transaction #:nodoc:
-      @connection.commit
-    rescue Exception
-      # Transactions aren't supported
-    end
-
-    def rollback_db_transaction #:nodoc:
-      @connection.rollback
-    rescue Exception
-      # Transactions aren't supported
-    end
-
-    def supports_savepoints? #:nodoc:
-      true
-    end
-
-    def create_savepoint
-      execute("SAVEPOINT #{current_savepoint_name}")
-    end
-
-    def rollback_to_savepoint
-      execute("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
-    end
-
-    def release_savepoint
-      execute("RELEASE SAVEPOINT #{current_savepoint_name}")
-    end
-
-    def disable_referential_integrity(&block) #:nodoc:
-      old = select_value("SELECT @@FOREIGN_KEY_CHECKS")
-      begin
-        update("SET FOREIGN_KEY_CHECKS = 0")
-        yield
-      ensure
-        update("SET FOREIGN_KEY_CHECKS = #{old}")
-      end
-    end
-
-    # SCHEMA STATEMENTS ========================================
-
-    def structure_dump #:nodoc:
-      if supports_views?
-        sql = "SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'"
-      else
-        sql = "SHOW TABLES"
-      end
-
-      select_all(sql).inject("") do |structure, table|
-        table.delete('Table_type')
-
-        hash = show_create_table(table.to_a.first.last)
-
-        if(table = hash["Create Table"])
-          structure += table + ";\n\n"
-        elsif(view = hash["Create View"])
-          structure += view + ";\n\n"
-        end
-      end
-    end
-
-    def recreate_database(name, options = {}) #:nodoc:
-      drop_database(name)
-      create_database(name, options)
-    end
-
-    def character_set(options) #:nodoc:
-      str = "CHARACTER SET `#{options[:charset] || 'utf8'}`"
-      str += " COLLATE `#{options[:collation]}`" if options[:collation]
-      str
-    end
-    private :character_set
-
-    def create_database(name, options = {}) #:nodoc:
-      execute "CREATE DATABASE `#{name}` DEFAULT #{character_set(options)}"
-    end
-
-    def drop_database(name) #:nodoc:
-      execute "DROP DATABASE IF EXISTS `#{name}`"
-    end
-
-    def current_database
-      select_one("SELECT DATABASE() as db")["db"]
-    end
-
-    def create_table(name, options = {}) #:nodoc:
-      super(name, {:options => "ENGINE=InnoDB #{character_set(options)}"}.merge(options))
-    end
-
-    def rename_table(name, new_name)
-      execute "RENAME TABLE #{quote_table_name(name)} TO #{quote_table_name(new_name)}"
-    end
-
-    def change_column_default(table_name, column_name, default) #:nodoc:
-      current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")["Type"]
-
-      execute("ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{current_type} DEFAULT #{quote(default)}")
-    end
-
-    def change_column(table_name, column_name, type, options = {}) #:nodoc:
-      unless options_include_default?(options)
-        if column = columns(table_name).find { |c| c.name == column_name.to_s }
-          options[:default] = column.default
-        else
-          raise "No such column: #{table_name}.#{column_name}"
-        end
-      end
-
-      change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_column_name(column_name)} #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-      add_column_options!(change_column_sql, options)
-      execute(change_column_sql)
-    end
-
-    def rename_column(table_name, column_name, new_column_name) #:nodoc:
-      cols = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'")
-      current_type = cols["Type"] || cols["COLUMN_TYPE"]
-      execute "ALTER TABLE #{quote_table_name(table_name)} CHANGE #{quote_table_name(column_name)} #{quote_column_name(new_column_name)} #{current_type}"
-    end
-
-    def add_limit_offset!(sql, options) #:nodoc:
-      if limit = options[:limit]
-        unless offset = options[:offset]
-          sql << " LIMIT #{limit}"
-        else
-          sql << " LIMIT #{offset}, #{limit}"
-        end
-      end
-    end
-
-    def show_variable(var)
-      res = execute("show variables like '#{var}'")
-      row = res.detect {|row| row["Variable_name"] == var }
-      row && row["Value"]
-    end
-
-    def charset
-      show_variable("character_set_database")
-    end
-
-    def collation
-      show_variable("collation_database")
-    end
-
-    private
-    def show_create_table(table)
-      select_one("SHOW CREATE TABLE #{quote_table_name(table)}")
-    end
-
-    def supports_views?
-      false
-    end
-  end
-end