activerecord-jdbc-adapter 0.9.3-java → 0.9.4-java

data/History.txt

@@ -1,3 +1,14 @@
+== 0.9.4
+
+- ACTIVERECORD_JDBC-96: DB2 JdbcSpec cannot dump schema correctly
+  (Youhei Kondou)
+- ACTIVERECORD_JDBC-97: Dont use Rails 3 deprecated constants (David
+  Calavera)
+- Updates for rake db:schema:dump compatibility with Rails 2.3+ and
+  MySQL (Joakim Kolsj�)
+- Rails 3.0.0.beta2 compatibility
+- Return of Derby, H2, Hsqldb support (requires AR >= 3.0.0.beta2)
+
 == 0.9.3
 
 - Rails 3 compatibility

data/Manifest.txt

@@ -3,6 +3,7 @@ Manifest.txt
 README.txt
 Rakefile
 LICENSE.txt
+lib/activerecord-jdbc-adapter.rb
 lib/jdbc_adapter.rb
 lib/pg.rb
 lib/active_record/connection_adapters/cachedb_adapter.rb
@@ -17,6 +18,11 @@ lib/active_record/connection_adapters/mysql_adapter.rb
 lib/active_record/connection_adapters/oracle_adapter.rb
 lib/active_record/connection_adapters/postgresql_adapter.rb
 lib/active_record/connection_adapters/sqlite3_adapter.rb
+lib/arel/engines/sql/compilers/db2_compiler.rb
+lib/arel/engines/sql/compilers/derby_compiler.rb
+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/generators/jdbc/jdbc_generator.rb
 lib/jdbc_adapter/jdbc_cachedb.rb
 lib/jdbc_adapter/jdbc_db2.rb
@@ -32,6 +38,7 @@ 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
@@ -55,6 +62,7 @@ test/manualTestDatabase.rb
 test/minirunit.rb
 test/mssql_simple_test.rb
 test/mysql_db_create_test.rb
+test/mysql_info_test.rb
 test/mysql_multibyte_test.rb
 test/mysql_nonstandard_primary_key_test.rb
 test/mysql_simple_test.rb

data/lib/active_record/connection_adapters/jdbc_adapter.rb

@@ -61,14 +61,15 @@ end
 module ActiveRecord
   class Base
     extend JdbcSpec::ActiveRecordExtensions
-
-    alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
-    def attributes_with_quotes(include_primary_key = true, *args) #:nodoc:
-      aq = attributes_with_quotes_pre_oracle(include_primary_key, *args)
-      if connection.class == ConnectionAdapters::JdbcAdapter && (connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer))
-        aq[self.class.primary_key] = "?" if include_primary_key && aq[self.class.primary_key].nil?
+    if respond_to?(:attributes_with_quotes)
+      alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
+      def attributes_with_quotes(include_primary_key = true, *args) #:nodoc:
+        aq = attributes_with_quotes_pre_oracle(include_primary_key, *args)
+        if connection.class == ConnectionAdapters::JdbcAdapter && (connection.is_a?(JdbcSpec::Oracle) || connection.is_a?(JdbcSpec::Mimer))
+          aq[self.class.primary_key] = "?" if include_primary_key && aq[self.class.primary_key].nil?
+        end
+        aq
       end
-      aq
     end
   end
 
@@ -620,13 +621,16 @@ module ActiveRecord
       end
 
       def pk_and_sequence_for(table)
-        result_set = @connection.connection.get_meta_data.get_primary_keys(nil, nil, table)
-        if result_set.next
-          keys = [result_set.getString("COLUMN_NAME"), nil]
-        end
-        keys.blank? ? nil : keys
-      ensure
-        result_set.close
+        key = primary_key(table)
+        [key, nil] if key
+      end
+
+      def primary_key(table)
+        primary_keys(table).first
+      end
+
+      def primary_keys(table)
+        @connection.primary_keys(table)
       end
 
       private

data/lib/activerecord-jdbc-adapter.rb

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

data/lib/arel/engines/sql/compilers/db2_compiler.rb

@@ -0,0 +1,9 @@
+require 'arel/engines/sql/compilers/ibm_db_compiler'
+
+module Arel
+  module SqlCompiler
+    class DB2Compiler < IBM_DBCompiler
+    end
+  end
+end
+

data/lib/arel/engines/sql/compilers/derby_compiler.rb

@@ -0,0 +1,6 @@
+module Arel
+  module SqlCompiler
+    class DerbyCompiler < GenericCompiler
+    end
+  end
+end

data/lib/arel/engines/sql/compilers/h2_compiler.rb

@@ -0,0 +1,6 @@
+module Arel
+  module SqlCompiler
+    class H2Compiler < GenericCompiler
+    end
+  end
+end

data/lib/arel/engines/sql/compilers/hsqldb_compiler.rb

@@ -0,0 +1,6 @@
+module Arel
+  module SqlCompiler
+    class HsqldbCompiler < GenericCompiler
+    end
+  end
+end

data/lib/arel/engines/sql/compilers/jdbc_compiler.rb

@@ -0,0 +1,6 @@
+module Arel
+  module SqlCompiler
+    class JDBCCompiler < GenericCompiler
+    end
+  end
+end

data/lib/jdbc_adapter/jdbc_db2.rb

@@ -16,6 +16,11 @@ module JdbcSpec
          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}
+    end
+
     module Column
       def type_cast(value)
         return nil if value.nil? || value =~ /^\s*null\s*$/i
@@ -69,6 +74,10 @@ module JdbcSpec
       tp
     end
 
+    def adapter_name
+      'DB2'
+    end
+
     def add_limit_offset!(sql, options)
       if limit = options[:limit]
         offset = options[:offset] || 0
@@ -77,6 +86,16 @@ module JdbcSpec
       end
     end
 
+    def pk_and_sequence_for(table)
+      # In JDBC/DB2 side, only upcase names of table and column are handled.
+      keys = super(table.upcase)
+      if keys[0]
+        # In ActiveRecord side, only downcase names of table and column are handled.
+        keys[0] = keys[0].downcase
+      end
+      keys
+    end
+
     def quote_column_name(column_name)
       column_name
     end

data/lib/jdbc_adapter/jdbc_derby.rb

@@ -121,10 +121,6 @@ module ::JdbcSpec
       end
     end
 
-    def primary_key(table_name) #:nodoc:
-      primary_keys(table_name).first
-    end
-
     def remove_index(table_name, options) #:nodoc:
       execute "DROP INDEX #{index_name(table_name, options)}"
     end

data/lib/jdbc_adapter/jdbc_hsqldb.rb

@@ -38,6 +38,8 @@ module ::JdbcSpec
           :text
         when /tinyint/i
           :boolean
+        when /real/i
+          :float
         else
           super(field_type)
         end
@@ -61,7 +63,7 @@ module ::JdbcSpec
     end
 
     def adapter_name #:nodoc:
-      defined?(::Jdbc::H2) ? 'h2' : 'hsqldb'
+      defined?(::Jdbc::H2) ? 'H2' : 'Hsqldb'
     end
 
     def modify_types(tp)
@@ -90,7 +92,8 @@ module ::JdbcSpec
           "''"
         elsif column && column.type == :binary
           "'#{value.unpack("H*")}'"
-        elsif column.respond_to?(:primary) && column.primary && column.klass != String
+        elsif column && (column.type == :integer ||
+                         column.respond_to?(:primary) && column.primary && column.klass != String)
           value.to_i.to_s
         else
           "'#{quote_string(value)}'"

data/lib/jdbc_adapter/jdbc_mysql.rb

@@ -71,6 +71,10 @@ module ::JdbcSpec
       tp
     end
 
+    def adapter_name #:nodoc:
+      'mysql'
+    end
+
     # QUOTING ==================================================
 
     def quote(value, column = nil)
@@ -136,7 +140,7 @@ module ::JdbcSpec
       select_all(sql).inject("") do |structure, table|
         table.delete('Table_type')
 
-        hash = select_one("SHOW CREATE TABLE #{quote_table_name(table.to_a.first.last)}")
+        hash = show_create_table(table.to_a.first.last)
 
         if(table = hash["Create Table"])
           structure += table + ";\n\n"
@@ -229,6 +233,10 @@ module ::JdbcSpec
     end
 
     private
+    def show_create_table(table)
+      select_one("SHOW CREATE TABLE #{quote_table_name(table)}")
+    end
+
     def supports_views?
       false
     end

data/lib/jdbc_adapter/jdbc_oracle.rb

@@ -101,7 +101,7 @@ module ::JdbcSpec
     end
 
     def adapter_name
-      'oracle'
+      'Oracle'
     end
 
     def table_alias_length

data/lib/jdbc_adapter/jdbc_postgre.rb

@@ -95,6 +95,10 @@ module ::JdbcSpec
       tp
     end
 
+    def adapter_name #:nodoc:
+      'PostgreSQL'
+    end
+
     def postgresql_version
       @postgresql_version ||=
         begin
@@ -202,7 +206,7 @@ module ::JdbcSpec
         # If that fails, try parsing the primary key's default value.
         # Support the 7.x and 8.0 nextval('foo'::text) as well as
         # the 8.1+ nextval('foo'::regclass).
-        result = query(<<-end_sql, 'PK and custom sequence')[0]
+        result = select(<<-end_sql, 'PK and custom sequence')[0]
             SELECT attr.attname,
               CASE
                 WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN
@@ -320,6 +324,23 @@ module ::JdbcSpec
       execute "DROP DATABASE \"#{name}\""
     end
 
+    def create_schema(schema_name, pg_username)
+      execute("CREATE SCHEMA \"#{schema_name}\" AUTHORIZATION \"#{pg_username}\"")
+    end
+
+    def drop_schema(schema_name)
+      execute("DROP SCHEMA \"#{schema_name}\"")
+    end
+
+    def all_schemas
+      select('select nspname from pg_namespace').map {|r| r["nspname"] }
+    end
+
+    def primary_key(table)
+      pk_and_sequence = pk_and_sequence_for(table)
+      pk_and_sequence && pk_and_sequence.first
+    end
+
     def structure_dump
       database = @config[:database]
       if database.nil?

data/lib/jdbc_adapter/jdbc_sqlite3.rb

@@ -21,8 +21,10 @@ module ::JdbcSpec
       # Allow database path relative to RAILS_ROOT, but only if
       # the database path is not the special path that tells
       # Sqlite to build a database only in memory.
-      if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:database]
-        config[:database] = File.expand_path(config[:database], RAILS_ROOT)
+      rails_root_defined = defined?(Rails.root) || Object.const_defined?(:RAILS_ROOT)
+      if rails_root_defined && ':memory:' != config[:database]
+        rails_root = defined?(Rails.root) ? Rails.root : RAILS_ROOT
+        config[:database] = File.expand_path(config[:database], rails_root)
       end
     end
   end

data/lib/jdbc_adapter/railtie.rb

@@ -0,0 +1,9 @@
+require 'rails/railtie'
+
+module ::JdbcSpec
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load File.expand_path('../rake_tasks.rb', __FILE__)
+    end
+  end
+end

data/lib/jdbc_adapter/version.rb

@@ -1,5 +1,5 @@
 module JdbcAdapter
   module Version
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

data/rakelib/package.rake

@@ -43,6 +43,7 @@ end
 %w(test package install_gem release clean).each do |task|
   desc "Run rake #{task} on all available adapters and drivers"
   task "all:#{task}" => task
+  task "adapters:#{task}" => task
 end
 
 (Dir["drivers/*/Rakefile"] + Dir["adapters/*/Rakefile"]).each do |rakefile|

data/rakelib/test.rake

@@ -1,14 +1,9 @@
 require File.expand_path('../../test/helper', __FILE__)
 if defined?(JRUBY_VERSION)
-  databases = [:test_mysql, :test_jdbc, :test_sqlite3]
+  databases = [:test_mysql, :test_jdbc, :test_sqlite3, :test_derby, :test_hsqldb, :test_h2]
   if find_executable?("psql") && `psql -c '\\l'` && $?.exitstatus == 0
     databases << :test_postgres
   end
-  require File.expand_path('../../test/pick_rails_version', __FILE__)
-  if ActiveRecord::VERSION::MAJOR < 3
-    # These databases not working with Rails3/Arel yet
-    databases += [:test_derby, :test_hsqldb, :test_h2]
-  end
   task :test => databases
 else
   task :test => [:test_mysql]

data/test/mysql_info_test.rb

@@ -0,0 +1,62 @@
+require 'jdbc_common'
+require 'db/mysql'
+
+class DBSetup < ActiveRecord::Migration
+  
+  def self.up
+    create_table :books do |t|
+      t.string :title
+    end
+    
+    create_table :cars, :primary_key => 'legacy_id' do |t|
+      t.string :name
+    end
+    
+    create_table :cats, :id => false do |t|
+      t.string :name
+    end
+    
+  end
+
+  def self.down
+    drop_table :books
+    drop_table :cars
+    drop_table :cats
+  end
+
+end
+
+class MysqlInfoTest < Test::Unit::TestCase
+
+  def setup
+    DBSetup.up
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def teardown
+    DBSetup.down
+  end
+
+  ## primary_key
+  def test_should_return_the_primary_key_of_a_table
+    assert_equal 'id', @connection.primary_key('books')
+  end
+  
+  def test_should_be_able_to_return_a_custom_primary_key
+    assert_equal 'legacy_id', @connection.primary_key('cars')
+  end
+
+  def test_should_return_nil_for_a_table_without_a_primary_key
+    assert_nil @connection.primary_key('cats')
+  end
+  
+  ## structure_dump
+  def test_should_include_the_tables_in_a_structure_dump
+    # TODO: Improve these tests, I added this one because no other tests exists for this method.
+    dump = @connection.structure_dump
+    assert dump.include?('CREATE TABLE `books`')
+    assert dump.include?('CREATE TABLE `cars`')
+    assert dump.include?('CREATE TABLE `cats`')
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 9
-    - 3
-  version: 0.9.3
+    - 4
+  version: 0.9.4
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -06:00
+date: 2010-04-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
   - README.txt
   - Rakefile
   - LICENSE.txt
+  - lib/activerecord-jdbc-adapter.rb
   - lib/jdbc_adapter.rb
   - lib/pg.rb
   - lib/active_record/connection_adapters/cachedb_adapter.rb
@@ -52,6 +53,11 @@ files:
   - lib/active_record/connection_adapters/oracle_adapter.rb
   - lib/active_record/connection_adapters/postgresql_adapter.rb
   - lib/active_record/connection_adapters/sqlite3_adapter.rb
+  - lib/arel/engines/sql/compilers/db2_compiler.rb
+  - lib/arel/engines/sql/compilers/derby_compiler.rb
+  - 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/generators/jdbc/jdbc_generator.rb
   - lib/jdbc_adapter/jdbc_cachedb.rb
   - lib/jdbc_adapter/jdbc_db2.rb
@@ -67,6 +73,7 @@ files:
   - 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
@@ -90,6 +97,7 @@ files:
   - test/minirunit.rb
   - test/mssql_simple_test.rb
   - test/mysql_db_create_test.rb
+  - test/mysql_info_test.rb
   - test/mysql_multibyte_test.rb
   - test/mysql_nonstandard_primary_key_test.rb
   - test/mysql_simple_test.rb